diff options
452 files changed, 6892 insertions, 3812 deletions
diff --git a/README.md b/README.md index e0970f85ff2..082469876b7 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ </p> <p align="center"> - <a href="https://www.codetriage.com/nixos/nixpkgs"><img src="https://www.codetriage.com/nixos/nixpkgs/badges/users.svg" alt="Code Triagers badge" /></a> - <a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=Supporter&color=brightgreen" alt="Open Collective supporters" /></a> + <a href="https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md"><img src="https://img.shields.io/github/contributors-anon/NixOS/nixpkgs" alt="Contributors badge" /></a> + <a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=supporters&color=brightgreen" alt="Open Collective supporters" /></a> </p> [Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9101690bd0f..a62fd37127d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1200,6 +1200,12 @@ githubId = 262763; name = "Ayaz Hafiz"; }; + azuwis = { + email = "azuwis@gmail.com"; + github = "azuwis"; + githubId = 9315; + name = "Zhong Jianxin"; + }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; @@ -6338,6 +6344,12 @@ githubId = 209729; name = "Kevin Griffin"; }; + kevink = { + email = "kevin@kevink.dev"; + github = "Unkn0wnCat"; + githubId = 8211181; + name = "Kevin Kandlbinder"; + }; kfollesdal = { email = "kfollesdal@gmail.com"; github = "kfollesdal"; @@ -8113,13 +8125,6 @@ githubId = 1001112; name = "Marcin Janczyk"; }; - mjlbach = { - email = "m.j.lbach@gmail.com"; - matrix = "@atrius:matrix.org"; - github = "mjlbach"; - githubId = 13316262; - name = "Michael Lingelbach"; - }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; @@ -10109,6 +10114,20 @@ githubId = 16624; name = "Maxim Ivanov"; }; + reckenrode = { + name = "Randy Eckenrode"; + email = "randy@largeandhighquality.com"; + matrix = "@reckenrode:matrix.org"; + github = "reckenrode"; + githubId = 7413633; + keys = [ + # compare with https://keybase.io/reckenrode + { + longkeyid = "ed25519/0xFBF19A982CCE0048"; + fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; + } + ]; + }; redfish64 = { email = "engler@gmail.com"; github = "redfish64"; @@ -13196,6 +13215,12 @@ githubId = 1297598; name = "Konrad Borowski"; }; + xgroleau = { + email = "xgroleau@gmail.com"; + github = "xgroleau"; + githubId = 31734358; + name = "Xavier Groleau"; + }; xiorcale = { email = "quentin.vaucher@pm.me"; github = "xiorcale"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 86bf52afdc5..c586254d709 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -214,7 +214,6 @@ with lib.maintainers; { mguentner ekleog ralith - mjlbach dandellion sumnerevans ]; diff --git a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml index 1dd15ddacba..94172de65ea 100644 --- a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml @@ -7,11 +7,11 @@ <para> These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another - option. To build the necessary files from a recent version of + option. To build the necessary files from your current version of nixpkgs, you can run: </para> <programlisting> -nix-build -A netboot.x86_64-linux nixos/release.nix +nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>' </programlisting> <para> This will create a <literal>result</literal> directory containing: * diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index c234cda499f..31093bdbd01 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -238,6 +238,13 @@ <link xlink:href="options.html#opt-services.headscale.enable">services.headscale</link> </para> </listitem> + <listitem> + <para> + <link xlink:href="https://0xerr0r.github.io/blocky/">blocky</link>, + fast and lightweight DNS proxy as ad-blocker for local network + with many features. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-incompatibilities"> diff --git a/nixos/doc/manual/installation/installing-pxe.section.md b/nixos/doc/manual/installation/installing-pxe.section.md index 2016a258251..4fbd6525f8c 100644 --- a/nixos/doc/manual/installation/installing-pxe.section.md +++ b/nixos/doc/manual/installation/installing-pxe.section.md @@ -5,11 +5,11 @@ setup. These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another -option. To build the necessary files from a recent version of nixpkgs, +option. To build the necessary files from your current version of nixpkgs, you can run: ```ShellSession -nix-build -A netboot.x86_64-linux nixos/release.nix +nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>' ``` This will create a `result` directory containing: \* `bzImage` -- the diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 567a6d6780a..258cd2fe316 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -71,6 +71,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [headscale](https://github.com/juanfont/headscale), an Open Source implementation of the [Tailscale](https://tailscale.io) Control Server. Available as [services.headscale](options.html#opt-services.headscale.enable) +- [blocky](https://0xerr0r.github.io/blocky/), fast and lightweight DNS proxy as ad-blocker for local network with many features. + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index b730c4b44d7..569a0f3c61e 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -241,9 +241,15 @@ class LegacyStartCommand(StartCommand): cdrom: Optional[str] = None, usb: Optional[str] = None, bios: Optional[str] = None, + qemuBinary: Optional[str] = None, qemuFlags: Optional[str] = None, ): - self._cmd = "qemu-kvm -m 384" + if qemuBinary is not None: + self._cmd = qemuBinary + else: + self._cmd = "qemu-kvm" + + self._cmd += " -m 384" # networking net_backend = "-netdev user,id=net0" @@ -381,6 +387,7 @@ class Machine: cdrom=args.get("cdrom"), usb=args.get("usb"), bios=args.get("bios"), + qemuBinary=args.get("qemuBinary"), qemuFlags=args.get("qemuFlags"), ) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b6d9bd00629..ca82ddfb586 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -718,6 +718,7 @@ ./services/networking/bird.nix ./services/networking/bitlbee.nix ./services/networking/blockbook-frontend.nix + ./services/networking/blocky.nix ./services/networking/charybdis.nix ./services/networking/cjdns.nix ./services/networking/cntlm.nix diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index bdd5e82bd26..f4197650ab2 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -58,8 +58,8 @@ let package = (cfg.package.override (oldArgs: { # Respect overrides that already exist in the passed package and # concat it with values passed via the module. - extraComponents = oldArgs.extraComponents ++ extraComponents; - extraPackages = ps: (oldArgs.extraPackages ps) ++ (cfg.extraPackages ps); + extraComponents = oldArgs.extraComponents or [] ++ extraComponents; + extraPackages = ps: (oldArgs.extraPackages or (_: []) ps) ++ (cfg.extraPackages ps); })); in { imports = [ diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index 5a5c30a4123..2b9c6d80abb 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -39,9 +39,11 @@ in { default = "127.0.0.1"; description = '' The host name or IP address on which to bind Airsonic. - Only relevant if you have multiple network interfaces and want - to make Airsonic available on only one of them. The default value - will bind Airsonic to all available network interfaces. + The default value is appropriate for first launch, when the + default credentials are easy to guess. It is also appropriate + if you intend to use the virtualhost option in the service + module. In other cases, you may want to change this to a + specific IP or 0.0.0.0 to listen on all interfaces. ''; }; diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix new file mode 100644 index 00000000000..7488e05fc03 --- /dev/null +++ b/nixos/modules/services/networking/blocky.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.blocky; + + format = pkgs.formats.yaml { }; + configFile = format.generate "config.yaml" cfg.settings; +in +{ + options.services.blocky = { + enable = mkEnableOption "Fast and lightweight DNS proxy as ad-blocker for local network with many features"; + + settings = mkOption { + type = format.type; + default = { }; + description = '' + Blocky configuration. Refer to + <link xlink:href="https://0xerr0r.github.io/blocky/configuration/"/> + for details on supported values. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.blocky = { + description = "A DNS proxy and ad-blocker for the local network"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}"; + + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index 9d063b92aa1..4f3881af8bb 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -81,7 +81,9 @@ let http_access deny all # Squid normally listens to port 3128 - http_port ${toString cfg.proxyPort} + http_port ${ + optionalString (cfg.proxyAddress != null) "${cfg.proxyAddress}:" + }${toString cfg.proxyPort} # Leave coredumps in the first cache dir coredump_dir /var/cache/squid @@ -109,6 +111,12 @@ in description = "Whether to run squid web proxy."; }; + proxyAddress = mkOption { + type = types.nullOr types.str; + default = null; + description = "IP address on which squid will listen."; + }; + proxyPort = mkOption { type = types.int; default = 3128; diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 8a0ca33b51f..c6d4ed6d39d 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -192,6 +192,7 @@ in { # Copy config folder chmod g+s "${dataDir}" cp -r "${cfg.package}/share/config" "${dataDir}/" + mkdir -p "${dataDir}/misc" chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 68333d43a5d..a8fe14c58f0 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -173,13 +173,18 @@ sub parseSystemdIni { # # If a directory with the same basename ending in .d exists next to the unit file, it will be # assumed to contain override files which will be parsed as well and handled properly. -sub parseUnit { - my ($unitPath) = @_; +sub parse_unit { + my ($unit_path) = @_; # Parse the main unit and all overrides - my %unitData; - parseSystemdIni(\%unitData, $_) for glob("${unitPath}{,.d/*.conf}"); - return %unitData; + my %unit_data; + # Replace \ with \\ so glob() still works with units that have a \ in them + # Valid characters in unit names are ASCII letters, digits, ":", "-", "_", ".", and "\" + $unit_path =~ s/\\/\\\\/gmsx; + foreach (glob "${unit_path}{,.d/*.conf}") { + parseSystemdIni(\%unit_data, "$_") + } + return %unit_data; } # Checks whether a specified boolean in a systemd unit is true @@ -310,7 +315,7 @@ sub handleModifiedUnit { # Revert of the attempt: https://github.com/NixOS/nixpkgs/pull/147609 # More details: https://github.com/NixOS/nixpkgs/issues/74899#issuecomment-981142430 } else { - my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parseUnit($newUnitFile); + my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parse_unit($newUnitFile); if (parseSystemdBool(\%unitInfo, "Service", "X-ReloadIfChanged", 0) and not $unitsToRestart->{$unit} and not $unitsToStop->{$unit}) { $unitsToReload->{$unit} = 1; recordUnit($reloadListFile, $unit); @@ -412,12 +417,12 @@ while (my ($unit, $state) = each %{$activePrev}) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { - my %unitInfo = parseUnit($prevUnitFile); + my %unitInfo = parse_unit($prevUnitFile); $unitsToStop{$unit} = 1 if parseSystemdBool(\%unitInfo, "Unit", "X-StopOnRemoval", 1); } elsif ($unit =~ /\.target$/) { - my %unitInfo = parseUnit($newUnitFile); + my %unitInfo = parse_unit($newUnitFile); # Cause all active target units to be restarted below. # This should start most changed units we stop here as @@ -451,8 +456,8 @@ while (my ($unit, $state) = each %{$activePrev}) { } else { - my %old_unit_info = parseUnit($prevUnitFile); - my %new_unit_info = parseUnit($newUnitFile); + my %old_unit_info = parse_unit($prevUnitFile); + my %new_unit_info = parse_unit($newUnitFile); my $diff = compare_units(\%old_unit_info, \%new_unit_info); if ($diff eq 1) { handleModifiedUnit($unit, $baseName, $newUnitFile, \%new_unit_info, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index 6edafd6695b..cf6d19eb5f0 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -48,7 +48,12 @@ in what = "tmpfs"; where = "/tmp"; type = "tmpfs"; - mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ]; + mountConfig.Options = concatStringsSep "," [ "mode=1777" + "strictatime" + "rw" + "nosuid" + "nodev" + "size=${toString cfg.tmpOnTmpfsSize}" ]; } ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 520c48bc45b..a0beaf98de5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -52,6 +52,7 @@ in bitcoind = handleTest ./bitcoind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; + blocky = handleTest ./blocky.nix {}; boot = handleTestOn ["x86_64-linux" "aarch64-linux"] ./boot.nix {}; boot-stage1 = handleTest ./boot-stage1.nix {}; borgbackup = handleTest ./borgbackup.nix {}; diff --git a/nixos/tests/blocky.nix b/nixos/tests/blocky.nix new file mode 100644 index 00000000000..18e7f45e1c7 --- /dev/null +++ b/nixos/tests/blocky.nix @@ -0,0 +1,34 @@ +import ./make-test-python.nix { + name = "blocky"; + + nodes = { + server = { pkgs, ... }: { + environment.systemPackages = [ pkgs.dnsutils ]; + services.blocky = { + enable = true; + + settings = { + customDNS = { + mapping = { + "printer.lan" = "192.168.178.3,2001:0db8:85a3:08d3:1319:8a2e:0370:7344"; + }; + }; + upstream = { + default = [ "8.8.8.8" "1.1.1.1" ]; + }; + port = 53; + httpPort = 5000; + logLevel = "info"; + }; + }; + }; + }; + + testScript = '' + with subtest("Service test"): + server.wait_for_unit("blocky.service") + server.wait_for_open_port(53) + server.wait_for_open_port(5000) + server.succeed("dig @127.0.0.1 +short -x 192.168.178.3 | grep -qF printer.lan") + ''; +} diff --git a/nixos/tests/bpf.nix b/nixos/tests/bpf.nix index 233c7dab1ee..e479cd05792 100644 --- a/nixos/tests/bpf.nix +++ b/nixos/tests/bpf.nix @@ -18,8 +18,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { # simple BEGIN probe (user probe on bpftrace itself) print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'")) # tracepoint - print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit(); }'")) + print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'")) # kprobe print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'")) + # BTF + print(machine.succeed("bpftrace -e 'kprobe:schedule { " + " printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() " + "}'")) ''; }) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 3357d83342d..4f297b6521d 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -145,6 +145,23 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.test.serviceConfig."X-Test" = "test"; }; + unitWithBackslash.configuration = { + systemd.services."escaped\\x2ddash" = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + unitWithBackslashModified.configuration = { + imports = [ unitWithBackslash.configuration ]; + systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test"; + }; + restart-and-reload-by-activation-script.configuration = { systemd.services = rec { simple-service = { @@ -433,6 +450,25 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "as well:") assert_contains(out, "would start the following units: test.service\n") + # Ensure \ works in unit names + out = switch_to_specialisation("${machine}", "unitWithBackslash") + assert_contains(out, "stopping the following units: test.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: escaped\\x2ddash.service\n") + assert_lacks(out, "as well:") + + out = switch_to_specialisation("${machine}", "unitWithBackslashModified") + assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + with subtest("failing units"): # Let the simple service fail switch_to_specialisation("${machine}", "simpleServiceModified") diff --git a/pkgs/applications/audio/freac/default.nix b/pkgs/applications/audio/freac/default.nix index 89c4847eded..ef4a6bc21af 100644 --- a/pkgs/applications/audio/freac/default.nix +++ b/pkgs/applications/audio/freac/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "freac"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "enzo1982"; repo = "freac"; rev = "v${version}"; - sha256 = "sha256-cRmN9D/+FLiXqZW/PYhw61EoZuL3y61YtQ/ZNjnhfmY="; + sha256 = "sha256-PDFc/RhxIe6M3lfVHE1QmJnu5Sy+q/yrXrXPV/8X51o="; }; buildInputs = [ diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 3bc06abcbff..60df749a142 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp $src $out/lib/JMusicBot makeWrapper ${jre}/bin/java $out/bin/JMusicBot \ - --add-flags "-Xmx1G -Dnogui=true -jar $out/lib/JMusicBot" + --add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/JMusicBot" ''; meta = with lib; { diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix index 420055884b4..be40def2644 100644 --- a/pkgs/applications/audio/orca-c/default.nix +++ b/pkgs/applications/audio/orca-c/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation { postPatch = '' patchShebangs tool + sed -i tool \ + -e 's@ncurses_dir=.*@ncurses_dir="${ncurses}"@' \ + -e 's@portmidi_dir=.*@portmidi_dir="${portmidi}"@' tool ''; installPhase = '' diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index ebda772b9bd..e55a43f5ac2 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.10"; + version = "0.8.9.12"; propagatedBuildInputs = with python3Packages; [ requests @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { owner = "coderholic"; repo = pname; rev = version; - sha256 = "1cvrvy5ll97yyrzakxr8lb25qxmzk9fvcabsgc98jf89ikxgax4w"; + sha256 = "sha256-ZBlb0wpw5/s3JuyV2OpGZwlY1UcQzLHP1/VhGlEr6Zo="; }; checkPhase = '' diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 5e7f5c7cce2..444443cd10c 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.0.1"; + version = "7.1.1"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-Sw9w6vFXk2Cx7LdfMsou9IDheVckdusc0iGWkVsVtCQ="; + sha256 = "sha256-eVliTSFTBG56mU1Crt3syoYxKclz/6W15y/30C+Tf1g="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 3aa3f622024..842ebcc69ec 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.15"; + version = "1.10.16"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0f6n9rg42ph47mvykc9f0lf99yzwqy4jm7mlzyks4l6i6fl1g3q1"; + sha256 = "sha256-l+hxAUw55d9MYLIUdF6qSEIelJQYRCvHyw1yuossmyA="; }; - vendorSha256 = "1s5yfpk2yn7f3zwjl2fdrh6c63ki2b8rlmnlss27yxibsidaj0yd"; + vendorSha256 = "sha256-keeox2d2WEzY9ynEcovPaU95YzVQlbTu1i7PLpjkjZU="; doCheck = false; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 2004f607fe0..007352ef847 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -741,10 +741,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.18.tar"; - sha256 = "1g1b05wc9qql5qw3diprx0ay2rmq7963gdgyh7bi5i0xlfaspbgi"; + url = "https://elpa.gnu.org/packages/corfu-0.19.tar"; + sha256 = "0jilhsddzjm0is7kqdklpr2ih50k2c3sik2i9vlgcizxqaqss97c"; }; packageRequires = [ emacs ]; meta = { @@ -1236,10 +1236,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220120"; + version = "20220212"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220120.tar"; - sha256 = "0wbm7bd48vl66vhraqfwycz989hd36whris1xa5rbhfbxgz2d1sx"; + url = "https://elpa.gnu.org/packages/eev-20220212.tar"; + sha256 = "1w04jwh8y6l1fgx6sahwj9znw9cm83a1lld5vdgnbsww2m5nk8zm"; }; packageRequires = [ emacs ]; meta = { @@ -1339,10 +1339,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.13"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.13.tar"; - sha256 = "13gvljqj7k8qpyn9fcwa6gl3kqakiy5rqx5s3afdc2y356a06wr6"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.14.tar"; + sha256 = "1n9p4kl4d5rcbjgl8yifv0nqnrzxsx937fm0d2j589gg28rzlqpb"; }; packageRequires = []; meta = { @@ -1594,10 +1594,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.2.1.tar"; - sha256 = "1j4j1mxqvkpdccrm5khykmdpm8z9p0pxvnsw4cz9b76xzfdzy5pz"; + url = "https://elpa.gnu.org/packages/flymake-1.2.2.tar"; + sha256 = "04pa6mayyqrhrijk0rmmrd7k7al9caqyrb5qzkzwbna9ykb1j4zp"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2216,7 +2216,7 @@ version = "1.0.15"; src = fetchurl { url = "https://elpa.gnu.org/packages/jsonrpc-1.0.15.tar"; - sha256 = "1hx378rg12jz2zm105cvrqk0nqyzsn04l59d903l98d6lbd96rsw"; + sha256 = "0biwvkvd48xqvigzs00yz4mk847xzyzm7p0lkns58fxph9nkg4h5"; }; packageRequires = [ emacs ]; meta = { @@ -2426,7 +2426,7 @@ version = "3.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/map-3.2.1.tar"; - sha256 = "1vy231m2fm5cgz5nib14ib7ifprajhnbmzf6x4id48h2491m1n24"; + sha256 = "1zj0y3nvkrd2v43za214xr3h9z6wyp7r5s6nf5g1pj272yb871d1"; }; packageRequires = [ emacs ]; meta = { @@ -2483,10 +2483,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mct-0.4.2.tar"; - sha256 = "0as8298mb136az555zag5q3xvc7d0z508d3siii60wmzs9dyb8dx"; + url = "https://elpa.gnu.org/packages/mct-0.5.0.tar"; + sha256 = "0yv0hqkyh5vpmf5i50fdc2rw3ssvrd9pn3n65v3gmb195gzmn6r9"; }; packageRequires = [ emacs ]; meta = { @@ -2625,7 +2625,7 @@ version = "2.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/modus-themes-2.0.0.tar"; - sha256 = "16kvkm7hsdk6jfdjkzafwdkwwri7cqki29qxqqhzkpwwghqlissl"; + sha256 = "15d1ywj8k4yh57arzv7z2ir49gf2j7a80pscrfgxsypnyl2dkkfa"; }; packageRequires = [ emacs ]; meta = { @@ -3021,6 +3021,21 @@ license = lib.licenses.free; }; }) {}; + org-remark = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: + elpaBuild { + pname = "org-remark"; + ename = "org-remark"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-remark-1.0.2.tar"; + sha256 = "12g9kmr0gfs1pi1410akvcaiax0dswbw09sgqbib58mikb3074nv"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-remark.html"; + license = lib.licenses.free; + }; + }) {}; org-transclusion = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-transclusion"; @@ -3145,10 +3160,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/parser-generator-0.1.3.tar"; - sha256 = "13ssmdlni9ma6iafr4zwa2jlmq6rdlaafkdpli1a4jrk6ri6w996"; + url = "https://elpa.gnu.org/packages/parser-generator-0.1.4.tar"; + sha256 = "0712y22cl6i98jlhmsm436v0mlmscbypc15sdkn704a491ipq2qj"; }; packageRequires = [ emacs ]; meta = { @@ -3268,7 +3283,7 @@ version = "0.8.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/project-0.8.1.tar"; - sha256 = "1x3zkbjsi04v5ny3yxqrb75vcacrj9kxmpm9mvkp0n07j5g34f68"; + sha256 = "0q2js8qihlhchpx2mx0f992ygslsqri2q4iv8kcl4fx31lpp7c1k"; }; packageRequires = [ emacs xref ]; meta = { @@ -3343,7 +3358,7 @@ version = "0.28"; src = fetchurl { url = "https://elpa.gnu.org/packages/python-0.28.tar"; - sha256 = "1pvhsdjla1rvw223h7irmbzzsrixnpy1rsskiq9xmkpkc688b6pm"; + sha256 = "1kc596b8bbcp8y87kqyxsv3bblz8l0vyc0d645ayb1cmwwvk35d5"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3802,7 +3817,6 @@ license = lib.licenses.free; }; }) {}; - # removed duplicated shell-command-plus shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "shell-command-plus"; @@ -3945,7 +3959,7 @@ version = "1.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar"; - sha256 = "053msvy2pyispwg4zzpaczfkl6rvnwfklm4jdsbjhqm0kx4vlcs9"; + sha256 = "0gb5ypl9phhv8sx7akw9xn7njfq86yqngixhxf8qj1fxp57gfpdb"; }; packageRequires = [ emacs ]; meta = { @@ -3964,7 +3978,7 @@ version = "3.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/soap-client-3.2.1.tar"; - sha256 = "0ajv6l1p8dinnlybwzvv4c2i6291is6isjxb2h4apg27g66qbcki"; + sha256 = "0v3aj059cvfv5yc9fx8naq8ygphlpbasc1nksgfim8iyk9wg7l3n"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4549,7 +4563,7 @@ version = "2021.10.14.127365406"; src = fetchurl { url = "https://elpa.gnu.org/packages/verilog-mode-2021.10.14.127365406.tar"; - sha256 = "0d842dwg98srv73nkg69c7x24rw20mxgqmb4k1qcbl02bwxkfmsm"; + sha256 = "1v0ld310rs86vzmlw7phv1b5p59faqs9wg4p8jpbnb9ap9lwidnl"; }; packageRequires = []; meta = { @@ -4734,10 +4748,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.5.1.tar"; - sha256 = "187cssvqpd0wj01rgd19pp1k6aj9m2n5fdqznkga6w1h6cb5cm2b"; + url = "https://elpa.gnu.org/packages/which-key-3.6.0.tar"; + sha256 = "05wy147734mlpzwwxdhidnsplrz2vzs1whczzs4jw1i7kp7jvy3v"; }; packageRequires = [ emacs ]; meta = { @@ -4892,7 +4906,7 @@ version = "1.3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/xref-1.3.2.tar"; - sha256 = "13bsaxdxwn14plaam0hsrswngh3rm2k29v5ybjgjyjy4d5vwz78j"; + sha256 = "1bwvli2d6d06gh004hnbbwy6rkn0jv1d1s7slfladqjjdkpjvpzd"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 89f2eb07d7d..37559b0536d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -454,10 +454,10 @@ elpaBuild { pname = "elpher"; ename = "elpher"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elpher-3.3.1.tar"; - sha256 = "056z3ryj2288wgl8h4b33v9hybm8n2kfrqyb22bmlq1npcixyjl7"; + url = "https://elpa.nongnu.org/nongnu/elpher-3.3.2.tar"; + sha256 = "1w34agw5qfgbpk6s2bllvgkj4wm1rlcyn33yfgj2xr4a5gfcs30a"; }; packageRequires = [ emacs ]; meta = { @@ -752,10 +752,10 @@ elpaBuild { pname = "geiser-gambit"; ename = "geiser-gambit"; - version = "0.17"; + version = "0.18.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.17.tar"; - sha256 = "12r9h1dl0y9j421v0idvr9ljj93962xfrs0nff5lmx5z1cayq456"; + url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar"; + sha256 = "03cv51war65yrg5qswwlx755byn2nlm1qvbzqqminnidz64kfd3v"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1039,31 +1039,31 @@ license = lib.licenses.free; }; }) {}; - helm = callPackage ({ elpaBuild, fetchurl, lib }: + helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, popup }: elpaBuild { pname = "helm"; ename = "helm"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.8.3.tar"; - sha256 = "00qjcv4qxjw50zp5dzvn79c0xpyla4h41fxkr2jjszq6qzgd92cv"; + url = "https://elpa.nongnu.org/nongnu/helm-3.8.4.tar"; + sha256 = "0yc7ijap3g68w7npgwymzlp5bcawk3lhnp0004m03zfdbxhmkq0z"; }; - packageRequires = []; + packageRequires = [ helm-core popup ]; meta = { homepage = "https://elpa.gnu.org/packages/helm.html"; license = lib.licenses.free; }; }) {}; - helm-core = callPackage ({ elpaBuild, fetchurl, lib }: + helm-core = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.3.tar"; - sha256 = "11ggn1fmi8wbg2igs5lqppyccgpz8kyfzl17wqkr5xy69lr1jn5g"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.4.tar"; + sha256 = "0a1liapy345nlqjgxbzad0mkdbs4g6619cqplwiyh89x0lm0jprx"; }; - packageRequires = []; + packageRequires = [ async emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/helm-core.html"; license = lib.licenses.free; @@ -1126,10 +1126,10 @@ elpaBuild { pname = "iedit"; ename = "iedit"; - version = "0.9.9.9"; + version = "0.9.9.9.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.tar"; - sha256 = "1kwm7pa1x5dbn9irdrz9vg5zivrqx1w2ywrbpglk2lgd9kff0nsj"; + url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.9.tar"; + sha256 = "1ic780gd7n2qrpbqr0vy62p7wsrskyvyr571m8m3j25fii8v8cxg"; }; packageRequires = []; meta = { @@ -1220,10 +1220,10 @@ elpaBuild { pname = "keycast"; ename = "keycast"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/keycast-1.1.3.tar"; - sha256 = "0b4vyaxqdw11ai81vnvif8i02jcaf5hk64kbb7bs90527zwz2fw0"; + url = "https://elpa.nongnu.org/nongnu/keycast-1.2.0.tar"; + sha256 = "0iiksz8lcz9y5yplw455v2zgvq2jz6jc2ic3ybax10v3wgxnhiad"; }; packageRequires = [ emacs ]; meta = { @@ -1325,10 +1325,10 @@ elpaBuild { pname = "markdown-mode"; ename = "markdown-mode"; - version = "2.4"; + version = "2.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.4.tar"; - sha256 = "002nvc2p7jzznr743znbml3vj8a3kvdd89rlbi28f5ha14g2567z"; + url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.5.tar"; + sha256 = "195p4bz2k5rs6222pfxv6rk2r22snx33gvc1x3rs020lacppbhik"; }; packageRequires = [ emacs ]; meta = { @@ -1604,10 +1604,10 @@ elpaBuild { pname = "orgit"; ename = "orgit"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/orgit-1.7.2.tar"; - sha256 = "1kf72l8h3wqgnrchy6wvhm3nmc9drh82yw5211f4xgg2ckr60rn1"; + url = "https://elpa.nongnu.org/nongnu/orgit-1.8.0.tar"; + sha256 = "03qjhiv3smnpjciz5sfri7v5gzgcnk5g0lhgm06flqnarfrrkn1h"; }; packageRequires = [ emacs magit org ]; meta = { @@ -1640,10 +1640,10 @@ elpaBuild { pname = "parseclj"; ename = "parseclj"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseclj-1.0.6.tar"; - sha256 = "0cs6a394pll9sl8ybpsygg9mkznpz119f8hjgw3n7mgkwfc5a30k"; + url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.0.tar"; + sha256 = "0h6fia59crqb1y83a04sjlhlpm6349s6c14zsiqsfi73m97dli6p"; }; packageRequires = [ emacs ]; meta = { @@ -1655,10 +1655,10 @@ elpaBuild { pname = "parseedn"; ename = "parseedn"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseedn-1.0.6.tar"; - sha256 = "1274pr91hcrvy4srdy2dw14hbcg2qy24z4klx6mashgzb1r42n3d"; + url = "https://elpa.nongnu.org/nongnu/parseedn-1.1.0.tar"; + sha256 = "1by9cy7pn12124vbg59c9qmn2k8v5dbqq4c8if81fclrccjqhrz4"; }; packageRequires = [ emacs map parseclj ]; meta = { @@ -2009,10 +2009,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.2.tar"; - sha256 = "187ksczrqqzjnbvh8px3xvqyf38i7ac24z1qxzybd4vx2n071v64"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.3.tar"; + sha256 = "0wibakmp1lhfyr6sifb7f3jcqp2s5sy0z37ad9n1n9rhj5q8yhzg"; }; packageRequires = [ emacs ]; meta = { @@ -2146,6 +2146,21 @@ license = lib.licenses.free; }; }) {}; + typescript-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "typescript-mode"; + ename = "typescript-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar"; + sha256 = "1102c35w2b66q5acvhsk6yigzhp6n3rl0s28xnvb74ansk4rz35k"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/typescript-mode.html"; + license = lib.licenses.free; + }; + }) {}; ujelly-theme = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ujelly-theme"; @@ -2245,10 +2260,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.1.1.tar"; - sha256 = "175k68mr0n3v5l3gbv2fsdfznm9yjy32l3ay6hj0d4c53kw76hvn"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.2.0.tar"; + sha256 = "1rsggbhkngzbcmg3076jbi1sfkzz8p4s5i00sk0ywc6vkmsp6s1k"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index fc60a6916c4..a45ebde817a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -204,11 +204,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20211208, - 2116 + 20220217, + 2054 ], - "commit": "b1a436922ba06ab9e1a5cc222f1a4f25a7697231", - "sha256": "0alscwf2937ak2pzgl9jih7s9dya7kibl59qik4fy6xbq5h52v77" + "commit": "1cb08537e255c60a9439e3fea7c5d406e32f5e97", + "sha256": "1mm8c69r9jjs4qr0nha7pj1i8pq03q4nban4pik280swn4c8f3zl" }, "stable": { "version": [ @@ -2601,15 +2601,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220125, - 1547 + 20220217, + 604 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "1365b83824614656278b0b818fadf293e8ec0973", - "sha256": "0xx0ls0i6rhnacyscxzpnpdm9vy79lj634jvi9cp572y742l7cpx" + "commit": "d2658536b58cb42e9f2dac551d42055b734552ba", + "sha256": "0mn5dqcfs4z5lsl5104zf7km819xcxpmdk3v7r9dnrnny3al7qfi" }, "stable": { "version": [ @@ -2672,11 +2672,11 @@ "repo": "jcs-elpa/alt-codes", "unstable": { "version": [ - 20220205, - 722 + 20220212, + 1526 ], - "commit": "a1671339bde3dec273b367bf7dc849d1c306dac6", - "sha256": "17n11prkp1d1ln16jcfyy1m6wp6i8qi57zwy8g9cr13xwgq9f324" + "commit": "2a61756abccb9cf3c0e353ca894ce5d5bee0f93b", + "sha256": "0la0bwnbbjbdmhxhz77s48icqfrf3axl2xgbc82cz93axd67y530" }, "stable": { "version": [ @@ -2754,25 +2754,6 @@ } }, { - "ename": "ammonite-term-repl", - "commit": "cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a", - "sha256": "004cvhyh4afgpb31m1q31g98x8c9m6lmsb5fzc4a1r5pb4p3iimp", - "fetcher": "github", - "repo": "zwild/ammonite-term-repl", - "unstable": { - "version": [ - 20200416, - 559 - ], - "deps": [ - "s", - "scala-mode" - ], - "commit": "b552fe21977e005c1c460bf6607557e67241a6b6", - "sha256": "0g6ldvzcm6arm6hxiz1y168mj73kipgbjzxciif2b4sd3z7wpnp6" - } - }, - { "ename": "ample-regexps", "commit": "6a5c72dfb52d55b2b22c91f115b32fff14f2f61e", "sha256": "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2", @@ -2819,20 +2800,20 @@ }, { "ename": "amread-mode", - "commit": "2155dbd9bdf7b1f6f500c11ad1796c2ba2ddadec", - "sha256": "19wafb0aszphdmx9ayiazvq2avj9kqhanszh714n397810ak7k0v", - "fetcher": "github", - "repo": "stardiviner/amread-mode", + "commit": "b94f03b35acf501b2c4c638b5b0a745dbda804f2", + "sha256": "0xwqk4nd9hkq133l9b1n9lrv6nrfirpfzin53gb2a8v442s2anfc", + "fetcher": "git", + "url": "https://repo.or.cz/amread-mode.git", "unstable": { "version": [ - 20200623, - 1544 + 20220210, + 1354 ], "deps": [ "cl-lib" ], - "commit": "7b1ed6c8aea409e2dce4a3b59f304d716a8efab7", - "sha256": "12hcgkznf1l4db8y0q33v735b5iin8iycc5s0di46ichxcjr0b7x" + "commit": "a3358645582148e81bff54e18877451b747173bb", + "sha256": "0nl1w5ysq90bxl16jrdh87wyp6ffawbjc3c6zrbhsfmfd24jiq28" } }, { @@ -3250,8 +3231,8 @@ 20200914, 644 ], - "commit": "9911f73061e21a87fad76c662463257afe02c861", - "sha256": "1sma8i82g9kv6b5mmvfxgr70pbjgy9m2f8ynh1gr2mq0b1jkgxjk" + "commit": "d4333bbfbdb93fb9cc2ea321438bf552ec0adee6", + "sha256": "07vswfw20bavl82cdi7p84dgkjkx0x117cs2kkf6is8b0wwa22g8" }, "stable": { "version": [ @@ -3903,20 +3884,20 @@ }, { "ename": "arduino-mode", - "commit": "2db785f52c2facc55459e945ccb4d4b088506747", - "sha256": "1amqah0sx95866ikdlc7h7n9hmrwaqizc0rj0gliv15kjjggv55v", - "fetcher": "github", - "repo": "stardiviner/arduino-mode", + "commit": "eba5c2d5ea1316bf49cd9928c82b63efbe502708", + "sha256": "12lpcqmgklflbayp45wh7sdw4whywz4pxdb6fvlmnxzjc9lamdhc", + "fetcher": "git", + "url": "https://repo.or.cz/arduino-mode.git", "unstable": { "version": [ - 20211112, - 1223 + 20220210, + 1355 ], "deps": [ "spinner" ], - "commit": "3bc47bd7f75a7ccae409236dab43208ce8d41d51", - "sha256": "1jsifn9gfpb2rwhz9fr6r4qsmyydfd6rmz87iy7884nrnxkmdsci" + "commit": "652c6a328fa8f2db06534d5f231c6b6933be3edc", + "sha256": "16izwrk1dfsa14kylfhsxdwkx76g0jdk0znl1z7cypxh5q9ijy1x" } }, { @@ -4315,8 +4296,8 @@ 20201026, 339 ], - "commit": "411e9c943cf8ee966d7850c69b5e3c405e268246", - "sha256": "00977n8sp0bbpnbqwj2jfdvm9d9cqwfl4mn1wv1dj6bzfzxp68mc" + "commit": "3abed97b7a139b07a89fb2a8434c794892a3f96a", + "sha256": "05wdi6bab8avy6512q09fdwfn6vl9d1xjvrrs2m2mj9gl31anli2" }, "stable": { "version": [ @@ -4339,8 +4320,8 @@ 20210731, 609 ], - "commit": "7d6332093d2ad6963b2305ad3038f44b941a43c1", - "sha256": "01xdll1gyachgh9p9pc3c0pdki2h2xmiri9cslsaq48y9gklgaw2" + "commit": "8cc7ce7f5a7366ab3532c074b09ae716a8396713", + "sha256": "10pkh1n1ay5jqfh59l42kl9z76d5397ak3rak6l1gg55jy7xjkh2" }, "stable": { "version": [ @@ -4640,8 +4621,8 @@ "keytar", "s" ], - "commit": "c9ce75de3784ba68b44a643e4d00e59e351d976a", - "sha256": "03pa44qhyyyv476gbpzshywr2yg6m48rq6kgzli3bajd4ysm9ism" + "commit": "35781cc09d578a72f4a63d674753570a1df6a301", + "sha256": "0krrgif4zvsr7ggnh6qpclcc8pc2lfdn0785as3iqd0hmgxgyd4m" }, "stable": { "version": [ @@ -4783,8 +4764,8 @@ "cl-lib", "popup" ], - "commit": "57cb8f2ee32dff17ea1b4431fe5920272aa38d72", - "sha256": "185q90ibw17dh2nwdljapdw2747hzv32n4hkjfcfsgw5asy58r8z" + "commit": "71dd984aa45dccea1cb797d336507eafa81b5bf4", + "sha256": "0cayj63jn1dc01bn4z87l783fiis4ixvmbww2pqii1i06mxsqxaw" }, "stable": { "version": [ @@ -5090,11 +5071,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20211101, - 1155 + 20220209, + 2101 ], - "commit": "a1c67bf557277934f6dae9f2de6624d949ef2c8a", - "sha256": "0z5afn48w3p3i98zn81422khbl0k460spgqj60b9s7sqccbssg57" + "commit": "33b5f88b799a17947c266b04ad59462c5aeb4ed7", + "sha256": "17h9hh8n6ib1crap8jdgjhaszvlqb4gri1z821apyn66lqvix7x8" } }, { @@ -5111,8 +5092,8 @@ "deps": [ "ht" ], - "commit": "5949aa269d3781985c3c9fc5e557bd82c3c1f7e4", - "sha256": "01qqdkd16zy5sqla821k2q3bh4gmlq5xp5wdar58rm7cww6r4w5x" + "commit": "d7a924febb2aa3ce6ce88ec31e317522e4965ff4", + "sha256": "08gmvq5ywh338ss99mvb9hc1p93dvq6hn6294kyp7v6svmrsgzjj" }, "stable": { "version": [ @@ -5261,8 +5242,8 @@ 20210805, 1344 ], - "commit": "77f66b75209628a267a5ced84cd85774e0e26b9a", - "sha256": "1n0b74zhj4v9gniy33im4cahxx33mhbkhjpb4ra4qahqdyl5a7c9" + "commit": "8d5cf320b7e151577bd1cb69541253f3b8fd0eaf", + "sha256": "1j2g4qzyw8l21bvw4gmah62a2z0dvblasvagd66jghdnvraz4rf6" }, "stable": { "version": [ @@ -5329,14 +5310,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20210522, - 612 + 20220209, + 554 ], "deps": [ "f" ], - "commit": "0dec9e632f1f3208f0da2f94b57efa1aae9ce2ab", - "sha256": "1isk9106lpdh45l41n2v8q8m9vcfb4biy9dv87rkks58nysrxy3z" + "commit": "df455f9723fbaab8ab550c7e7df79dc6b2d159c6", + "sha256": "14n77h7w69w0i845dbbq39nxnh1xw28kacp0cgf666r62vgdcvvj" }, "stable": { "version": [ @@ -5466,11 +5447,11 @@ "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ - 20220201, - 2102 + 20220215, + 1204 ], - "commit": "8965ce57c7d206e5d28167a37c11b9713576b009", - "sha256": "13ccb1r646c0k9vgr1h9r4xfn27yqw1489dj76nwq13awg81pjyr" + "commit": "00b87a82c4561b017052974eecd93c79b6790841", + "sha256": "1cnnw2cwhsrlp2nanvcgdpd90vpmzwxnr9sprwfgzldgk9651r58" } }, { @@ -5674,8 +5655,8 @@ "avy", "embark" ], - "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5", - "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f" + "commit": "29848fc3c88761fac6cea4093e6af48aa10b1fd3", + "sha256": "09vhqq1giawkc93xzrikcv271s7vnk7rwd6s2g678bs8n8li0160" }, "stable": { "version": [ @@ -6457,11 +6438,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20220114, - 1320 + 20220208, + 1818 ], - "commit": "57a28859258bc83f2cca62b8530221d228119655", - "sha256": "1vlg4b1k3jw2pssa7fpf9sx9bjb4gmswkcyv30ha4c8pm39byp79" + "commit": "90ff1d9b4c39ecb53bf1b0992d3c44049bc4b4eb", + "sha256": "0wfw0gdlx9xx874wqhi6nn23zw10anyrppz5ca2i7h3fqr2x72fk" } }, { @@ -6502,11 +6483,11 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20210108, - 38 + 20220211, + 546 ], - "commit": "03c9ab00642fd54d7fb601f95a094b8b7f0eefb0", - "sha256": "1nk4d3qb5ibdjp3jmlbf5751y8zd6gms9r19l3hk1ajkw94p43kn" + "commit": "1172bd901e29f5c001d52ef521b2b3ae50f3110c", + "sha256": "1cs0wsa4dr01rhdfqf28psmmbf0vpiazxk755r6vclxzr69cf3z6" }, "stable": { "version": [ @@ -6898,8 +6879,8 @@ 20210715, 1004 ], - "commit": "0be8e2ef7b40d9006b2812f103746799bc529828", - "sha256": "1grzlfa4dxf30yf7y40fw9fqm4fl74k5kcyxpffy3d876c7qdfnp" + "commit": "1df6e44fcb5a1d579a5f3b39b6e9256a4e8f3b9f", + "sha256": "0l3ji8w1fvzc0i2j9lp6w20pm9sbnz48iaais44jb0yi39b7mmy8" }, "stable": { "version": [ @@ -7576,8 +7557,8 @@ 20200404, 1550 ], - "commit": "9a208d395db66aebadf663344f18effffaac59fe", - "sha256": "1c8i82wxhldzbczhcdfnk9cggsfqpqbg9zar426drvn7vcz6xs3m" + "commit": "c221fa2c8a204b4aff2e09c606f59be58b960b97", + "sha256": "1zzrmlxifplpskm3a7hbm4x6mpikr1nhgds10qaxqv0gfq312p1c" }, "stable": { "version": [ @@ -7596,26 +7577,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220122, - 2332 + 20220213, + 1310 ], "deps": [ "a" ], - "commit": "f5c0fc350db07ca89839c6bec7196945dba495eb", - "sha256": "0phmisdckdq706wjhici8pnvvslq77dvv8pph5yawy7lvh07va6k" + "commit": "ed208798ecbc299003581229114d9404cd3f6c7a", + "sha256": "19zas7vam5l742ihpvjf56z9fzj9w71f1j1w7lmgvgs1zl76ycjy" }, "stable": { "version": [ 0, 3, - 8 + 9 ], "deps": [ "a" ], - "commit": "f5c0fc350db07ca89839c6bec7196945dba495eb", - "sha256": "0phmisdckdq706wjhici8pnvvslq77dvv8pph5yawy7lvh07va6k" + "commit": "ed208798ecbc299003581229114d9404cd3f6c7a", + "sha256": "19zas7vam5l742ihpvjf56z9fzj9w71f1j1w7lmgvgs1zl76ycjy" } }, { @@ -8021,11 +8002,11 @@ "repo": "ideasman42/emacs-bookmark-in-project", "unstable": { "version": [ - 20220201, - 544 + 20220212, + 156 ], - "commit": "ff0d1c3531352a6c54bb48ced797f41bda95939e", - "sha256": "06cprpbff06q98d06vljcrmvixvdnvjmwqgxvpz9yx7s14ml289l" + "commit": "70ae40b4c4cdf44999ee4c738f5a4ae34a2d8421", + "sha256": "1hidzm6yv5fqx93shfxx70xsjbyzkia00ylxd06jniqpydl3fydh" } }, { @@ -8036,11 +8017,11 @@ "repo": "minad/bookmark-view", "unstable": { "version": [ - 20211223, - 1106 + 20220216, + 2024 ], - "commit": "841750afb272a596f1536e6a5731d9de22c7c5cb", - "sha256": "0bgbmjbjq70q4zmdhaz9jnhi5gkzxwz9fbh60sgnm90hjmfrrr2d" + "commit": "314e74e11386af72ca282e228996321a8a6d4c9a", + "sha256": "1bqajd2slg5gh33q84ps9cpv0g04y5gz6m8gy55m01f2zrwxvyqc" }, "stable": { "version": [ @@ -8116,28 +8097,28 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220131, - 1421 + 20220216, + 1925 ], "deps": [ "epkg", "magit" ], - "commit": "0bad132b4eb25ae9a1e26360e7b87771ab3208d3", - "sha256": "134cirgaxypsr39dlhshw3db4d9cz56dhl4d7d41lbzysih472km" + "commit": "ee4491481955eb49de07693b58e00a5ff5908d0b", + "sha256": "1p13q43l9da48vpwgjwirwvwqwlmksgvq4w6n77sy6akx2xywgzv" }, "stable": { "version": [ 3, 3, - 0 + 1 ], "deps": [ "epkg", "magit" ], - "commit": "e4d54aac5c2307cafb5c509094701b9ca78cace8", - "sha256": "102qdb4581gfhrxv61pd6yw5xbyd3vs8ifq2wp9wq6bf19il2rm9" + "commit": "66f00318777a3530741535f64a420addc1ccf44a", + "sha256": "0w180am9p952j2iyidf5krivlx19mv1ji1f34cwm969mhb3652fy" } }, { @@ -8817,8 +8798,8 @@ 20200924, 345 ], - "commit": "b48834a688e35b9966fa5a189781c7638092fd54", - "sha256": "1msg17qw6clld78jb40hd1fnsgswql57yw4kh37mn0v2ksa8a9s5" + "commit": "327c378c333156321974ffcf93f19aa9fad59a9e", + "sha256": "02wihnxifb17g9hn0l6ia63whfxvx7351s64ffpvvjjryz8l95fg" }, "stable": { "version": [ @@ -9565,11 +9546,11 @@ "repo": "unhammer/calendar-norway.el", "unstable": { "version": [ - 20210608, - 1136 + 20220211, + 1129 ], - "commit": "4dd8c38ef30ad45931c8ae7bcdfd720c3fcffffc", - "sha256": "02xf57dincpn7km1f3c9dnq2qv6lk07m9z5hilm3nnns0wwzqdyw" + "commit": "0db0ea63365f4ff5f7d18fb8335fa88af194a2cc", + "sha256": "0bhqr67w301fb74drnw6291bri9ga95946n7jg382jcp6sxn9cpg" }, "stable": { "version": [ @@ -9753,18 +9734,19 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20210728, - 802 + 20220214, + 1251 ], "deps": [ "anaconda-mode", + "beacon", "cl-lib", "hierarchy", "ivy", "tree-mode" ], - "commit": "7a40f9ddb16a6ce9345e0bd632109b7e2048baa1", - "sha256": "18as7vq8cmhxkxgh0p8qlifyvza66n6xf9a2fi07wc4acp2gpn55" + "commit": "aa5ffb15cec39920012aa526e932d48e5c74bbb0", + "sha256": "12rsylxr9ls6br38vwq9h6fzqsqjxgqwyv76wf6qaazd4rp76m0y" }, "stable": { "version": [ @@ -9893,11 +9875,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220201, - 2018 + 20220214, + 1115 ], - "commit": "dba8492f70a46fde51d6269ae971693fd1777575", - "sha256": "1jaygxplh2y8lqq7p0yynql5zrb6yf0vyrcbwi1dvllq0clncnwn" + "commit": "e5e11f30f0b6ed0a2b283d5d3dec84bcd36557fc", + "sha256": "0qxypl6ghr31idgn2mvwgjkp1fhjlhwjldnqim4l658yxivh2jyz" }, "stable": { "version": [ @@ -9919,8 +9901,8 @@ 20210707, 2310 ], - "commit": "55a368beb987abf9eeb9b3843e9c5423ad37ab29", - "sha256": "1cnc69ny4icjz9rzqj5sli5vbqkrv3sbahbsl1c0ma28rbqasw0w" + "commit": "767b8a30ee100f1c648a75c9aaf252212d904c17", + "sha256": "0hdfi052yfmsfzx00wxmsk129vvxdhcgixnyjaf13kamg2xm69im" }, "stable": { "version": [ @@ -9970,14 +9952,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20220102, - 1217 + 20220208, + 1933 ], "deps": [ "markdown-mode" ], - "commit": "5589f9f46f3e1cdeb6261515ce314aab40f3d786", - "sha256": "133cj1qbb53hm3ffkvf80cyd6hj69l8kxklnig8ap1ymhha075g3" + "commit": "841ea7d85edd10c94138339469c4d8bbd03c8a29", + "sha256": "0gnah3bdcii2xrjnwpr9kzl5x8p85dv61yl48j3fizanjmwhan13" }, "stable": { "version": [ @@ -10289,8 +10271,8 @@ 20210501, 820 ], - "commit": "251df5b02c91311140d2375b019c1de836655fd0", - "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" + "commit": "eede626d70953715d2405b325dcb151b7cb597e7", + "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" } }, { @@ -10338,8 +10320,8 @@ 20200904, 1431 ], - "commit": "251df5b02c91311140d2375b019c1de836655fd0", - "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" + "commit": "eede626d70953715d2405b325dcb151b7cb597e7", + "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" } }, { @@ -10608,8 +10590,8 @@ 20171115, 2108 ], - "commit": "049018b8f756a41643fdbaa45372b310d56e4211", - "sha256": "1gb7dz2jd0fvxzc4spp3c3hmpwcy8cqkw2qspnhkbxc7q7hirski" + "commit": "62380f6c464be1f773820db99d3529277e427e1f", + "sha256": "16w4njjv1z67syx1w2vi7vbf2n78r33jjcq74bwk3hqv440nq95f" }, "stable": { "version": [ @@ -11080,14 +11062,14 @@ "repo": "tuh8888/chezmoi.el", "unstable": { "version": [ - 20220131, - 1935 + 20220214, + 311 ], "deps": [ "magit" ], - "commit": "3d7f6bf3abaf0f236e159bde4751b55bc803a7d6", - "sha256": "0xyn59r3m453vy2x1gm7cmw6pd8ws1jiq5979cb8cr068g8pkp18" + "commit": "e037884556aec7f4f6b830a6f44b1dcb51120d40", + "sha256": "11hmipc7ia4zsbdw000ii7n9ck1fhlbvfz5jznfiqfgwyamacd8z" } }, { @@ -11257,21 +11239,21 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220123, - 739 + 20220215, + 1904 ], "deps": [ "dash", "seq", "ts" ], - "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e", - "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh" + "commit": "2b2bfa27787ae524852abcb75408b0b1927aa2e1", + "sha256": "11lnj6fd9xhwhwr900vjbzbviqrza29b9nf8d53b4bzdrij6ilgw" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ @@ -11279,8 +11261,8 @@ "seq", "ts" ], - "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", - "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" + "commit": "2c1274147475b552716de7cecd7a9fd46e578e46", + "sha256": "0qpkpkipmac24m3ng4ahsml3vi15qcvmid3g02pbpgbpc113zfpl" } }, { @@ -11310,26 +11292,26 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220123, - 2006 + 20220215, + 1904 ], "deps": [ "chronometrist" ], - "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e", - "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh" + "commit": "2b2bfa27787ae524852abcb75408b0b1927aa2e1", + "sha256": "11lnj6fd9xhwhwr900vjbzbviqrza29b9nf8d53b4bzdrij6ilgw" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ "chronometrist" ], - "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", - "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" + "commit": "2c1274147475b552716de7cecd7a9fd46e578e46", + "sha256": "0qpkpkipmac24m3ng4ahsml3vi15qcvmid3g02pbpgbpc113zfpl" } }, { @@ -11340,28 +11322,28 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220123, - 739 + 20220215, + 1904 ], "deps": [ "chronometrist", "spark" ], - "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e", - "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh" + "commit": "2b2bfa27787ae524852abcb75408b0b1927aa2e1", + "sha256": "11lnj6fd9xhwhwr900vjbzbviqrza29b9nf8d53b4bzdrij6ilgw" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ "chronometrist", "spark" ], - "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", - "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" + "commit": "2c1274147475b552716de7cecd7a9fd46e578e46", + "sha256": "0qpkpkipmac24m3ng4ahsml3vi15qcvmid3g02pbpgbpc113zfpl" } }, { @@ -11420,8 +11402,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220204, - 917 + 20220216, + 732 ], "deps": [ "clojure-mode", @@ -11431,8 +11413,8 @@ "sesman", "spinner" ], - "commit": "e8b582e1f28b27cdb0574e0f9361cbb9eb62afd0", - "sha256": "1dazvxk5fbqgipkwvk35b5hdbfakq0f7mn8nmqzaj03nd66dn55m" + "commit": "7afa8ac74b1e511387ac9bfe5b0bee83c1dbb943", + "sha256": "0nhvn0jrpkzzjv94b98l293pfbibfx2srlck5ycdi3760lk4k6vh" }, "stable": { "version": [ @@ -11731,8 +11713,8 @@ "repo": "bdarcus/citar", "unstable": { "version": [ - 20220204, - 1902 + 20220217, + 1606 ], "deps": [ "citeproc", @@ -11740,8 +11722,8 @@ "parsebib", "s" ], - "commit": "903dcd3d21be58ec2f7ac61432ff26f037373180", - "sha256": "1danf825jj5ahsicwnb8szis0ixqysy0k4vflvhbjwhl9n38rwg6" + "commit": "b84cb375933053cf3e5408f0386034e8dabca5cb", + "sha256": "0hgyl2akvm5z13x403hmk3xyybbdp40sxbkf97m81k9y8m5fz7lz" }, "stable": { "version": [ @@ -12215,8 +12197,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220206, - 1011 + 20220213, + 1906 ], "deps": [ "cider", @@ -12229,13 +12211,13 @@ "seq", "yasnippet" ], - "commit": "d1b68c7807476de95a684fa52de294c96b3e8523", - "sha256": "0rckg0pwq6dvh4zn62r599pc32p436ybiy1wmj14ink0ywk3bqay" + "commit": "542225248e8d27111d6164292b37058ad5194984", + "sha256": "1xzr0yhsp45g4z634h7an5avndz8azz53ggxyyina06xrl1d2845" }, "stable": { "version": [ 3, - 2, + 3, 3 ], "deps": [ @@ -12249,8 +12231,8 @@ "seq", "yasnippet" ], - "commit": "d1b68c7807476de95a684fa52de294c96b3e8523", - "sha256": "0rckg0pwq6dvh4zn62r599pc32p436ybiy1wmj14ink0ywk3bqay" + "commit": "542225248e8d27111d6164292b37058ad5194984", + "sha256": "1xzr0yhsp45g4z634h7an5avndz8azz53ggxyyina06xrl1d2845" } }, { @@ -12627,26 +12609,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20210927, - 2245 + 20220216, + 1906 ], "deps": [ "emacsql-sqlite" ], - "commit": "15f906c393db1a0fb6577afc3cf59466531eafef", - "sha256": "1xa9rzyfm6bfskm2mfckd7jwmjwcraky7vsp7yyrnrqfksrl5na8" + "commit": "1ba85ce9f7094aeddce25044689278eda6739531", + "sha256": "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "emacsql-sqlite" ], - "commit": "15f906c393db1a0fb6577afc3cf59466531eafef", - "sha256": "1xa9rzyfm6bfskm2mfckd7jwmjwcraky7vsp7yyrnrqfksrl5na8" + "commit": "1ba85ce9f7094aeddce25044689278eda6739531", + "sha256": "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx" } }, { @@ -12810,17 +12792,19 @@ 20210104, 1831 ], - "commit": "3d91571f795e7cf2a0e74af1f72398fcd529703b", - "sha256": "0vd0my900iyg7xzccnlml3qg2lgrvyqgagp7zrn33k1sbxsnzcxi" + "commit": "77871555de842d837170c9f7add1971385468c40", + "sha256": "0xv3qxbckv5488kypfn9krlk5pc4hkf3zk3zm130310d3vbf3ff2" }, "stable": { "version": [ 3, - 22, - 2 + 23, + 0, + -1, + 1 ], - "commit": "8428e39ed9cddb3b7f1a6f7a58cb8617503183d2", - "sha256": "1c2rczn67bpyhpacyn4qpg71p8dnqvvqndfgqjfd94h4zafcygjv" + "commit": "a15cc7706da8f4a1833539be3f37fbc63ee20e36", + "sha256": "1wbs5z1gd0gi6m79jqp6chhgisk4j8z9x6i91094d98yplnmrwgl" } }, { @@ -13019,8 +13003,8 @@ "markdown-mode", "uuidgen" ], - "commit": "ccc3795a72554439f230969322c0e3239252c193", - "sha256": "17vn75v7hh5mj27g28m62xinv50f2h00kjyk84gk72j7ivymlcc9" + "commit": "ced8a31f331c034b00165d1eb6ac76f5a21db9b6", + "sha256": "1yrgkj634p9hf1jrlcy6f4yydyc4z5ig7pq14yxhfcnw0cf8ksr6" }, "stable": { "version": [ @@ -13472,8 +13456,8 @@ "deps": [ "s" ], - "commit": "d4715c27815e41db8b489c860a470215b6098d02", - "sha256": "151cbiizw57l1n4c1bcdzx5rxg86wiqm7qmd8gn8l42prmh7iwm0" + "commit": "0ef51fac2fda5d890e53c2f24c9f1b1859b05ad1", + "sha256": "0gfgy6jvdmh6p069g4imssz6330p2kx1vbprjnqj7q34knkpv37i" }, "stable": { "version": [ @@ -13801,8 +13785,8 @@ }, { "ename": "company", - "commit": "f42849df31122aa293edcbcbed834260d21037b2", - "sha256": "0fci8v7grd2c6vfky0fdsrxi0874jfkw52zba4ap43bbx1mb2166", + "commit": "7eadfd36ae9b7bd241c38d09a7203873538983fb", + "sha256": "1wxadzsf7vrnxj7zhnwrz0vva9zgr99s0lb677dllrj1zdryixwx", "fetcher": "github", "repo": "company-mode/company-mode", "unstable": { @@ -14265,8 +14249,8 @@ "emojify", "ht" ], - "commit": "32cd04a1c2f692e6ece07cc3d3a7627240edaa8e", - "sha256": "0fb5zyp3cgv7iyjbxxm7bjqq0pmhlv212wnylldqwij647w22iia" + "commit": "059e1686d2132b2fb03dabf87cf7ad12201ccfef", + "sha256": "0gv9pa75pfr5xi4ryjf4qc4fs4vv3w1a52b0mwcwixbl9c6x34fr" }, "stable": { "version": [ @@ -14361,16 +14345,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20220127, - 817 + 20220210, + 305 ], "deps": [ "company", "ht", "s" ], - "commit": "50b4fbc0d812e12aab21267f78a1acfb1d863943", - "sha256": "1175vfy3ilac73xyj3y644q3rfq0v5vjpjakdahkz337di7cxd73" + "commit": "56bbdd6e878bd7bbdc7c6306ed721792d594a131", + "sha256": "1dkrwa8xjzws27lz6f31mb45kwwswv4p9hdzpbkibznf40pmgdp6" }, "stable": { "version": [ @@ -14781,21 +14765,21 @@ }, { "ename": "company-nginx", - "commit": "fb8843cddfa9133ea9e2790e8a1d8051cd4dabea", - "sha256": "15pxz0v3zpshwri0v15yh995k7ih9h46y81n4xywlyyh34wys3sj", - "fetcher": "github", - "repo": "stardiviner/company-nginx", + "commit": "8c91310797748b45a5f08c26f70f0715ba6dec50", + "sha256": "08ngwig4fb2qkmlrh36hx990jwafndaprv3wgqmd1lyizzi94ig1", + "fetcher": "git", + "url": "https://repo.or.cz/company-nginx.git", "unstable": { "version": [ - 20201020, - 2038 + 20220210, + 1411 ], "deps": [ "cl-lib", "company" ], - "commit": "82bdb730ad5971c594d9c99c069f3c7bb067897d", - "sha256": "0qrlqir7fa2zf97yfsg8phj5dqgjz2rzn5zspfk9qlys3j8i483d" + "commit": "8a9f1a5653fe2d9a5042bfb9377d54f37fcc64c8", + "sha256": "0ylblgf34zpmdmwmd1vp8z59p024f176a1m75kwj96in65y6b6b9" } }, { @@ -15154,8 +15138,8 @@ "company-quickhelp", "popup" ], - "commit": "d56b17f234232e739838891b958877511cfe73f1", - "sha256": "05sp0z6gsvfp0phkdhzpnh8q3r4rkrqlhlqxvlsdnyaw78872hlh" + "commit": "d89313233663dc7b49291feb1e464471dee3e759", + "sha256": "06s4fi7xdhyzp4xbv12kcs699wqxzrvfcg02fz4p4bbm9nsi3l69" }, "stable": { "version": [ @@ -16014,11 +15998,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220201, - 1112 + 20220217, + 1627 ], - "commit": "1a6ed29e92f00266daff4ff5f62602f53ef7d158", - "sha256": "137s984r5nf9j5padha45n9jhyh82ik4yybcr9nljg86l065s3nz" + "commit": "44580944f95d52bcd5a3ed79adef57e51aca7e31", + "sha256": "0b05vxialpal5ddmahls1lfnlm9wi5c622mvlikr0qis0000bglp" }, "stable": { "version": [ @@ -16253,8 +16237,8 @@ "consult", "projectile" ], - "commit": "655b328ce3fe51a8ff89d7b0a839bc8dfe9e51c0", - "sha256": "1gy6vg5vrd9i0y2sck20fbqrdz0bgcr6647rvnl2nvpv3shzlsbj" + "commit": "29a7e54dbeb8e5d5e07c0546e60f6a7a6b79bbb8", + "sha256": "1n4hv4yb0pysbcv4rb3xw3550jzz6msi91ghxmvl7nf7shvd9gg7" } }, { @@ -16718,14 +16702,14 @@ "repo": "ideasman42/emacs-counsel-at-point", "unstable": { "version": [ - 20220113, - 455 + 20220211, + 548 ], "deps": [ "counsel" ], - "commit": "257f9457f60384eeaf29c1f458852b648eaf366c", - "sha256": "0llghbv6zqy9nl3iivk6pd2mmxw3xhlz6dkgn9j9srrabddzkfxk" + "commit": "28b26ecac676d6a3942f1b96d2916f4c23d9b3ab", + "sha256": "0dmr5aa74kziwmf8w1jr38lb23yir0mff2wjiidgpxm452pwwrqy" } }, { @@ -16905,14 +16889,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20211210, - 1127 + 20220213, + 1104 ], "deps": [ "counsel" ], - "commit": "bafd22a20c3328b0cf81aa9c35bfa37a095cf9c3", - "sha256": "1p651ykxbakzhwlrxcz4v62kj4f78l83f67qcghi58sq9cvwg1gi" + "commit": "80b5816c1fab8c0621601f7fbe7ba65b2c67e9cd", + "sha256": "10bprk9ixbsyfzrl7b23gc6wgwwyg4ksyw9w28071r2hpz2dssv7" }, "stable": { "version": [ @@ -18576,17 +18560,17 @@ 20211111, 1407 ], - "commit": "2a304b0f9e6c9a98f2a8a38d80404a34e6623cd8", - "sha256": "1mqd1594y7spnbwq5y3xgj3wsllzc2gqgg4dns2afp10xiv0l23y" + "commit": "8a59142db687b733b4ffe55c40fa03dc132122c6", + "sha256": "041zngk9ixp3ybpyca7klp0l37ylprfxq4lcydvnwlz7lgjgxff0" }, "stable": { "version": [ 0, 29, - 27 + 28 ], - "commit": "229a4531780863c8a5c311d6b3c70a545988f85f", - "sha256": "1pvfamxnvh9by6658wmqyvm30af3ykhks9mwkqfz9ww161avxzd8" + "commit": "27b6709241461f620fb25756ef9f1192cc4f589a", + "sha256": "0k5wnrvnwq699mvvngraq5d93pyyiz77sn9dcqjrazc74b63sm8w" } }, { @@ -18728,11 +18712,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20211019, - 1630 + 20220214, + 552 ], - "commit": "e74c5960eae3db90bf1b3ea7e71a2406c27554a8", - "sha256": "1vpfhiqwhdfa0w4akh6wfam88qkjy73i8yryfaz8a5qbm60nd43h" + "commit": "eaf1c6a99cd1697a805a3f04325906412eef8171", + "sha256": "1nb34gmzlypq3yccm4dwii86pn6k75hb9y50ldsyx3x93zwcm3dk" } }, { @@ -18784,8 +18768,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20211117, - 1555 + 20220216, + 1029 ], "deps": [ "bui", @@ -18797,8 +18781,8 @@ "posframe", "s" ], - "commit": "76cad34de8984f57c2b1e374e9c985cc7ec8dad0", - "sha256": "0q37nnxvb362pni0nralb6cpw7vvaj0kw63y8zpip8szwj9yqrki" + "commit": "8d110d4fa62c406aee836b352f5d5a3454e338b4", + "sha256": "0rpgfnlp1ixbam8iq2wxvmxbi8v6lhab2l3azm2294w2sr1r4qzg" }, "stable": { "version": [ @@ -19148,11 +19132,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220129, - 533 + 20220208, + 915 ], - "commit": "d6e9f4df42815de467765e78b7c27125f35d30bb", - "sha256": "02lhkk4z8va95fnv5x4sd3xdas28gf3ykbl7gry015sms9jxj7w3" + "commit": "7ae46300df5d22d3941ff9f10bc52d232985b628", + "sha256": "1qv5vffbf0wjymdhabc3jl4h9ib9x38swabsjs23rm3a5jf9b091" }, "stable": { "version": [ @@ -19481,15 +19465,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20210522, - 348 + 20220210, + 2155 ], "deps": [ "ccc", "cdb" ], - "commit": "251df5b02c91311140d2375b019c1de836655fd0", - "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" + "commit": "eede626d70953715d2405b325dcb151b7cb597e7", + "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" } }, { @@ -19531,16 +19515,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20211228, - 1756 + 20220209, + 719 ], "deps": [ "dash", "s", "spinner" ], - "commit": "aebaf72e35546fd235b4861399791814e4e4c7d8", - "sha256": "1qd60winrrpxmrjsx77i24921p6dad9halz5l5s6biwa421zcgr3" + "commit": "0a3ba239c458ffc4f63a180b43d0e70b81742a3e", + "sha256": "0xavp98da1hr0jsq5dr2h4rfs5y1qgnv3b3pnpc08rfj1h4x211b" }, "stable": { "version": [ @@ -19737,11 +19721,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20220104, - 215 + 20220214, + 2326 ], - "commit": "6b6fe704ea233c65e50263dc0ff584409065e42f", - "sha256": "0ly7k6rkvhw1pwgmmn4cpgbizw2f2ry1swlaq0zf2k6ln7pyl96z" + "commit": "1727055b59e21e91a5b72356968232e31a92f743", + "sha256": "098s8s9j8gvzkkyx6ivd84bi0dmf2p6a3nlz215ljl43l97134pw" } }, { @@ -20173,11 +20157,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220128, - 1441 + 20220217, + 1624 ], - "commit": "a632b3cddc88bc1ed5f323afba03d91c34453194", - "sha256": "08z1i260r3i7shybcwyiq5michwwfpmzvvnqpppcasazrgpz6vyz" + "commit": "783e9a6d4b0a36dfb646e3b9dad19c54018f7195", + "sha256": "19hlrz8vhabxgbdbqgkiav73wnfb33kb1nv53v8v0jvz9gh7a33j" } }, { @@ -20254,10 +20238,10 @@ }, { "ename": "diary-manager", - "commit": "a014f4d862a2480f7edb1266f79ce0801cca13c2", - "sha256": "1sk0pvadx4jmv93dj796ysn3jh2wvywayd7dd20v22kdvnlii73d", + "commit": "0a4be0096baf0b451541376318d6fd7a50798c9d", + "sha256": "0i4mbp06g2zpiwq3x00np9yr81klbbvr28p7l4fsmg7dmmbd6kap", "fetcher": "github", - "repo": "raxod502/diary-manager", + "repo": "radian-software/diary-manager", "unstable": { "version": [ 20210404, @@ -20390,11 +20374,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20220130, - 2254 + 20220211, + 548 ], - "commit": "f2207a67e3cc79433b43deeb463d0768357c350f", - "sha256": "1avfss2syaqsrdb4nlgsd49xyiy6bjqsf17r2is5il8g4yj1jabs" + "commit": "6ced92510df2c121e577189fa838dbf84303a0a9", + "sha256": "0mdyb2mlckcwphm6yaapdw6m2w2br0yfsvi6maw422mnm6nvjlwh" } }, { @@ -20405,11 +20389,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20210921, - 603 + 20220211, + 548 ], - "commit": "63951d8236163d86d5261b35d6c9a3f3f280e876", - "sha256": "1l1smrb2xmnz4cyimyvhq9hl406w364gkvqsk32b1q4jcvqhmdz4" + "commit": "819da8d75762e1fb1a975d78c2b4666506048485", + "sha256": "1l3q7ks4ylr85ywyrg49hk0wvzlj97rznwmqsf74awgfcl1cy7nk" } }, { @@ -20761,20 +20745,20 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20210715, - 1026 + 20220217, + 1855 ], - "commit": "5ea0f4da3b9ad863ce21503715fd62722e4cd6ec", - "sha256": "139dwggd97mbq1p5g1dqxaml6j0wbk2w0gcgy4wv8fb4xppzklkb" + "commit": "672de7e1d022cb7da47a746ba508fe23f7bd6737", + "sha256": "0rnsq6cmffcygdkg2n8kn3sg1pddcl4ww93pwm7nx1iqf4afwxfb" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], - "commit": "387858aaa23d5d1145c98dfa70bbd39bb8c3fa5f", - "sha256": "13a3jkc5yf1m2gqabvfxfzxgblyhyni9f2clqx9i0pvr9dvvb9r8" + "commit": "f5305840a5a09043f1d012cf50a55dc41317c080", + "sha256": "1129jgpfyh4b88rqjmsi2siyamqfrgmks5vqy0vvj9avsh2wkszc" } }, { @@ -21807,11 +21791,11 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220203, - 1118 + 20220214, + 1730 ], - "commit": "bc278f42110fe34e14ebfce0cda036b3ce17730a", - "sha256": "16rqyfj7lsrkp7a406z23dkcz7c6vb0gh6243ywjiwiqj7qdzcqc" + "commit": "55d0a5cbfcf2c4d14ce049eece102c48bdc774b2", + "sha256": "1cqjwmra0llmj7qn0661yi9aawy3snbjjzmmv3c70qs0nzgws19d" } }, { @@ -22438,11 +22422,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20220104, - 216 + 20220211, + 548 ], - "commit": "6bfea44e0b54c80255d34d15130940a09814e2a3", - "sha256": "0rkshqiy9msnsif9fxi484by76fl8zjyzijgxphqlv2h2bb3pbgd" + "commit": "5705f8d6f5583d50fc0497a88f06fb7c84a9ddb0", + "sha256": "189bahsiyv7j0h1i1nfilr5rp2bihfgi19lipdxmixfmfv8fjy6j" } }, { @@ -22490,10 +22474,11 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20211105, - 138 + 20220216, + 1424 ], "deps": [ + "aio", "dash", "docker-tramp", "json-mode", @@ -22501,16 +22486,17 @@ "tablist", "transient" ], - "commit": "8d64cf4f84d7da5f839a8248fdddfb635a63f803", - "sha256": "1ivyvgh24nadhiv9ffqxckwln8vc9c2l0bvrvrd53yf0w8i345yz" + "commit": "81f2b379af504428bf2c93a77c7aeb8e56a0f219", + "sha256": "0wyx77hyprw307r486q0x58navyzn7vbx1lsr8c94mb9ykq4icwq" }, "stable": { "version": [ - 1, - 4, + 2, + 0, 0 ], "deps": [ + "aio", "dash", "docker-tramp", "json-mode", @@ -22518,8 +22504,8 @@ "tablist", "transient" ], - "commit": "4fc69969b11687896b6c71b099de5d4c12c1c685", - "sha256": "0s57dq04d97dvrbxzicyk5z9f1mn8gf9w4nbgrxd9dnjqz335173" + "commit": "9a232f563868786d7f50f0a99da2b552f5b83dc8", + "sha256": "18irvpwlbjczrcijs0zdidsmzzdi2kn9d56iqb8nn1qfgydshql6" } }, { @@ -22696,14 +22682,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20211004, - 722 + 20220214, + 1539 ], "deps": [ "s" ], - "commit": "b3f9e6c209c2c98de01211aa7a0a4cf6ee3cdf4f", - "sha256": "0ffnq0inxal39725amfv72yprynwx2hqrxhdb7pyx7x8z4zh8f4y" + "commit": "3d350b221bca9f9f1a0b2168158c471bcf5ee9ac", + "sha256": "0ygnkaqlqc82mkf2hxhrqz7hn0nmbwc0nwh4p0mwc5wfy3v6lcs6" }, "stable": { "version": [ @@ -22726,11 +22712,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220121, - 2018 + 20220209, + 646 ], - "commit": "9ed9b8c7f7e2ea2d2fb739d65ae4626a1cf16b9f", - "sha256": "11rzq8qbvivmi2sj5gw4g4n7qf8zjjypqz8xvn6s3w4ahz8n5nmd" + "commit": "ce21bce19b91e6f1dfc1f23983b4b8ce4464c8f5", + "sha256": "0gdxg9r4nxp856vgp764cf3w81awbc6rczym27xlxzp1m7s6rfyy" } }, { @@ -22863,16 +22849,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220129, - 1017 + 20220207, + 911 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "b1726bf6b3328763851dfa1d343e4b2f1ccad125", - "sha256": "1qalk74l8vkv69ph642m6m2rvqq5pfvx8jfr40kpf83lx5amrch2" + "commit": "30d15b121f58a26f503e3bb63aa5d74445114493", + "sha256": "0c5q4laawx6r99qabys40dwnqax5xiry9hi1d158bcl6kndyhz1n" }, "stable": { "version": [ @@ -22916,14 +22902,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220127, - 2136 + 20220216, + 1451 ], "deps": [ "cl-lib" ], - "commit": "f55e32cebb2c756c1c0019cad5aff59abb5882bb", - "sha256": "10bcg2yi0axccp2nks4di2by5y4d7j4vhjg1h692qkc908gb9irs" + "commit": "9253497b6b1f86ea682313744b3eceb629918508", + "sha256": "14vbj663v7zsahs94nfkxfg15iw6d7b2577cv4vyfqxv9q29rwg4" }, "stable": { "version": [ @@ -23167,11 +23153,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20220118, - 748 + 20220209, + 724 ], - "commit": "a7a3becaf11488eee36d50c06a692f3fa4201297", - "sha256": "0v3yan01yhqz6k34x580j7q8xirgbv86ghsc153k175jc7ig0hi0" + "commit": "2c9efdae8b7b9a8e57dfd3aa1c62426a262e9eba", + "sha256": "1wblaspw1yb2xgymlajjqap5rkj6danrsh8hnkhpcd1x9q49llis" }, "stable": { "version": [ @@ -23394,11 +23380,11 @@ "repo": "niklaseklund/dtache", "unstable": { "version": [ - 20220206, - 1134 + 20220209, + 1903 ], - "commit": "948c110bbdd802a530f393580d74f3dc8bbdda1e", - "sha256": "1ii8zggw3db5nrkfnfhqsa7w7676bq3vl0z8larwhb34q6shi655" + "commit": "9b39e9ebbfd19bae1b0b30e98b574f0e8a952bec", + "sha256": "0jx228qzqmw3ncrjqdd6jhphl6j58iyg7knmk6favbsnr3nl2y54" }, "stable": { "version": [ @@ -23602,17 +23588,17 @@ 20210909, 1010 ], - "commit": "8e155da034f1f1c10fed88bdba4887ac26be9bcf", - "sha256": "1j3i8sikcpywzr0syrq70qf00cyk0kgcdqcp579v3sgm9p0mgnfg" + "commit": "32ef2d50be4e1f9f16f3cb2d9727be0c24920ec4", + "sha256": "0pc41hqzaw23gfxlhp2ar2ixha7vd4vizv13bk71mv5gx6bqlprq" }, "stable": { "version": [ 3, 0, - -3 + 1 ], - "commit": "3cb82b394cb8e13b2e1be32c57aff321e563c6ff", - "sha256": "1c04qk2k3v1m0wp6scsqh0bq3wwkmazfr9apzqsdhw0pm83z4kx0" + "commit": "b6709437aa1b264826735963e0d7c199c4ddf82e", + "sha256": "1vaxxczna6lbpzh6w1sj4pg06as2354labl7m725d02wmwq3vdpd" } }, { @@ -24661,17 +24647,17 @@ }, { "ename": "edebug-inline-result", - "commit": "235b422e95ecce5671a16d44bc648379b6859bed", - "sha256": "036fpy7f748c8z7di94ya1dwz2ckri3qm6bsl809myr5wsghp2w1", - "fetcher": "github", - "repo": "stardiviner/edebug-inline-result", + "commit": "ba1a7a8fb085122021ce21e42e7834c35a949551", + "sha256": "0wfgwq5nkadlq3jbrlw9nabr1lqcl5y6bnb8xzj8l6glcryxazvb", + "fetcher": "git", + "url": "https://repo.or.cz/edebug-inline-result.git", "unstable": { "version": [ - 20210213, - 25 + 20220210, + 1357 ], - "commit": "86a9ed9e4f58c2e9870b8918dc898ccd78d2d3f8", - "sha256": "1zf09s03xkhpbhkj99ilzp679lhkyiaaa5kmyj4lb380di1nrw2w" + "commit": "9fb3c48434da24f800833a5ee3419452d5fb83cb", + "sha256": "09rqvs1vj6h8k93xi5h2r1vba2hj5dl7bk7x9ry6mcr3m0c2z6di" } }, { @@ -24749,20 +24735,20 @@ "repo": "Fanael/edit-indirect", "unstable": { "version": [ - 20211201, - 1541 + 20220216, + 1812 ], - "commit": "7fffd87ac3b027d10a26e8492629da01a4cd7633", - "sha256": "18pbxl68bw33kr9vb1f7d9gra4wlndykv6vn7mj2h7d92p9pjcig" + "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081", + "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x" }, "stable": { "version": [ 0, 1, - 6 + 8 ], - "commit": "bdc8f542fe8430ba55f9a24a7910639d4c434422", - "sha256": "189nvmlkki1jfszm9i0crbb1p4nzgmbly0wpvpg0i8vmw7vrpl40" + "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081", + "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x" } }, { @@ -25944,11 +25930,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20211218, - 1738 + 20220209, + 2301 ], - "commit": "eb4ae2e7e03a5fc26b054ba2fa9a1d308e239c76", - "sha256": "0wznxssmh2f0jx4c8mci5idzsixpzcxyaa7yxi9ip5h4qig73sqm" + "commit": "ed8de0e9d218723f45200542b21a68dc8440f278", + "sha256": "0q1vr5ks04qjzml13wzmzkvm1za3faq9m2y5f3g0z254fh82cbbb" } }, { @@ -25993,11 +25979,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20211219, - 1520 + 20220213, + 1633 ], - "commit": "bcfbef5062b54451171db56159e22765a25ec22a", - "sha256": "119qm2g3zwgmlrh82ydi343phmwvic5flppzm3ya4k8nklr2dlgk" + "commit": "0d65a3f022e4cf2dec0b6aa313625b060e41ddb8", + "sha256": "121va329mjh8nv4q4jy0sfs026f8zfgmmfz2lm439amcl5b4hazj" }, "stable": { "version": [ @@ -26017,11 +26003,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20210608, - 2202 + 20220216, + 2221 ], - "commit": "13d207d40863a041b84c34f075668c7931db5a78", - "sha256": "1cvwp01w0adgxwlsispmir4wgs73cl62n5rh7ri6rw6g4fribq1m" + "commit": "3efb59ab784a704f075e4925ecadb1999c950440", + "sha256": "0fzz8wpnqf5b4kafm4a7r6x4dnczf48jxqmxgbs14wh2wrxazr82" }, "stable": { "version": [ @@ -26073,21 +26059,21 @@ }, { "ename": "eldoc-overlay", - "commit": "f865b248002d6d3ba9653c2221072a4aa54cd740", - "sha256": "0nn6i89xbw8vkd5ybsnc1zpnf3ra4s8pf01jdj2i59ayjs64s28x", - "fetcher": "github", - "repo": "stardiviner/eldoc-overlay", + "commit": "0eeadba56dc484e771f400d32a875e392610f071", + "sha256": "18544jdv2n1ip4x2x04dm1xhna7k60hr5zs46ls6rgmnbgh5g8zl", + "fetcher": "git", + "url": "https://repo.or.cz/eldoc-overlay.git", "unstable": { "version": [ - 20210630, - 1345 + 20220210, + 1358 ], "deps": [ "inline-docs", "quick-peek" ], - "commit": "3edbfb23836bdef253f4a5fd125952e55877d2b2", - "sha256": "1r2fjdra4bav16c108jzzjd2qhng7493i7l7znbasialf40j3cbs" + "commit": "b96f5864a47407ec608c807e0d890f62b891ee03", + "sha256": "1rdpg18gffh7ss5di6f4l1wks904867r38w0ilpgb52p8j0pswa0" } }, { @@ -26308,14 +26294,14 @@ }, { "ename": "elfeed", - "commit": "407ae027fcec444622c2a822074b95996df9e6af", - "sha256": "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9", + "commit": "25cd87f2f80a7228ae65ec26dc6c87f50fd2f9d0", + "sha256": "16f6y81n1kh9fhyl9950pfm0z3knv1ygam2cs41ydz6drnrvh119", "fetcher": "github", "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210606, - 1130 + 20210822, + 2129 ], "commit": "162d7d545ed41c27967d108c04aa31f5a61c8e16", "sha256": "0v49l289wiral01pvgm30wyv79h5d3ly3i05dmcw1q93g4z4l56d" @@ -27212,20 +27198,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220202, - 2138 + 20220208, + 1726 ], - "commit": "68388182b99d7e12ec649826cf0a8d167be57a88", - "sha256": "1ylxkdhln63g0pli51r7jxp07g7r09agi72dw5mgxld1kgxln9m6" + "commit": "6e3a8ef5af192eddcd834efac49866f84e2c73dd", + "sha256": "1p43x7mf14q84armxhp294xaclq5c6mpggq619ravia0kdrqij1w" }, "stable": { "version": [ 3, 3, - 1 + 2 ], - "commit": "22649fd442d505af3367a6386fa7f0da9a82c9e8", - "sha256": "121hkssy6c15gdr76k3fmdpk82354hk597gvkap6dc9y5j5968mk" + "commit": "6e3a8ef5af192eddcd834efac49866f84e2c73dd", + "sha256": "1p43x7mf14q84armxhp294xaclq5c6mpggq619ravia0kdrqij1w" } }, { @@ -27326,8 +27312,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20220205, - 2040 + 20220208, + 17 ], "deps": [ "cl-lib", @@ -27336,8 +27322,8 @@ "seq", "trinary" ], - "commit": "ea2d2afee38af1511728f61083b22a3e688c7570", - "sha256": "0xp7dgn5llh58v9mkj9wd6wx81q26bgxxf8vdrllyz35rkwb1sq4" + "commit": "82ffb6eecefde7e99383e4a657f17fe414287846", + "sha256": "1aya2cavpvagkhhrxzvs3d4qgddfjxl097d571xp3gzi3cn7k35r" } }, { @@ -27589,14 +27575,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220130, - 457 - ], - "deps": [ - "cl-lib" + 20220209, + 1510 ], - "commit": "ace53396a66ed4b753f42c04a5a0db2bcd770423", - "sha256": "0p55shxvqm1713af33mfglny7rpi31d42wvgwylcsfy4jvnsq8bb" + "commit": "634924587be831bcb3ca47e97c104216516f9ca9", + "sha256": "0mmd5lr424mn76yrk61cjmzwi6q0ilji209jnc36lclrdyyx3r06" } }, { @@ -27920,11 +27903,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220205, - 1643 + 20220216, + 2111 ], - "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5", - "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f" + "commit": "29848fc3c88761fac6cea4093e6af48aa10b1fd3", + "sha256": "09vhqq1giawkc93xzrikcv271s7vnk7rwd6s2g678bs8n8li0160" }, "stable": { "version": [ @@ -27950,8 +27933,8 @@ "consult", "embark" ], - "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5", - "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f" + "commit": "29848fc3c88761fac6cea4093e6af48aa10b1fd3", + "sha256": "09vhqq1giawkc93xzrikcv271s7vnk7rwd6s2g678bs8n8li0160" }, "stable": { "version": [ @@ -28391,8 +28374,8 @@ "emojify", "request" ], - "commit": "91111bbec3f43f85b680de68d408919b33800200", - "sha256": "15j4cci54rgd3ic2g4k1jf4v2yiph8y92gpg76jvrikyjby9zfj5" + "commit": "d842353ccffc1469693edd4daffcdbdbc7db4683", + "sha256": "0p6pndcy9knc37fq4i8rw9czvkq3zmj4m23dck2zb7yckmsrlkr1" }, "stable": { "version": [ @@ -28849,26 +28832,26 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20220130, - 1922 + 20220216, + 1916 ], "deps": [ "closql" ], - "commit": "c18a2fc8b4a83ceea6a1128d7a77107983301e56", - "sha256": "0ykjv4xaz95syiw3dbf91c2c8716psc53f2l36xzkaxzj8nsz3vw" + "commit": "4bb8a13a43e30798e27c80174169ff955bf2b631", + "sha256": "10arkzdqdc1kzizhxa4n28fjmaamz8gdnn1lf79327p7qi3cz7np" }, "stable": { "version": [ 3, 3, - 2 + 3 ], "deps": [ "closql" ], - "commit": "44bcdb03bb11891f5966b39be942d76a4a57f5cf", - "sha256": "18kjp0f5ch4mpd6yrd83p73pw7ykp2lv5686is8vcvyyys53jrf1" + "commit": "3075b621a56f13a93337e2f04aea3565b625b8de", + "sha256": "0d09ddlhvgp8rpybqmzvzpzdp1hjaq97wp2br4g90lpx2vclkgn7" } }, { @@ -28888,6 +28871,19 @@ ], "commit": "d41cfe1a00d01a45938d2af2fb311fdb17d3c381", "sha256": "0i295rr9fslhxrqh8967whq1h903i3a45c4x6ycff1fhrxb87frf" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "epkg", + "marginalia" + ], + "commit": "d41cfe1a00d01a45938d2af2fb311fdb17d3c381", + "sha256": "0i295rr9fslhxrqh8967whq1h903i3a45c4x6ycff1fhrxb87frf" } }, { @@ -29504,8 +29500,8 @@ 20200914, 644 ], - "commit": "9911f73061e21a87fad76c662463257afe02c861", - "sha256": "1sma8i82g9kv6b5mmvfxgr70pbjgy9m2f8ynh1gr2mq0b1jkgxjk" + "commit": "d4333bbfbdb93fb9cc2ea321438bf552ec0adee6", + "sha256": "07vswfw20bavl82cdi7p84dgkjkx0x117cs2kkf6is8b0wwa22g8" }, "stable": { "version": [ @@ -29526,20 +29522,21 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20220110, - 807 + 20220215, + 1844 ], - "commit": "1652f3ff90e22841a42381886709b0db369b1c3c", - "sha256": "1hlf7b3y3jyc99dxis2sf7n8na1rkfmxwmls2ryrqiwdcgsk7cgb" + "commit": "4bf7ba5a9cd496e974df10ef927a7c7c65ab96c9", + "sha256": "0gfbssvl2hg53w36pi86dlg9kglnzi69irs906salhbg7cgh1wfh" }, "stable": { "version": [ - 24, - 2, + 25, + 0, + -1, 1 ], - "commit": "7bf7f01683acf9b8f09bd8c7331854a9abc17f7d", - "sha256": "1wcl60gclg5syi3zr9n23wk9x6l6w8w2ng7v6ibmsr1g1svhlkk5" + "commit": "3c68ceea1f93119bed871866c690fbf5a95048c1", + "sha256": "0i45r682i93b71jjhixq450lpkl6kbm8gi4f73g22k88w1lj1rmq" } }, { @@ -30439,11 +30436,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220201, - 816 + 20220213, + 1912 ], - "commit": "5ff4fa8da09c5e408bc8a2a8e42e7c1fb93a3819", - "sha256": "0wr6j58fm4zbihmlrnlgc6n5wlpkx2a0xpdw0hjdxylag29d52z7" + "commit": "399f952c4bc1cbe17ce46b6800fc469ed0c6a25e", + "sha256": "01qwcjj90zdgz061nsqxralv9z6l20k0sahznhling9xnalymfjr" }, "stable": { "version": [ @@ -31034,15 +31031,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220202, - 1351 + 20220217, + 748 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "787455068f56f29493cc1e33d4e5c2986ea25577", - "sha256": "01wfhaz16d1w0jzcj5l57r6nl17lmmli7gg6mzlnsqc8ccgfhcfp" + "commit": "00fca685479e772361765b13de4689099a328c28", + "sha256": "0gpw5hajzlaam3gdqrr8vxdjdghqr29il8zsmn9q77askf64wsbw" }, "stable": { "version": [ @@ -31236,15 +31233,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220124, - 225 + 20220216, + 1857 ], "deps": [ "annalist", "evil" ], - "commit": "e69abfcb1cc0dd59dfe7c055b0779a6622f8282d", - "sha256": "1gsrh5scp8yksilx14cn3h2hy68xh8jhmm15wwzwlg457kc3jcm4" + "commit": "081a9f423e95d57fa3c10dee18fa148df5ed198f", + "sha256": "1m36lsqrfcj8w8cdcckvyz3q7i089akkjb4c9wga9iz09pgpjw4y" }, "stable": { "version": [ @@ -31353,15 +31350,15 @@ "repo": "cute-jumper/evil-embrace.el", "unstable": { "version": [ - 20210418, - 2038 + 20220211, + 606 ], "deps": [ "embrace", "evil-surround" ], - "commit": "464e8ec52ff78edf3c9060143fc375f6ce5f275f", - "sha256": "1bga1idxj8mg5xpl7k4ymwaniyba2x13lf8yihyh713s5238fdmd" + "commit": "7b5a539cfe7db238d860122c793a0cb2d329cc6e", + "sha256": "03b53626ywq9qdqzsb92321lc0fzjqb674kwkssjrxlz6hhn5hlq" }, "stable": { "version": [ @@ -32562,8 +32559,8 @@ "deps": [ "evil" ], - "commit": "787455068f56f29493cc1e33d4e5c2986ea25577", - "sha256": "01wfhaz16d1w0jzcj5l57r6nl17lmmli7gg6mzlnsqc8ccgfhcfp" + "commit": "00fca685479e772361765b13de4689099a328c28", + "sha256": "0gpw5hajzlaam3gdqrr8vxdjdghqr29il8zsmn9q77askf64wsbw" }, "stable": { "version": [ @@ -32812,8 +32809,8 @@ "tree-edit", "tree-sitter" ], - "commit": "a94e4a645988a2c0e2369e27a2635f6555d321d8", - "sha256": "1pszg8vlhdbpl3q6wr60jv1pn52dpxl8lzmvrvsy5jwvlmiwy91y" + "commit": "f7d393b5caf601fe20c7543a53fca3d7e74ea09d", + "sha256": "0i8vc5mpwgkf21awnzc4m60paf13lwl0ff4ihks6k6xq65va3rhn" } }, { @@ -33343,15 +33340,28 @@ "repo": "md-arif-shaikh/expenses", "unstable": { "version": [ - 20220109, - 1306 + 20220215, + 1518 + ], + "deps": [ + "dash", + "ht" + ], + "commit": "fb4349fb7dbddcebc189cce52dda25ab42d27b06", + "sha256": "18ihdfm8hbfl0nhk5k02m0f5dni5pmljnv0my87pmhqa4bzi1b38" + }, + "stable": { + "version": [ + 0, + 1, + 0 ], "deps": [ "dash", "ht" ], - "commit": "d8bbc3201a23f596418cbb0a316b446f0ab94585", - "sha256": "1shwdlzaf84mlf9gdxly43xwy6s7w48mbh5hqy8jbndq552zkzgh" + "commit": "fb4349fb7dbddcebc189cce52dda25ab42d27b06", + "sha256": "18ihdfm8hbfl0nhk5k02m0f5dni5pmljnv0my87pmhqa4bzi1b38" } }, { @@ -33944,11 +33954,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20211124, - 1842 + 20220208, + 49 ], - "commit": "c090f3d3a8a2ddedeffc1f5b5147cb7633dae79e", - "sha256": "1kiaqascf4lh1kpvp79yynjyncakq31xgx0h2bfinji8i7y32pg1" + "commit": "e6dc6d4397d70318c8e5acdd86b9b31b25102182", + "sha256": "0iayhg58yxcxwjywfr024df03y1ifj2y9gshvnndrjjc4jkm6zn1" }, "stable": { "version": [ @@ -34010,14 +34020,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20210909, - 752 + 20220211, + 633 ], "deps": [ "popup" ], - "commit": "9435ad63c1c4756f574ae98d2d63ecf1189ec832", - "sha256": "1qnh6ykmwvwk06rpi8pcvql5zq9gpiz2xiyl3j2imhmx1jiw4xdz" + "commit": "cf4a2f7e3e43e07ab9aa9db16532a21010e9fc8c", + "sha256": "04z9pwvl68hsisnyf9wlxmkwk8xag36jvcchwcwp4n9vp04z8745" } }, { @@ -34490,8 +34500,8 @@ "f", "s" ], - "commit": "7b961721f36bd23ac8fae6e6eaa490ac6e8527d0", - "sha256": "1kgjb8qjscs1a08w4qwynd6yb94hi6lai9lgf0mnwvvmv6rpzfwv" + "commit": "d4f91ea2bbf0508be05212e00f9a6675aa62e04a", + "sha256": "14i6wi5shd1hzh271hl5bd39jr5xvfkirasz67apcsdpfavzvvry" }, "stable": { "version": [ @@ -34664,8 +34674,8 @@ 20210707, 354 ], - "commit": "9e076f56f58a195df9dd88f6541b63201bd5c38b", - "sha256": "0pffcv4nhwap85sx2rxxr4li3rg2bb5ykanaq6kg5wcliqck29hg" + "commit": "55b15274aebe013bfb68c9ca5a53c65c21554eae", + "sha256": "1ycgs27n2a4ba38bww1wsg6aa6zab4yzwfnl9hm658kfr5w2i6jc" }, "stable": { "version": [ @@ -35674,11 +35684,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20210914, - 17 + 20220213, + 1334 ], - "commit": "81c524a43c46f4949ccde3b57e2a6ea359f712f4", - "sha256": "16j455iymwcnqh6zwwlk47x9jsdim4va9k4il3qqj8bwgjv30xmb" + "commit": "8cc0507cc6619cb9ec236c4eca7417ac081f1468", + "sha256": "074dkgpflc9pgpwfmha2cjfyyk6fac968nsw30mfi8ifb1gqvl28" } }, { @@ -35689,15 +35699,15 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20200221, - 1415 + 20220213, + 1335 ], "deps": [ "flutter", "flycheck" ], - "commit": "81c524a43c46f4949ccde3b57e2a6ea359f712f4", - "sha256": "16j455iymwcnqh6zwwlk47x9jsdim4va9k4il3qqj8bwgjv30xmb" + "commit": "8cc0507cc6619cb9ec236c4eca7417ac081f1468", + "sha256": "074dkgpflc9pgpwfmha2cjfyyk6fac968nsw30mfi8ifb1gqvl28" } }, { @@ -36733,8 +36743,8 @@ "deps": [ "flycheck" ], - "commit": "8b68168db13df4e393d65ca8c0464019dcc45745", - "sha256": "1fiycjznzpv0gm41xx8xgqkzsjg04zgg6v4prlaqx4vfzh069a2k" + "commit": "65e7d90594b5f624702b3cf6e8867407419980b7", + "sha256": "1s7xgcn10dx4i0l3q1pl33v8r59xjjmgia4a45jmv52schpx53gp" }, "stable": { "version": [ @@ -36812,8 +36822,8 @@ "grammarly", "s" ], - "commit": "1352c1d970e42afbbb93d029636e17aa7b921cd0", - "sha256": "0m6zhqm0n3fhni5h7ky18zrcmmw3rwizq6wrpl1cnbyp38vljl7h" + "commit": "32ef7144c8a0dd708d57f8efbd54ccf7b29d76ea", + "sha256": "1d5dgflz33sjwx4yzj9xcph2wl4vf4dm82jx9qbkk4ii2q4f185w" }, "stable": { "version": [ @@ -37238,8 +37248,8 @@ "deps": [ "flycheck" ], - "commit": "4c22da6aa2878cbf490214b034f2ac25209f0fdc", - "sha256": "07qlaay65gs2v4zbawnfwf5ry2ag9dl0zzjrr8slqk7z6wy2c5wb" + "commit": "24db2496b5320614534f38d5cfc71f43b00155ff", + "sha256": "0fy17nj03glvaz1d2m3i8sqf4szmrjwdvqlqkg8r31x6ac0gl0d5" }, "stable": { "version": [ @@ -38754,8 +38764,8 @@ "grammarly", "s" ], - "commit": "57d6d69b1b55eca484d643d180682a7e683b4b0e", - "sha256": "0a2azplyv9mp6xjjxdff35sz2r65h4svnrrsraib9jvz5hbqmny5" + "commit": "7e5aaaec5cc5e0a217c8d83f857b5a3415f5865e", + "sha256": "06mgnh013633i6ij1664zwsmd35hbn4a16i25ang78cmwpb5bzy4" }, "stable": { "version": [ @@ -39001,8 +39011,8 @@ "deps": [ "s" ], - "commit": "a43fd0d92dbec5f1d4129b30ab0ed917e0864129", - "sha256": "03nfbdjfx5bnv5phs3fcysvfza9lcw32mai1a8gjdmm8p4cgc851" + "commit": "107fd8231d130bc63f1d4cdcca3622e8c667f22e", + "sha256": "0vdp9dlszm916filgda28j3pfqi07b1fsmwcw8d1kxj1k6j8b1j4" }, "stable": { "version": [ @@ -40207,8 +40217,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220130, - 1941 + 20220216, + 2157 ], "deps": [ "closql", @@ -40221,14 +40231,14 @@ "transient", "yaml" ], - "commit": "43055ac34f9de045e7f878e4be7a7f04b172f498", - "sha256": "1ds4ikqddnf4k25p6ng8g2vdxi2gl4qa6s0w0kxklgh3di8zmppn" + "commit": "55632815463f9d2d259dcccd22bfed224b5081c5", + "sha256": "0d26v84mcc77vdvh1ks9gkbwr5f0wvmhbkgqz4qkjy9xdpnh1s3x" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "closql", @@ -40241,8 +40251,8 @@ "transient", "yaml" ], - "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", - "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" + "commit": "2cecef36f41dfe1edc6078690b0c0d05af6b35f5", + "sha256": "112mghydfzrbiwnzrb2f9d74y6ja702157p66ss94kqps0lj7rkp" } }, { @@ -41046,8 +41056,8 @@ "deps": [ "cl-lib" ], - "commit": "9e08ee114e5d99dba0360a52795ba191ae0f8ec1", - "sha256": "0kizzwqkrdy8d73xf5w19gxiicj5xi4bpy5j4zr338bsd44rh89y" + "commit": "b0f39e3617f5adf8ac9ecdbdaa6b0ee997cab020", + "sha256": "06l5yk7hpfys0252yhqzfa9x2x8883yw4rsmhavvcn5w0l1n2m1p" }, "stable": { "version": [ @@ -41200,14 +41210,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20220104, - 1200 + 20220211, + 1009 ], "deps": [ "cl-lib" ], - "commit": "ea4b26bc5fbc074a011918172ea0c624a81c8092", - "sha256": "1i4gdascsjpvvks61wwwv0qmw0nbj6jy0slc95jymd2vnyz1p715" + "commit": "03c6ab09c8a580aaaab89709edcd999e66fca0e7", + "sha256": "12rf82ijlisvksq6jvkzgd73y3vgiwmprxfjssjzz8p5myp0m42i" } }, { @@ -41245,8 +41255,8 @@ 20211231, 1837 ], - "commit": "f63d6279a781cf9f33dd2f22826788d98d475961", - "sha256": "11dj0qg2411r2nby2nzi1i4s2v5wnz4594cl5c8gq9hws7cmp6q2" + "commit": "20a76509831b8296bf3c8b389e1f5602c2a88899", + "sha256": "1m4qsb2hfs1v5ffxzc81km5ld0gi8j3hzgnjckw5rlgl0ikrbjg5" }, "stable": { "version": [ @@ -41631,11 +41641,11 @@ "repo": "avendael/emacs-geeknote", "unstable": { "version": [ - 20160717, - 1249 + 20220213, + 612 ], - "commit": "8ed607c76864afcc9c338972ab093caf4501cbf8", - "sha256": "1dadsyvkzf0rg6immjdjkb0k7iaqh3hm1w9qhap94j54j7v75w2q" + "commit": "ce2738aebeeda35f9d31027e9b7bad0813b975c3", + "sha256": "18z0m2qlsr9bs1m5wp88p7snd25wxz8i829z8ybkny6ax1vfi0y1" } }, { @@ -41763,25 +41773,26 @@ "repo": "emacs-geiser/gambit", "unstable": { "version": [ - 20211204, - 1940 + 20220208, + 1356 ], "deps": [ "geiser" ], - "commit": "faff8bac11621228640a3107622fe23df4bb6e2c", - "sha256": "1v736wh19yma3vjpgb2s1n77rrl5i3n8x451kq3cadsch0wid31d" + "commit": "381d74ca5059b44fe3d8b5daf42214019c6d1a88", + "sha256": "1dcrhm1am2dam94a0m7pjkiygah1lw53y2hq0870x1ji4gzgnkl8" }, "stable": { "version": [ 0, - 17 + 18, + 1 ], "deps": [ "geiser" ], - "commit": "faff8bac11621228640a3107622fe23df4bb6e2c", - "sha256": "1v736wh19yma3vjpgb2s1n77rrl5i3n8x451kq3cadsch0wid31d" + "commit": "381d74ca5059b44fe3d8b5daf42214019c6d1a88", + "sha256": "1dcrhm1am2dam94a0m7pjkiygah1lw53y2hq0870x1ji4gzgnkl8" } }, { @@ -41818,14 +41829,14 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20220131, - 1758 + 20220215, + 2320 ], "deps": [ "geiser" ], - "commit": "ecd118171a111e04120d11c0d72345ce1d0f8066", - "sha256": "1ri1l203vp5nnl7chmmvvj3b03315fpzjjkisv55m6xs77ig2cl7" + "commit": "cfd9116dcb246126950d7f2f662f09149684128b", + "sha256": "1k8qgkamzd6ljvk7xiqs1r0fvr4gzffhylpll7c4zjywrbixw3g1" }, "stable": { "version": [ @@ -42138,16 +42149,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220205, - 845 + 20220208, + 2103 ], "deps": [ "dash", "magit", "s" ], - "commit": "c2d9f3c0beef75ce2ca8e1e4b582980f2ffaef34", - "sha256": "1ayk60r3g6v8v8mdaxrv8psk5dhw8ss9rzglw8qzgxhj2dih73d6" + "commit": "a802be95aea25f500583f72df968c86c6771a3d0", + "sha256": "1ac6d4fxcac4p6dp4nhbqf3bzd0yvgwajrllrh3j0vcdpzmbg95s" } }, { @@ -42437,28 +42448,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220130, - 1941 + 20220216, + 2156 ], "deps": [ "let-alist", "treepy" ], - "commit": "38be4a4bd92f4cddcd93b6784007774ce892a6c7", - "sha256": "1as7cmpb7lrkcy25cp541hzc57260czkin2wpl48ng4qg8502ypj" + "commit": "2f50383cb35f0cc54599c54cc9794bf25387c050", + "sha256": "1ph96pqhizaq2vkvmkbzilacsbyx69g2bbsb3z8kqafrhg0khajj" }, "stable": { "version": [ 3, 5, - 4 + 5 ], "deps": [ "let-alist", "treepy" ], - "commit": "192eff9da2c0f61813f3bc9c00913985c1804180", - "sha256": "1bc5z63ylb0ir5v9qngyl50svmlfd6hx9lv1ladwywncdpsslls8" + "commit": "6662865449a4c68c03e3a8257aee0ae5318b0fbd", + "sha256": "1px27nh4cr3r16qmvig72jdirjzllvm2m4dzm59kfznhg3rf7vj0" } }, { @@ -42810,8 +42821,8 @@ "transient", "with-editor" ], - "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", - "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" + "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", + "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" }, "stable": { "version": [ @@ -43095,20 +43106,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20220129, - 2006 + 20220206, + 1802 ], - "commit": "28e937fe4229e93ab3fe3dc31c22e390a42329ba", - "sha256": "1qp5f483szngx67386ladd9nxyydx3k9a540y34sgrwbyssx4qc3" + "commit": "a715c116341162ff1a49fff684a45dec8ac0b0af", + "sha256": "18y1c0nfvc6sr2f4kfddq78kbivlf38zn35pzdvnmfm9nc42dc6m" }, "stable": { "version": [ 0, 8, - 3 + 5 ], - "commit": "f76bffd42fb4ed8ffe09d48c084f6577b0b99fa6", - "sha256": "0l7xmvmj5s93hc39wjjv75f22zbhahnmcxpmvx3dfvsbig9pmk75" + "commit": "0f22d081184bb4040416296099dbf3a8eafb2437", + "sha256": "0payj5hwqkzdrxx5vfzaaalmzfkdmdqhqki193a6cbf0k3c03zh3" } }, { @@ -44213,10 +44224,10 @@ }, { "ename": "gnuplot", - "commit": "be594de074dc3513c773d78c38e823be53061612", - "sha256": "1cz3db40r72cfqazg0w85fx5249d98wkxvjjjcn8dhwnmqymqigi", + "commit": "f623c44a97048249e88401d9d75378ca0cce4ef2", + "sha256": "1n349cx2qv8j549ljiivq62agylb3rd1cxif7qprdz1js9c4c40j", "fetcher": "github", - "repo": "emacsorphanage/gnuplot", + "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ 20220102, @@ -45223,20 +45234,20 @@ }, { "ename": "goldendict", - "commit": "af87026905478d9134a4a036e792f6afd9c10768", - "sha256": "0zvrlz169pg9bj1bmks4lh5zn8cygqzwiyzg49na2a7wf2sk9m1f", - "fetcher": "github", - "repo": "stardiviner/goldendict.el", + "commit": "e86bb7d511a5228c1e87d900993a2747b418bf03", + "sha256": "1hmycq4sv2pkjgqpryv7wd9zy5v4igbfz7d8ap4ah6g2v1r7jdxr", + "fetcher": "git", + "url": "https://repo.or.cz/goldendict.el.git", "unstable": { "version": [ - 20201108, - 201 + 20220210, + 1401 ], "deps": [ "cl-lib" ], - "commit": "700f60be192f4d46787e7f009637c15567064f2a", - "sha256": "0nn7ilprx465r5yx0q11vghq3cv0a269jzz3q1p1vwllwfj0f31x" + "commit": "f3fbe658a8d31dc1bd0ca69e4d2ebaab59e92791", + "sha256": "0x38j3wpyaxggihkw3g1qcf0phfrcic555xyqy3vskhvvf5xgc5v" } }, { @@ -45334,11 +45345,11 @@ "repo": "google/styleguide", "unstable": { "version": [ - 20180130, - 1736 + 20220210, + 1659 ], - "commit": "31c830a22def856285b6a761c524f8d2d0657bcf", - "sha256": "1vv40cnvs985b84sqrpwhgr2ml2xgnlfi9727qaxg5g9wnxckvlq" + "commit": "af78b49ac4fef8083094d5105f72528ee7d09073", + "sha256": "00vryh0h5sc72f49172nxnxwkphw811k58ivkmal97zd2v3m6w7g" } }, { @@ -45501,16 +45512,16 @@ "repo": "nlamirault/gotest.el", "unstable": { "version": [ - 20210221, - 1905 + 20220209, + 1739 ], "deps": [ "f", "go-mode", "s" ], - "commit": "c9ccffd7dbb47274003d0bb1d0b017552b875109", - "sha256": "1y3n78q1ww1mqyrnnlrd2cmwh1lg2qlb1g4gpn7jm7bdn9h9dq2b" + "commit": "298335fab797d0465516ed396f6e2acbe8f2ed93", + "sha256": "12sn06c4gw5jddmdaw73djlraj01f57z9plnyf1gxss4gnch6kmd" }, "stable": { "version": [ @@ -45562,8 +45573,8 @@ 20210323, 332 ], - "commit": "08ac17dee21739edd16606273c35bc83de75fc7c", - "sha256": "0iwidx21lsrncz4kcd6zvpkx4ksmwrn7hp4p3lma62qw0327yh71" + "commit": "f06dbba4cc352d6477cfd500217cba0d26223ff4", + "sha256": "03iajajpxnadsp78rgkanghrr2jm53an3vswm2vn3saqfksps899" }, "stable": { "version": [ @@ -45649,8 +45660,8 @@ 20210323, 422 ], - "commit": "67e3d3d649240c048f4088bd9e18f614218c9fe7", - "sha256": "0zchmlngw4pjdfdfb7zj42vh3ngphc8d8436n8is9dd09f26l7y9" + "commit": "e8e996cfebe2f1a35ba194d6b3989d11f3ae62f1", + "sha256": "1zvfzhn63ylpmnf4kyx6pahrarfnkmyjxvridb0w9g7lmrc5adh8" }, "stable": { "version": [ @@ -45679,14 +45690,14 @@ "magit-popup", "s" ], - "commit": "5cd154fb15348403bdd5ad55cbd33871c9a8a8d8", - "sha256": "0l9c8k765cksjlmmdvyrci3d0aqiq1rvv4vgfm1jfwjq60dfvnhx" + "commit": "81c26b4b6522eca2af3ec9f35df669cb2d51f9fb", + "sha256": "12xhndnxx8zckmq23z3cvvlq5jrmqlfi7nlvsxns10rxsbmgl2ps" }, "stable": { "version": [ 0, 27, - 3 + 4 ], "deps": [ "dash", @@ -45694,8 +45705,8 @@ "magit-popup", "s" ], - "commit": "6b4e239111e6284b3f9ac583de505c4fbf18b2da", - "sha256": "0980dq688xz07msh0rqc7l7qq3qkkkwxg7ymz3jfcdics6cvw90z" + "commit": "285e80cd79d6daee7d5f0ac9555d885f368346f0", + "sha256": "004r3n3y019zvds45h6gk49gailvdy77ql49cmryajd2cifmw2sz" } }, { @@ -45854,8 +45865,8 @@ 20160504, 911 ], - "commit": "02670e1401c070e6ae3f50a8d79b210ca4f3a0ee", - "sha256": "13xlpmp2d96a9hzcwmyl6r9acmqdnvxfa239h00xn8ak0xpr17c0" + "commit": "bf732d367b16887f81d404481c11ed1a58671d4e", + "sha256": "1w7ly961mqb1396653ali52h0311f0dz3pbmlaxml67dshidjjci" }, "stable": { "version": [ @@ -45914,8 +45925,8 @@ "s", "websocket" ], - "commit": "ed552610a59fdd2f8fe5bcbf50e3ebc3b5d383f7", - "sha256": "0jr1dxpsp33zi744rsk2djnix5lyqy8qfiqi9nyb37vzffpzdpgi" + "commit": "5cff7dc36575c9198d911448034649cd769b6b56", + "sha256": "12jm1p881dqiqdbhdqfy8r6kdf47b8ar8ldif53366hhl0pf5hyj" }, "stable": { "version": [ @@ -46407,15 +46418,15 @@ "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { "version": [ - 20220108, - 555 + 20220212, + 646 ], "deps": [ "dash", "s" ], - "commit": "02670e1401c070e6ae3f50a8d79b210ca4f3a0ee", - "sha256": "13xlpmp2d96a9hzcwmyl6r9acmqdnvxfa239h00xn8ak0xpr17c0" + "commit": "bf732d367b16887f81d404481c11ed1a58671d4e", + "sha256": "1w7ly961mqb1396653ali52h0311f0dz3pbmlaxml67dshidjjci" }, "stable": { "version": [ @@ -46620,15 +46631,15 @@ "repo": "kaiwk/gsnip", "unstable": { "version": [ - 20200928, - 357 + 20220206, + 1526 ], "deps": [ "aio", "log4e" ], - "commit": "c8bff61b10cd33de9d6f5fd84e4b27f48c772304", - "sha256": "0lw1psy1258vbvnl4j918hkzwqa65g94azbq84fvf2lgv4lbvgln" + "commit": "4d473b726b3f3b6bb7d1b5f66a9d368588ce0f86", + "sha256": "1slnvkpzhzffvnwyqr5bjgw84j0rapwr7mnaky9925l0rrv3fz6h" }, "stable": { "version": [ @@ -46947,14 +46958,14 @@ "repo": "abrochard/emacs-habitica", "unstable": { "version": [ - 20220123, - 1424 + 20220215, + 1758 ], "deps": [ "org" ], - "commit": "cbb5a0f11a8a91111d753c25c59582741ae49f2e", - "sha256": "1chykvq41ivmyg85ixh09q1wl4ayqdpbzacj4npy3jiafh6sksz4" + "commit": "9e1fde7f359f7f6a6976b857fbbdbc8dd4fd3327", + "sha256": "0xi0yvm4v2mjyml44jbprdl9lza7lhxmf2j177nbgvn8zgfjc7ac" } }, { @@ -47431,11 +47442,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210908, - 1543 + 20220208, + 1821 ], - "commit": "8402caa341d90b4236f5c0a802751f9023ccfbe7", - "sha256": "05pp38r8gb94w8gxnm3rkrawa7d73538lpz7lwccmlr83pvpl0cb" + "commit": "f13b6db78bc880e680c320e015ae232f525e0a27", + "sha256": "06amab8n56nv8a1fnd9x3ic0s36g6q4c4m5mh6sxcngaqjvvz4pa" }, "stable": { "version": [ @@ -47601,8 +47612,8 @@ 20210108, 1835 ], - "commit": "6057c05154464bfb88d2ba119cdc8d4c7e767541", - "sha256": "0z1lpsvmkcxs3gcxkmi1vjgfa7wdfa42cp2i9rl2i17jq34j37yb" + "commit": "f6ed4b77cdd775d53a7b824c21fd14e0eec5e3c7", + "sha256": "0314x9y3v8nmknmdw0gbl4njanxiqbh5h5m0kvnph6r6v0cz7m4s" }, "stable": { "version": [ @@ -47735,22 +47746,21 @@ }, { "ename": "helm", - "commit": "7e8bccffdf69479892d76b9336a4bec3f35e919d", - "sha256": "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf", + "commit": "38cea79ddef23a10098b5f3f8509e5be1e59536c", + "sha256": "032ypri8p6q1xz65imd89xizm4gzxkg62zaqyyv5pb2kbbv1y2b0", "fetcher": "github", "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220205, - 1456 + 20220217, + 1752 ], "deps": [ - "async", "helm-core", "popup" ], - "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db", - "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0" + "commit": "e17ad364b9ddc7b283b21df94b3ba2fa8bdc11e3", + "sha256": "0161qh6la4m5208ix737l8am7gzzwzpgsciiiklslawv28cykyxa" }, "stable": { "version": [ @@ -48643,20 +48653,20 @@ }, { "ename": "helm-core", - "commit": "ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7", - "sha256": "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda", + "commit": "38cea79ddef23a10098b5f3f8509e5be1e59536c", + "sha256": "11h7fl7kisjzwpmwiaqjg2773jpif874w2wwk0n5jqvinpxyijmd", "fetcher": "github", "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220205, - 1456 + 20220217, + 812 ], "deps": [ "async" ], - "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db", - "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0" + "commit": "e17ad364b9ddc7b283b21df94b3ba2fa8bdc11e3", + "sha256": "0161qh6la4m5208ix737l8am7gzzwzpgsciiiklslawv28cykyxa" }, "stable": { "version": [ @@ -49213,8 +49223,8 @@ "deps": [ "helm" ], - "commit": "85c1413dc28a5f5257eeebb6678dad503072b9ec", - "sha256": "1k96284xfsdashlaw1cv61md4fqhynhs674bzphs59h9k8g1vrf5" + "commit": "73312c3d092db8fa401b2e2daa410c452b4e156a", + "sha256": "07aj2izjvjqvi8c7x9n9205vxza4rspw1c7c88ccaq859xz3fx1r" }, "stable": { "version": [ @@ -49478,8 +49488,8 @@ "flx", "helm" ], - "commit": "bc2068dd0da7e77ac7b394544d703720913fa660", - "sha256": "0gd2z8b2blc3flnz196yqcxi2r66lrkm2z0pd5j0n7p5a9ajdfb4" + "commit": "983acd152bfb636a168e81e138f82a25c95385a5", + "sha256": "15kbil5bj8kyn6q0vaacc8prqacjihkw80mb7h8bg8yrjy3ls1j0" }, "stable": { "version": [ @@ -51650,8 +51660,8 @@ "s", "searcher" ], - "commit": "0f89d04d322763a6db9ef58bbad747d41d9479ae", - "sha256": "03q6bs4zhyg7q5rpp1339h3dihl7fp0a16q8253nfr4k3b5qs79x" + "commit": "238b36b0c9c969e322f2ebd1cb0aabecf7076123", + "sha256": "1k2i85qscbpqpd9s799q8n3jdw9f33am2m7419v6cwkymn28qv32" }, "stable": { "version": [ @@ -52196,6 +52206,27 @@ } }, { + "ename": "helm-twitch", + "commit": "a0079a6c9a2207906efcf1d63d5006c50295a9c8", + "sha256": "0rishxgk04y1axkcskxn1dj0m5z6rmm4khsx6x9v1vj9b8yvghd1", + "fetcher": "github", + "repo": "BenediktBroich/helm-twitch", + "unstable": { + "version": [ + 20220207, + 1314 + ], + "deps": [ + "dash", + "helm", + "streamlink", + "twitch-api" + ], + "commit": "533216a1add8acc2d6f2b4039c67528b97d06549", + "sha256": "14686l3idn34scz9a3bai2x42zsrbfazpv1am6j64y7mrp284p8g" + } + }, + { "ename": "helm-unicode", "commit": "f720b9f9b667bf9ff3080938beab36aa0036dc92", "sha256": "1j95qy2zwdb46dl30ankfx7013l0akc61m14s473j93w320j5224", @@ -53424,11 +53455,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20211029, - 602 + 20220211, + 548 ], - "commit": "0593a1a77db28503025d5c1850e6a99551c3bcbd", - "sha256": "1rkxm6ak1zaqzp6q6mqpng0k4qjnsshkwydfxfm63xfsgr4vwhwv" + "commit": "3dd29cfbf24fec16eaf3d47936338adb6b34f5c8", + "sha256": "0c0533id01lx0xf5dkkddd3gwb3k2jh55fa6z0d2xzrmc7p1971x" } }, { @@ -53475,11 +53506,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20220131, - 358 + 20220211, + 548 ], - "commit": "8275de778fa273f63a6254a17f80c83c6780cac2", - "sha256": "1i94x08fdkbcixfj5mq0mvdlnwgbc6a0gjdska58icksalc6814v" + "commit": "aaa9cd5085c13cbbfa41648ca4134a1699e64d5e", + "sha256": "1pbhyskam5jklglrqmzqdfzs5vgh8qykp3ihr9q4rsmh2wypxy4g" } }, { @@ -54117,8 +54148,8 @@ 20200929, 559 ], - "commit": "40075bdd61cb0f839c26d2f86b67d22d04f21093", - "sha256": "05565ybwz4mkcfdqihphm47am842x8mibh7p95qg6y3myr3g4dl7" + "commit": "b10c95db3347f21aca02d117fe036dbf036ec6ef", + "sha256": "1x015d5qzc88vh361hf6bzyzcclypq50iakg7jzw2lw4m9vmg0r2" }, "stable": { "version": [ @@ -55010,11 +55041,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20220121, - 2251 + 20220211, + 548 ], - "commit": "5881f796ad167a5fd46e8e964733725aa825516f", - "sha256": "1a1pkq0q8g40s033ldlyvbn1s83lw9irc9hskv78pjgch1k3qz8y" + "commit": "0a24f8e402383b0da1f956d946781317fba14bbc", + "sha256": "11mbm87rx4i093csdqrgin550wgkps69ysgy2ig56m3l1hs5pp78" } }, { @@ -55474,11 +55505,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20220119, - 658 + 20220216, + 717 ], - "commit": "44968bea9bff8fdd5bf9d227f53814c44bb9f619", - "sha256": "15l0dprhgfv948vlc05n91npb4331n4i3v1idd3zww6vrw85n9l6" + "commit": "27c61866b1b9b8d77629ac702e5f48e67dfe0d3b", + "sha256": "07z659w9m94h79wnvs2fg80f5impidqhsmg6awc3fxwd3ib0yzih" }, "stable": { "version": [ @@ -55872,20 +55903,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20220203, - 1519 + 20220214, + 1859 ], - "commit": "90a0f4e6992a99d000d016b5a82fe1a10fcc5e1a", - "sha256": "0s7vvn300x7cazsp13jzp28r1jrf9bg3asvxm92xi64d45pkki4q" + "commit": "ca82a1700cf7834b55ada36e53811f6effde6283", + "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81" }, "stable": { "version": [ 0, - 7, - 1 + 9, + 0 ], - "commit": "b2b625f690e207bab7b60a23585eba9c2831607a", - "sha256": "173mw87hbr1hk0k859liba7sybsxpmdv0d7d97iyy2khhmn7xkn6" + "commit": "ca82a1700cf7834b55ada36e53811f6effde6283", + "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81" } }, { @@ -55942,8 +55973,8 @@ "htmlize", "simple-httpd" ], - "commit": "cbddfd54242210df3e1c3b590fada5bb5423f5ed", - "sha256": "14jnni828ndl1sj92cy49r0aa6y8qwqbm2rrxc87j0yfn5sdckc7" + "commit": "479a2412596ff1dbdddeb7bdbba45482ce5b230c", + "sha256": "09ns4csq36x4jnja8ayla6j29c5pyw9psf534rd56d7l33sbgyvl" }, "stable": { "version": [ @@ -55973,8 +56004,8 @@ "deps": [ "impatient-mode" ], - "commit": "a57c628abb765a834c85f9299bf816e50ee35d23", - "sha256": "1j9lfxxvgg97l2cmdwyc9c82n09xvc9ybpqn31hm7i71y9l943w7" + "commit": "4fad373753f2169064c54e9a653ee182fb4c648a", + "sha256": "01lz8b4n5k35p5q7335bfdjxn5qxcp6p2ldz31y4ajckwq89ihnz" }, "stable": { "version": [ @@ -55997,26 +56028,26 @@ "repo": "Galooshi/emacs-import-js", "unstable": { "version": [ - 20180709, - 1833 + 20220215, + 1948 ], "deps": [ "grizzl" ], - "commit": "fb1f167e33c388b09a2afd32fbda90a67bfb2e40", - "sha256": "0if117lia2ykd6ai0cf5z4ddhsm9icijigwbrn079v7m9s8yl43p" + "commit": "d2bbb53f96395415f9f01de4fa88d82c1f59ba63", + "sha256": "1r2in6zjhp0cywlyncnqblhb0k1bymhbhs7r974khrpf8byw69p9" }, "stable": { "version": [ - 2, + 3, 0, 0 ], "deps": [ "grizzl" ], - "commit": "0a1032894445062b87dbe4e2c8cdba35ac25c250", - "sha256": "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3" + "commit": "d2bbb53f96395415f9f01de4fa88d82c1f59ba63", + "sha256": "1r2in6zjhp0cywlyncnqblhb0k1bymhbhs7r974khrpf8byw69p9" } }, { @@ -56114,8 +56145,8 @@ 20210508, 309 ], - "commit": "208f21c7ece23acec6b2eb2b0c64928464f6863e", - "sha256": "0i5jhvsjjgfmpi4j9scv618sl0p26hpq7x3yp81s1f390brmf4dz" + "commit": "6fb3e291fb151208cebdd6686f71d60e47948702", + "sha256": "00mr0lhgi4gky5ddqqw56yqcbch9xlm62ciz4r17n32mii6ys25d" }, "stable": { "version": [ @@ -56320,14 +56351,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20211027, - 1611 + 20220208, + 1627 ], "deps": [ "clojure-mode" ], - "commit": "765653dc23dc2a2c1520a1e24332ab9d4b49dd47", - "sha256": "1hbylg5nsix65a85bibwgzcyjkf19rjvdkg04p9hnvsgh59x2d5l" + "commit": "e47684de78da1ee470d42ae2a411909b2cf61d50", + "sha256": "0ngkhp4i3qgl6lgld5qbnrk8grd8r18mabrsana8z2pmy58hxz73" }, "stable": { "version": [ @@ -56771,11 +56802,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20211130, - 214 + 20220211, + 548 ], - "commit": "9afc537af6e56dda5a3ef60792f15ed391ba3b8b", - "sha256": "0mffhf0zzvlrc0kcvfj91p4q7wx9v4ih1v1spjad40h5790gn9an" + "commit": "eb3f6deac945e536cdc8ddc09f6021fdbaa645eb", + "sha256": "1s0srxvcwv1myba22z0phkrs7da7cn22mgp6m6d01v5zgj03924m" } }, { @@ -56804,17 +56835,17 @@ }, { "ename": "inline-docs", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1imjcx4qgrs5llindgmnvkb73fagnlxfg04s72kckgcy47c4352p", - "fetcher": "github", - "repo": "stardiviner/inline-docs.el", + "commit": "9a2649839bd44bf3b2f0db55255f511685dce089", + "sha256": "0dih87jzwr4fwi79gf2hhamhw33vs3a04x2cajg5g31jclpwcz11", + "fetcher": "git", + "url": "https://repo.or.cz/inline-docs.git", "unstable": { "version": [ - 20170523, - 450 + 20220210, + 1402 ], - "commit": "b57f1681be6147f999cdc12abff414a0442e8897", - "sha256": "0ji8qgscs4fxp2i29l3v8z9y6i2glga6bysbcsn855pqsn00xkcv" + "commit": "cda596d9ff4c2aa5035692a97c430f6589eafbb1", + "sha256": "0kc73qv3986n7fv8qrxr81zyg5lk14266v4rpwrib4nv5qwhzjza" } }, { @@ -56882,11 +56913,11 @@ "url": "https://git.sr.ht/~pkal/insert-kaomoji", "unstable": { "version": [ - 20210707, - 1126 + 20220215, + 1204 ], - "commit": "e818845a99d418e04c1685f06fe25116916f6168", - "sha256": "0acyzysz04sd3rahymw6x3a8zy57sy84d36zp6prd62y4w0sw361" + "commit": "974bb7dc02059253e032c501b2c3c0ece448d472", + "sha256": "061809gl7dfz4mis5igz9aiis1gq4np3fk75ydmzm0j9isz4dc2q" } }, { @@ -57350,8 +57381,8 @@ "deps": [ "f" ], - "commit": "c1e3cc7971c278a95eda16ade7b68ad157481a5a", - "sha256": "0lppyr74bsq9dx2qm6cc34vg4i2i8dnrrlbm3xc3nzcsay85cbjx" + "commit": "1f284ab9d731bab9e5e211a3b5f75cef8cf659a2", + "sha256": "0rx4bvr4rym42ivb0z9a4xs7wkbagi0sydykybmr6scqrybx4jwj" }, "stable": { "version": [ @@ -57861,8 +57892,8 @@ "ivy", "s" ], - "commit": "cb7e0f03e1df90855b7cb1433706a8b46f5592aa", - "sha256": "0l2r32k6lzxsww245afddzfpwhy0k80kw0q3jkm5hfw3qgkwd864" + "commit": "77aa87d2ebbf1a0189321b6cfdb2dff5df4de737", + "sha256": "02dslll7ywcrf3vdzazzcyyiyy282nfqqj155h2cv9asnlh7z3nn" }, "stable": { "version": [ @@ -58315,8 +58346,8 @@ "s", "searcher" ], - "commit": "b38ddcbce45f604948c4880cde224beab099b8da", - "sha256": "0719r16pwnvpq9qpa0d2pd2s5yzvawm5gycvxqzvlkgjw49h5rhv" + "commit": "5b6ad49b927a570cb8ba0c52b6a5c527c0f0b7f0", + "sha256": "1s0aqfbvr2f6y6ay1f4dm937qvq9rsnlv0k3r99023kzvk3wjpb5" }, "stable": { "version": [ @@ -59188,8 +59219,8 @@ 20210602, 1430 ], - "commit": "f57c359044ff1fa90db62a60b6691ff8d65c82f3", - "sha256": "17wd6yzhjdw5j3bpn6bnga5nkwdnqgk8nprqiavsir4ghkzw2h46" + "commit": "296e3ca6e0341d9882f4771131a386fe2991e913", + "sha256": "0algc4smi734r5p72k5csjz4kl5iwhrs4mk5h039wab915vjbbkl" }, "stable": { "version": [ @@ -60256,8 +60287,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220117, - 2310 + 20220216, + 2301 ], "deps": [ "dash", @@ -60266,8 +60297,8 @@ "spinner", "vterm" ], - "commit": "92b47f1d4afa1d4ddffd432e23ad35e55c64a7a4", - "sha256": "0grr50ym834p73w1k7abbiswf1qviydm12f803v4i15l6miwvwpn" + "commit": "d06598796f863010e6783b48e946d0337b88e68f", + "sha256": "1b8ggag14mp8wwfkn2kcbcyfpykvncpymrs7zyxnlvy98kyqmypv" }, "stable": { "version": [ @@ -60447,8 +60478,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20220105, - 1943 + 20220212, + 210 ], "deps": [ "cl-lib", @@ -60456,8 +60487,8 @@ "websocket", "zmq" ], - "commit": "42a9765897ad36518b5371f558b36cdac3a0ec74", - "sha256": "09nrw32bmkcafbr69csz94lykpmbib7f22xa4y165szrd3va8qk9" + "commit": "0a7055d7b12cf98723110415b08ee91869fa7d94", + "sha256": "183313jlmfnbndczllkqm47y4495prw4ks2jav3pdwn5qqfmpznx" }, "stable": { "version": [ @@ -60507,8 +60538,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20210924, - 1138 + 20220212, + 814 ], "deps": [ "f", @@ -60516,13 +60547,13 @@ "transient", "xterm-color" ], - "commit": "18604956b8f6ba58cba99470464c67f7b16ce329", - "sha256": "1d6y84gm5n9gkn7v9rhxhxsihabrdgx6mddam0pw75ka53q5s8wi" + "commit": "f60f57ad3e8c97509af3ea925dbb3afa2a25f814", + "sha256": "1gkfz54x80a5k1nw2dmcqs3m7cp1zsm7v7hmbz9xzrszfdiq5zil" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "f", @@ -60530,8 +60561,8 @@ "transient", "xterm-color" ], - "commit": "db77f4ada0840dfb6080121f80249b11721ee779", - "sha256": "0250yayv136ypsy5gy814lv1schm1pza51lvsad7ayr3z1l812b3" + "commit": "d4ffe4752d36915f5dbd8da11b38b4a81743cbc4", + "sha256": "02rrmhacmbh43wqfvf2ls744q5zkr5c1qr4r0miajhy7lnz1binp" } }, { @@ -61202,20 +61233,20 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20220126, - 2100 + 20220211, + 2035 ], - "commit": "ebe6ea5e4ce73fb7b30f9d6647d7635396410837", - "sha256": "02izx6cgdzi5882zny38gwsc6frdry854f6ihfspfv53qiwslxzd" + "commit": "a94f9839addabc2d491ee5c8927453ae2c5ce0fb", + "sha256": "0yxi1s4czkxhzl6dp3b9iaqds35gjccqgrghvfmqyyvmzi0lzss4" }, "stable": { "version": [ 1, - 1, - 3 + 2, + 0 ], - "commit": "b4965ff5db0e913e58c906c228042921b22335a0", - "sha256": "0s31b3kal4j08waa2fwz5d6269wsdywb60a7h4r5vzsrr238lks3" + "commit": "98c2dda1a2ca0fc95f7425847a36abad5b31a4c7", + "sha256": "01z20lsnjk8pwdsl4vx5dqdc4603bmb7fxan7n8j1fgvkvi63yzl" } }, { @@ -61437,8 +61468,8 @@ 20210523, 403 ], - "commit": "f725c1113879bae4c04f2ccf59c6b1ced3bf7583", - "sha256": "0ipqqc4jsg43yv4626265478nd6gwy9am9ligx4jjn2vpwsrkjz9" + "commit": "2af814641fd0cca7b379ffb025ab49917330651c", + "sha256": "1bd78f1sjs47zqvvp8b0mvrlk6qcrivnnbx5qavabzsfg9x9ng5w" }, "stable": { "version": [ @@ -61693,8 +61724,8 @@ 20210318, 2106 ], - "commit": "6bb8fe8e3e581bb30ebb584d9079a2ca83a30b6d", - "sha256": "1nf9lz0lj82z945h0rknl6wk0kblmrlc68gnjlr74lh62hg6gih3" + "commit": "27dff1fadbfe2d42d0f8097a8ae72cf1aa8bd3aa", + "sha256": "1xpzh74agsczq4qxg3hl6gmpvspszyrnp6mk1m5z7wkhya7312jh" }, "stable": { "version": [ @@ -61704,42 +61735,38 @@ -1, 1 ], - "commit": "8451d298c1260ba488545194d9111d48c224a5b1", - "sha256": "0hd38xb13b9k76lirmflr1xlqya6q6kl56qy0apk01cv8dkqh4ga" + "commit": "87b60702e0bf8eee929ba9ac4db725d12274d7ba", + "sha256": "0ppy54rvknghjcxrbja72n45yn5ljcqbvddb3rvn8pfpzih6j1pg" } }, { "ename": "kiwix", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07", - "fetcher": "github", - "repo": "stardiviner/kiwix.el", + "commit": "6d33d35c4228eca53de36d14296bc3e8219a3169", + "sha256": "18sxrdccqvkd8w6pj4lwbps1d04dm55lx0f5hr7hyc454q4vbg80", + "fetcher": "git", + "url": "https://repo.or.cz/kiwix.el.git", "unstable": { "version": [ - 20220110, - 1542 + 20220210, + 1403 ], "deps": [ "request" ], - "commit": "1645c5b659a74c7fe3cae364b967edd45f64d61c", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/stardiviner/kiwix.el/archive/1645c5b659a74c7fe3cae364b967edd45f64d61c.tar.gz': HTTP error 404 ('')\n\n response body:\n\n Not Found\n" - ] + "commit": "d21cbe30d697fa6720d016c52a807c8502719d4d", + "sha256": "0yapgm2fp9igc39did3h1kf3m236683h08n6615kldq8wxd5w774" }, "stable": { "version": [ 1, - 1, - 4 + 0, + 2 ], "deps": [ "request" ], - "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", - "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" + "commit": "86c163cbc0515e9e516f05e809796087b1d3ba8d", + "sha256": "0fh5bx6c2jm492z70vq46b6fmsk4mqagxc75xcizl47s80wq6yvn" } }, { @@ -62080,8 +62107,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20220111, - 1305 + 20220213, + 1809 ], "deps": [ "dash", @@ -62092,8 +62119,8 @@ "transient", "with-editor" ], - "commit": "16b60452e40b79dd35f40deeb61cc203a581a1c0", - "sha256": "1ghx9jk106f4m3wlk87g68ksm4cnwk84777kyf96riwhrs2bp88a" + "commit": "d52ad7dacf17b659060e52d5e3318cafd7946616", + "sha256": "05ibxsbfdaqdiabwl92j3mgcyf0gk5bzlwdlfms2f76wbrmpqw0l" }, "stable": { "version": [ @@ -62127,8 +62154,8 @@ "evil", "kubernetes" ], - "commit": "16b60452e40b79dd35f40deeb61cc203a581a1c0", - "sha256": "1ghx9jk106f4m3wlk87g68ksm4cnwk84777kyf96riwhrs2bp88a" + "commit": "d52ad7dacf17b659060e52d5e3318cafd7946616", + "sha256": "05ibxsbfdaqdiabwl92j3mgcyf0gk5bzlwdlfms2f76wbrmpqw0l" }, "stable": { "version": [ @@ -63232,8 +63259,8 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20211005, - 1331 + 20220206, + 1515 ], "deps": [ "aio", @@ -63242,14 +63269,14 @@ "log4e", "spinner" ], - "commit": "e278b099173dced55e6e39f9924e90899542ebf1", - "sha256": "1cm6z3ad3c704y3n0f1h38fhqrd69mrf7f4x79l8v76f6fj8vdhh" + "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", + "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" }, "stable": { "version": [ 0, 1, - 23 + 24 ], "deps": [ "aio", @@ -63258,8 +63285,8 @@ "log4e", "spinner" ], - "commit": "e278b099173dced55e6e39f9924e90899542ebf1", - "sha256": "1cm6z3ad3c704y3n0f1h38fhqrd69mrf7f4x79l8v76f6fj8vdhh" + "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", + "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" } }, { @@ -63475,11 +63502,11 @@ "repo": "tecosaur/lexic", "unstable": { "version": [ - 20210729, - 1808 + 20220211, + 1347 ], - "commit": "a49235c918d626f5053344604cb1c464960762af", - "sha256": "1b4k80bm2p7sqh33dx72qag7056nlxqv9s8czql2qfvi8vlnwzz0" + "commit": "6301a5ad00cf8eb74e7a522c84c7ccabbec16241", + "sha256": "1bh5x3zhcx0pdfbqr90dvh6b4q361z6nsmzzcry4pld093wji0dn" } }, { @@ -63512,8 +63539,8 @@ 20220102, 1653 ], - "commit": "4c9f2ede47f710dfb0548d4e32793ad5766ca8fa", - "sha256": "1qcmcmi8s174v8549r86438smsxvnbfjhhq2iyhwwwxr3hxvr7l1" + "commit": "fc5ae30f6738dfd0664864698bfebb5423241ff8", + "sha256": "1ici0jqx136vcqh3rzcg4xgqsh3kjg65d5hnpivvhmflbjhkbxzr" }, "stable": { "version": [ @@ -63689,11 +63716,11 @@ "repo": "buzztaiki/lice-el", "unstable": { "version": [ - 20200607, - 103 + 20220215, + 303 ], - "commit": "482e58ab83fff86ed754b00be27b62a219597e7c", - "sha256": "0yxkjyhfk8kpr8yqz54gdx6xwkj4s8bnbz60162jh12crj0bs5n7" + "commit": "b15230dbfc66cc92bbde8f9fd369522d7666c0c7", + "sha256": "0xpjcp4b76lc0d5jpry055d572rdp93vkbm8ck5yh97wy1y2837w" }, "stable": { "version": [ @@ -63736,8 +63763,8 @@ "deps": [ "request" ], - "commit": "a4273a6dcc45dabf237c4bfd780ec22420711c70", - "sha256": "0lj997453mywdnl6zf5fvdgw4j4k3i2q9ayi2rnhdaikn5a36nmd" + "commit": "3736a80aa1d87389d8472a2310f24d8854be943f", + "sha256": "04cba1xshwza0y562vcgq9dcn54snqjjb4vlvz16b4qsdz1ghicn" }, "stable": { "version": [ @@ -63775,20 +63802,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20211119, - 1813 + 20220209, + 755 ], - "commit": "222e084b09a8b95ff194d3e9e3d8b89941c2052c", - "sha256": "1d1smrn17ywarryj6hcdwrmsnzcd3r0x6hhpg16w5qi73riz61v6" + "commit": "2437b101739f2e1b02a87327180fcad415498b57", + "sha256": "1lgzps5qjgb99hybc2mmkjn5axnpz6p58f87dvasj99i008izcl9" }, "stable": { "version": [ 0, - 35, + 36, 0 ], - "commit": "b7cfd2109934bc15967723dead5b98822af58473", - "sha256": "1d1smrn17ywarryj6hcdwrmsnzcd3r0x6hhpg16w5qi73riz61v6" + "commit": "a66064050e228d7d3e322817f841187a8f38b089", + "sha256": "1lgzps5qjgb99hybc2mmkjn5axnpz6p58f87dvasj99i008izcl9" } }, { @@ -63799,16 +63826,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220204, - 952 + 20220206, + 1919 ], "deps": [ "fringe-helper", "ht", "indicators" ], - "commit": "8bf9e6d70347a99528bab56f90e0210f9a88dad8", - "sha256": "0f78dnz0qmmq2g4xsm3a9kqg4864lghv1nbz0hj2c8mz2c58laqs" + "commit": "c17c316b8593e5c9b662172131fd187d5e742d4a", + "sha256": "0jii3lvsp5cx5yqiaz5v5hmxpgll9ylirc9853s5m2gad3z6cy3v" }, "stable": { "version": [ @@ -63836,8 +63863,8 @@ 20180219, 1024 ], - "commit": "9aba9e57432873c2634ef504240e0a4431d3cadc", - "sha256": "001ljhsg7h3qxw3xd4c457dc2wrm1sybla04h78kq82cikmmnqgi" + "commit": "254ee815eb3fe77edea7c9da6f6f3839163735f3", + "sha256": "1q66yylmd9af3sjmlxs4l6lk6kvshg2fmalappj89c4gs9idcip8" }, "stable": { "version": [ @@ -64053,8 +64080,8 @@ 20211004, 1429 ], - "commit": "5450cf3fae023cb652ef7391d96d9969eadf3866", - "sha256": "005s4p73zman1pnk46ajwj1m0b648i067frfg6i37wikryrcnz95" + "commit": "7b208f99612a359690da76efdcce7196fef6a65a", + "sha256": "0n39573gkmqbmjlzh7al4qlhavmdqg3s7sz0xw7i7fbinq1lw88z" }, "stable": { "version": [ @@ -64169,8 +64196,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20220203, - 1437 + 20220209, + 1138 ], "deps": [ "ace-window", @@ -64179,8 +64206,8 @@ "swiper", "zoutline" ], - "commit": "80a4f6e9a7fb39e514a5ddfa919fa14f73716b71", - "sha256": "0vkvsg0x24yabkhcal25xlz0r5zbvdhd4x0zni9w5wg3rcf2rvmj" + "commit": "df1b7e614fb0f73646755343e8892ddda310f427", + "sha256": "02pmnn9cqslahnvllqzawp2j5icmb3wgkrk4qrfxjds68jg7pjj4" }, "stable": { "version": [ @@ -64470,14 +64497,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20211101, - 948 + 20220215, + 1814 ], "deps": [ "s" ], - "commit": "ba7d22140a165b0fdd900a8d04916115ca6ab8ff", - "sha256": "1bdybw44pmhfpikdv1kg2sx88546xyncks5a4b2s0ak4p66r82k3" + "commit": "f5133e65d8ffdab918cdfc269ac0c067a0de5e9b", + "sha256": "0gvha2fl5macpwsp4fpa9nv14sg0yqr90s3v92f6imx89ll0rcya" } }, { @@ -64614,20 +64641,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20220130, - 237 + 20220208, + 308 ], - "commit": "d6efd5dbecd873b65da5c55270cfa8fe09ff6f07", - "sha256": "0lcdvf540dwsk5v3v17add2s6vv1yg24z479f6vngwssn281scqc" + "commit": "9d310b173c4128fdd7da876cd84b9ef888567773", + "sha256": "1kwhjj5kkfdbgqr0v5kwyabp741rhww7ydlc3krajih7m18zsbsy" }, "stable": { "version": [ 4, - 7, + 8, 0 ], - "commit": "a5f1953904ae6ad7d347f15975d905b7f74ef16a", - "sha256": "0kaf7gki5m351gipa92kqbp3jf74c2vjj7nm57vkq4gkxr4wmfi1" + "commit": "cc2adbd4455dcc70cc1366af5e0754a619e75242", + "sha256": "14n8cf020hpz9hrhf7pxcxszvbkp19s5j5cz3a42n4jh7jpacdzp" } }, { @@ -65013,8 +65040,8 @@ "ht", "s" ], - "commit": "40e3b873e91393a19bd3251615817166aa2f5d4b", - "sha256": "1c4fx533xbffj5hj2nnlr76v6l9a1ah3pwbhncw7w31dq5v6vzx7" + "commit": "19c3ab12689f2162fefc14061d46861c7f653a76", + "sha256": "11i9r69irn20rf8jxd78b4anmrx763qh672gkjjl0sna0pfs287s" }, "stable": { "version": [ @@ -65186,11 +65213,11 @@ "repo": "petermao/look-mode", "unstable": { "version": [ - 20220206, - 207 + 20220213, + 126 ], - "commit": "f1f4217b442fd52fb91cdbea34ff2c6af99ec8de", - "sha256": "145swf80935wq7pgz46f0g3ix4j0szi6r8cxwq5aw9fc8y1438n3" + "commit": "c6e7baedd652a9a2b7e6b9418039e8f4922e0baf", + "sha256": "0r6yp86nbbxv6m4mzh7xya2mqxrq77s3qpzf5w5aj9hlnx1p5psl" } }, { @@ -65224,20 +65251,20 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20220204, - 1512 + 20220217, + 1452 ], - "commit": "d2a48068c4ce29966229f128d50163762b685091", - "sha256": "0hx5x7mv98sr935v97j2zxzjcmvzkh6h2zxra5vjxvwgwykqk9am" + "commit": "474b706dab58dfb8bec40b9ac5084b8dc26e833b", + "sha256": "085d6k3yi2lzyxm0raycr9ssavqb5yqqxn94jpvwhnlzg00qpiah" }, "stable": { "version": [ 0, 8, - 1 + 2 ], - "commit": "0b3bfd1dbb61f29d21b8aa17c60848456aad76c9", - "sha256": "043j28jrpifzqqdia4y2kdy0l0xw5cnh96mv3wr3sfbi3x33m44p" + "commit": "4d887f7695b48be92c4226faf683c9c328257481", + "sha256": "19iv3jvl5zb4i1q5fvn57xka93z9w6sfb1m0ry8mqb8g2bp5alnl" } }, { @@ -65248,15 +65275,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220110, - 144 + 20220209, + 320 ], "deps": [ "map", "seq" ], - "commit": "e7a6bd15cebe94d7dfe2732187afb50bcd58088c", - "sha256": "0yz9xxah6jg1wrvk2g4slrl1vaxc99icfb62ic62gs54s1cz27qs" + "commit": "e3933cccbce289eef2591cd0bbd42de55a56cba7", + "sha256": "14wd16dkqcn8ip6ijhzchdm9i6i205lgin66g7amrqs26vx6wqw6" }, "stable": { "version": [ @@ -65287,8 +65314,8 @@ "dash", "loopy" ], - "commit": "e7a6bd15cebe94d7dfe2732187afb50bcd58088c", - "sha256": "0yz9xxah6jg1wrvk2g4slrl1vaxc99icfb62ic62gs54s1cz27qs" + "commit": "e3933cccbce289eef2591cd0bbd42de55a56cba7", + "sha256": "14wd16dkqcn8ip6ijhzchdm9i6i205lgin66g7amrqs26vx6wqw6" }, "stable": { "version": [ @@ -65368,8 +65395,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220129, - 1427 + 20220212, + 27 ], "deps": [ "dap-mode", @@ -65379,8 +65406,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "5cef1b6a34327bf236c8b7b23c44bdd968b4585b", - "sha256": "0kvjkpv0yvahmlkqyzl9ayl3mmmr4gcmi3p5pp8092ah0xgys86p" + "commit": "40aa90d8ad0ec6d5f9682e135eefb794b675dc9a", + "sha256": "0dbbfsspwfx654y8gkn12whf5942lchcma8ki6jy06h7pbx4wgm8" }, "stable": { "version": [ @@ -65472,8 +65499,8 @@ "request", "s" ], - "commit": "8b2368675ab820b48abed3a3d7b5208fdc88d94b", - "sha256": "0wx51wra4gg7i2bf0q0y42gmnm8nn5vrzhlya678g36pk2h48h2z" + "commit": "d929ce8c324a722554c866e7fd76857121f193cb", + "sha256": "1qlwz2cx03mdd40vwmgn7cvn1h3d1d1m58r48np1cs1bjf2wbmb2" }, "stable": { "version": [ @@ -65803,8 +65830,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220201, - 852 + 20220213, + 906 ], "deps": [ "dash", @@ -65814,8 +65841,8 @@ "markdown-mode", "spinner" ], - "commit": "fbfaa80095a82f7473cb7e45fe73b32ecc1900ae", - "sha256": "0lg9sl5gfglx070230i4gszcp58b1s5pdgfq50hy6wanifvxsvah" + "commit": "9b3a9215807af0727b514e8c7cf440bcc0bdad44", + "sha256": "0wq2nrg7dfd5570q5s8w36z3c8brsdby1q9iqfxrab7v1byxzyd8" }, "stable": { "version": [ @@ -66382,30 +66409,30 @@ "repo": "SqrtMinusOne/lyrics-fetcher.el", "unstable": { "version": [ - 20220204, - 916 + 20220207, + 1326 ], "deps": [ "emms", "f", "request" ], - "commit": "f6948259b388102208d8a29dabf383f10f801cab", - "sha256": "1p7dpnjspjcxs3wi7fmfnwxgl5ha3d420imhni4wlgdx2nyjqp8f" + "commit": "06bd0293dfa759df48faefd73be60d43d1febd17", + "sha256": "10lifif5nbbn172l6dyifm00q3ak91bp143ng3p2j5518vah2cb2" }, "stable": { "version": [ 0, - 1, - 4 + 2, + 0 ], "deps": [ "emms", "f", "request" ], - "commit": "4545f5c5609166198b5f6f2e12de7309d294b629", - "sha256": "135qiprw4r03s1cjkq2hr8i4a6p2aapiz07cw697mhkr3rvvvbam" + "commit": "06bd0293dfa759df48faefd73be60d43d1febd17", + "sha256": "10lifif5nbbn172l6dyifm00q3ak91bp143ng3p2j5518vah2cb2" } }, { @@ -66669,8 +66696,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220203, - 2302 + 20220217, + 349 ], "deps": [ "dash", @@ -66679,8 +66706,8 @@ "transient", "with-editor" ], - "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", - "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" + "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", + "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" }, "stable": { "version": [ @@ -66759,14 +66786,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20220124, - 557 + 20220211, + 548 ], "deps": [ "magit" ], - "commit": "d02a69c0c1b411157e8ba34d6e986767c5ea758c", - "sha256": "1adqc4c9xqydmmk1zh4ar590hznfq4ls8g9x5xc0id7mc0pc9rjs" + "commit": "4845e535a38da2dae1b2dd857cef9eb15abefb41", + "sha256": "0vnp1xn7s447waa1319bix8xnvwbbz0vshplzl37zdjyh1myf33k" } }, { @@ -67045,8 +67072,8 @@ "libgit", "magit" ], - "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", - "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" + "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", + "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" }, "stable": { "version": [ @@ -67108,14 +67135,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20210910, - 1333 + 20220209, + 1857 ], "deps": [ "magit" ], - "commit": "875f8ace4c38d1f6f2126ab0f038687c42f1ab2b", - "sha256": "1mbh5qshaiv5x6rlklzx9l3icccb9kn3rvbdaq1xbqbgfdpfhfwd" + "commit": "e792755514cb5a98b94fcd1c5eacd487f7e04d7b", + "sha256": "1x6663ycyvxmacww7cdq82cxbjkpgjpwcvxgaqgh6pfc2wwqiwml" } }, { @@ -67194,14 +67221,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220130, - 2007 + 20220216, + 1853 ], "deps": [ "dash" ], - "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", - "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" + "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", + "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" }, "stable": { "version": [ @@ -67409,8 +67436,8 @@ "markdown-mode", "s" ], - "commit": "9fb9c653d0dad3da7ccff3ae321fa6e54c08f41b", - "sha256": "047dyiysdhf81qfcmmaxzixgxy35fjm9wyhwwv9630s5b83fh094" + "commit": "b75bb92eb5defeb358aac09bc50f6067e3c1d250", + "sha256": "1yxkzxxlbx1bhdxry114r5h6ncipycg6szn8gs8xnzj6yi5niyig" }, "stable": { "version": [ @@ -67539,22 +67566,21 @@ }, { "ename": "major-mode-icons", - "commit": "c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56", - "sha256": "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95", - "fetcher": "github", - "repo": "stardiviner/major-mode-icons", + "commit": "15057fc5b590c36f62b78243f301a288c85a6d3f", + "sha256": "1rl0b7k45y3gyip4n3wf1hpl94h5q0ndhm84f83k36w8q5pqhy29", + "fetcher": "git", + "url": "https://repo.or.cz/major-mode-icons.git", "unstable": { "version": [ - 20200127, - 512 + 20220210, + 1404 ], "deps": [ "all-the-icons", - "powerline", - "xpm" + "powerline" ], - "commit": "b36eae2e976bad3c431b082c64b1a724a2ba1fe6", - "sha256": "1jjmma9lx5g4qprmy71izgdp564lbdb0wsiysl1f6d8wipml78ys" + "commit": "b0214e0af13cd3691c4d28f03e3108bd98ec7a85", + "sha256": "04zhns2ziwkz67zlnh4qc7faqq751f9mc5b38zmkh6nidlhfhjj5" } }, { @@ -67803,8 +67829,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "67cac2f9e3804fa815490b305e98e37fa55023ea", - "sha256": "1a36fpl6qhby64cnpm359sgsdbn0qakfc7qc8nkb6dl0lmbkfxdg" + "commit": "ff6cfaa5bb4d48f8909f0cc3d0da41720c1f69f4", + "sha256": "197087nvw8jdj2nqvrs12wkd72gbwygh7iv82lilffpb2dbvgfi3" }, "stable": { "version": [ @@ -67980,11 +68006,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220131, - 738 + 20220217, + 21 ], - "commit": "e9540a7b80f9c4d044748b88720e5cba3e30c20a", - "sha256": "1a4k00g2pp7mk0x5zhqbxvv2igfjdz6bfy2g3hps2ygf4h12wbhg" + "commit": "097bd81743026c9b4889b860efd0283b26e64ccf", + "sha256": "1zkm3axkg676jcr0rv3na4v212cq4m2lpk0zac5a2s1y0fgvvx2q" }, "stable": { "version": [ @@ -68100,19 +68126,19 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20220118, - 1509 + 20220212, + 728 ], - "commit": "541bd7b48a4b7586f3c419f9ee1bb24810e1f56d", - "sha256": "0m634gigg6ypns2j9ipf97jv659d6zdcdfff825kazb31hz9lms4" + "commit": "521658eb32e456681592443e04ae507c3a59ed07", + "sha256": "162xfchw2nxsx5a53kx15qlhr0vqqsn1vpqjnfp3ys7yngs3vvdm" }, "stable": { "version": [ 2, - 4 + 5 ], - "commit": "7b854c8e70b6d6edee12aec4194f4eb239586804", - "sha256": "0g0ja4h651yfabm3k6gbw4y8w7wibc9283fyfzb33kjj38ivl5d7" + "commit": "eecf2f20b097f9e6a0eaf938af967122fbec35dd", + "sha256": "02vw1zsbwa2hc3sxvbpvbldi5cf1xgd5b9l6fwg24d24j6b2af0j" } }, { @@ -68315,8 +68341,8 @@ 20200720, 1034 ], - "commit": "9c2fca7a7709d5ba4d83020669ab9d8b6d992624", - "sha256": "1frlnh73aygiz099r3dh7jlfr55ijplww3zyj4ig70mzd8qm08b9" + "commit": "2bcfa9ecdc555279e74ef5a73966c636bff07743", + "sha256": "0cmwxpdj4b3pvm4awbpbvbf31qv7pkvknw3nj1qrpvmhj7qga5f7" }, "stable": { "version": [ @@ -68396,15 +68422,15 @@ "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220130, - 952 + 20220216, + 1103 ], "deps": [ "request", "seq" ], - "commit": "5a0cc2fcc5fa0dad2d884dcc9989222d6df9e88e", - "sha256": "0ndawsh4gg2lcgs7php8660wvc2qbwrqnb6cbw7dkzhhcnyyi266" + "commit": "813faf2381a7c4322c1ef71ca1364457609a3a57", + "sha256": "1skxk0ahvqqfxm0mg0940cf04k2zk6nln4dwgjfsw11dcj9ns89z" }, "stable": { "version": [ @@ -69011,20 +69037,20 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220202, - 1100 + 20220217, + 1046 ], - "commit": "845c4693ade5aa24715d3c0e4da678ca3fa98b51", - "sha256": "124afg43kxlizn69hfhd7w157i3c59ifap1ilfcpga3dgvhn3ws7" + "commit": "2cbb794904002362ab342d8b6b27addbb119998d", + "sha256": "1irdasnwfh512d4dkwcsihmc6a88bxd3g490h4wbn4x87z8pzhzg" }, "stable": { "version": [ 1, 4, - 0 + 1 ], - "commit": "6bb3fee0b91a74622e891537307918e828a4ed89", - "sha256": "04vin23bmds8dp2i1xihph9r7v43lcfz6fm23f4nvcyka9rqxc0z" + "commit": "b494651e1e02a232c5b9a359d6d4474ade736baa", + "sha256": "1w6586q237c5li8c0rrivissvhn2hic6l199yr9qx92mm9cvic0q" } }, { @@ -69038,8 +69064,8 @@ 20210720, 950 ], - "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", - "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" + "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", + "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" }, "stable": { "version": [ @@ -69067,8 +69093,8 @@ "auto-complete", "merlin" ], - "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", - "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" + "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", + "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" }, "stable": { "version": [ @@ -69100,8 +69126,8 @@ "company", "merlin" ], - "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", - "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" + "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", + "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" }, "stable": { "version": [ @@ -69162,8 +69188,8 @@ "iedit", "merlin" ], - "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", - "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" + "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", + "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" }, "stable": { "version": [ @@ -69432,11 +69458,11 @@ "repo": "jagrg/metronome", "unstable": { "version": [ - 20200502, - 1748 + 20220210, + 147 ], - "commit": "18257ecdd7b3d816104e83a5f0f96e676cc9fbfc", - "sha256": "14qzb1i9l149nw4zhx8jlrrz7nvflc974zr5lbv7vv2zky0pya6w" + "commit": "1e1bd5234f3ecfb608041d423be7412c461ad3c2", + "sha256": "1igx3ajzgrrhc1bxzj24bf1r9ipm3pd4haq82wqdqskf60gidkac" } }, { @@ -69519,8 +69545,8 @@ 20210131, 2152 ], - "commit": "bf7e45439b044d18d0fdf3151fbdd7994875edce", - "sha256": "1i8frxbqmq5qakl2gnrmz7v3kvbfz6jp45ayn9kk4mq1j2ync3lh" + "commit": "0ab2406db9b4d5dac2348dd033d5fd37abd92a94", + "sha256": "0jdv58k2h90jr2a7sxkif4diwj3c0978ajyhaapk58icihfn66sa" }, "stable": { "version": [ @@ -70392,8 +70418,8 @@ "deps": [ "cl-lib" ], - "commit": "82cfba411c544c862a0854f682494a437642c957", - "sha256": "02rg73rnz9kp73f6c9vm7wihg3hp4x3x7bw6khx206qjwpy8pcfk" + "commit": "a5f978e84e07a1d79c6c8e35043ac93d8e5d50ed", + "sha256": "19xbr4vbr3d1wx0a19jplrb27bhnxb4w65avg3n0avi4dg734yy1" }, "stable": { "version": [ @@ -70463,11 +70489,11 @@ "repo": "ideasman42/emacs-mode-line-idle", "unstable": { "version": [ - 20210215, - 2345 + 20220211, + 548 ], - "commit": "8454a5ef404c6f4fe954a10da6ce4fd4311decfa", - "sha256": "01aq4bgris8v7q0yfyz1928q4rh9mba3b799zw2df8slqiigbf8i" + "commit": "ab45689351aa089c9fa82805b2cf34847d26b407", + "sha256": "08flayni445wfzkmzzvppw6ak03c0asipxdl3b8rwmwjjxglx9pd" } }, { @@ -70583,20 +70609,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220206, - 751 + 20220217, + 1635 ], - "commit": "6789e5790c8faec1cdac5036a5910d4644707eba", - "sha256": "18jw3dyf1mpfkq8rnqlzwp805kqqf3my0av72kbzynw5biggaqzk" + "commit": "4bd32dac89cc0e0ae9ad2074133ff1d2c60bdbcc", + "sha256": "1v5p057drqpd23m04vckc100pr4hfxj2ms7j3xwlvqbh6z4fnkg2" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "e02480f0b0a56b8575351db6504bf0d0417719ad", - "sha256": "0fh9nw7gz3bqpk6r1v6rggajhqaymk6hyww7i3hfb34g74qhyq3i" + "commit": "1c7776497617a6437a3ff3d805fc0eeee41d30e0", + "sha256": "1v5p057drqpd23m04vckc100pr4hfxj2ms7j3xwlvqbh6z4fnkg2" } }, { @@ -70940,10 +70966,10 @@ "version": [ 0, 7, - 0 + 1 ], - "commit": "ee5df762d10e60cc19e771b1a64da9459c584cf3", - "sha256": "1xzi93hp4jrxqi3x31cpx4ff1yh2gq9y7qvv65gj19cfk9a0da88" + "commit": "aa6666eb344947bf1eb9d14619f4249403048321", + "sha256": "09yyihx6cpa724z6cj2rqspajwj325ipgpmckklpgq6l4h5xnwy4" } }, { @@ -71218,8 +71244,8 @@ 20210306, 1053 ], - "commit": "7329757e1ad30e327c1ae823a8302c79482d6b9c", - "sha256": "0pkar3dyc47vqalrsrzrsny81615v4yi5y5hr4gdkhnbb54hsw4r" + "commit": "cdb6ca32615805af5d2b7aa1dc5a9b300ae1b09f", + "sha256": "04y80fmk5ykjdqkag2fz8zppnwdxs81dyqj1jl1xs5g75g6j3c6z" }, "stable": { "version": [ @@ -71729,20 +71755,20 @@ }, { "ename": "mu4e-marker-icons", - "commit": "52f7c75f26eb02a58ed023a9d709fdcc09e11587", - "sha256": "1lyxcw7a842z4ss47sa8gzyh84p886d3qsszz9vl6978gy77i4al", - "fetcher": "github", - "repo": "stardiviner/mu4e-marker-icons", + "commit": "d1fb8cc83e74cf9993c3123213d195935c61aa13", + "sha256": "160ycz6bbnczhxz3zixjbqa0d4rb8240lwjvk7aijgypzbgn95il", + "fetcher": "git", + "url": "https://repo.or.cz/mu4e-marker-icons.git", "unstable": { "version": [ - 20210124, - 514 + 20220210, + 1405 ], "deps": [ "all-the-icons" ], - "commit": "e5c4f9b14eab69a0a28f108c6fee3390e19bd080", - "sha256": "1a3cinvi0j92j65qfgzmnx6z0xvq4l2jkvw9wydhm3bkmi3v6ni4" + "commit": "35ca0c9bd0d1512eed943f704ffc73ed97cca454", + "sha256": "1x7vkc7bagnk8xan0ylckj8wfxpqk2r4ij64vy9p0z0rgyrvj56v" } }, { @@ -71792,16 +71818,16 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20211222, - 1457 + 20220214, + 358 ], "deps": [ "esxml", "ht", "xwidgets-reuse" ], - "commit": "a1d7268eb2b737ee69b5bdf45aacbc30e50204fe", - "sha256": "00yj0ldyxhzqdsbxr4jr4rd4j1njy1r0blh7py2nlxqia22c015g" + "commit": "84a17bb3d725cb8b37cd700a6b88fbf98f5ca094", + "sha256": "05ygjbr6vbkji5jh1vyyyxh8inc8qis95xwp9zdjwc57dzjb2kah" }, "stable": { "version": [ @@ -73185,14 +73211,14 @@ "repo": "SpringHan/netease-cloud-music.el", "unstable": { "version": [ - 20220206, - 1052 + 20220211, + 1326 ], "deps": [ "request" ], - "commit": "c94ab2fc0beb80f4cb378dceba566b9314095152", - "sha256": "0s7inq1j053lnfgyn7nsh3s12bx1wc9f1fp001n5gj4qna8lbfw9" + "commit": "0738c875045072c277c85882330778fadd3d29f7", + "sha256": "1rxqgb3fj9zvl5pmfd2pb4hd7jrgl8620pnq455qg6b8ck24gl2i" }, "stable": { "version": [ @@ -73893,8 +73919,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20210926, - 1845 + 20220210, + 1529 ], "deps": [ "anaphora", @@ -73902,8 +73928,8 @@ "json-rpc", "rbenv" ], - "commit": "168b5ff1d8d8c39ac2db31e56fbab0927d557d7f", - "sha256": "1vka4i3hsgvwiwqh06xsdrlf50q7mjzyvc4gdk28705gaxnzqmiy" + "commit": "1b7d7bfc99b104b7c4948af9f3394b416105e9d9", + "sha256": "0c38j3drf89f98b6h3xcky6alggszrr86325g72mlbkknszkhh95" } }, { @@ -73972,16 +73998,16 @@ "repo": "dickmao/nntwitter", "unstable": { "version": [ - 20220125, - 2030 + 20220213, + 1654 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "221902b1acb3ed4f9527eaee6584c2d9ff0d309f", - "sha256": "0l6izdzsaxx0zfhm502blvrlvw012mld2niln404c7ca9b49ma19" + "commit": "354781f9d2da04649823a6923ad372d801f10ca7", + "sha256": "0y6cniqjgyap95jq2crfwxa72f2ln4frn299p4b9p26n2q6a3rrh" } }, { @@ -74007,26 +74033,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220129, - 1234 + 20220210, + 1734 ], "deps": [ "cl-lib" ], - "commit": "ba3facc3f6204ca82fa5b139dc01d8ce9e202443", - "sha256": "0w2r49c94xaag4nyfzz8ga05b15nc5zgm8y6sw63vaxbzg291nmz" + "commit": "f01872a2972450f8d12d84f58f3c5b812c716299", + "sha256": "0rf05lfmr77yq7xqz1nd4bji6d2cipb3hd5ap9lrk6jiv7f72dr2" }, "stable": { "version": [ 1, 2, - 4 + 5 ], "deps": [ "cl-lib" ], - "commit": "665e324abb690fb50e9d255bc656eb12bb83b0c6", - "sha256": "1gk1l5zk5r8alnzfbfsck5gxcwr55k04rd08sxmb4j9jds6w6zyv" + "commit": "f01872a2972450f8d12d84f58f3c5b812c716299", + "sha256": "0rf05lfmr77yq7xqz1nd4bji6d2cipb3hd5ap9lrk6jiv7f72dr2" } }, { @@ -74321,27 +74347,25 @@ }, { "ename": "notmuch", - "commit": "d05fbde3aabfec4efdd19a33fd2b1297905acb5a", - "sha256": "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7", + "commit": "e3077f441b343d54d88490811eb2477e6ead87c4", + "sha256": "0n9qfr0qnb93ws3ys2qxlqyf1ardfa6phq1rsj57i1r8wkly5ddf", "fetcher": "git", "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220126, - 1122 + 20220216, + 1156 ], - "commit": "0c357ce78516ca176156a12eb362fb1d854074b6", - "sha256": "1aj749afw6nvq20wfmicwly9glv4mb4ga5dyiy92h6srkkf39y1a" + "commit": "6286b76a69f11a72927c96a928d4493cab2237ce", + "sha256": "17zj6af4y22r703g2z6jw7pk2jn56iv5ai25q2y3z8icsnx0dmzv" }, "stable": { "version": [ 0, - 35, - -1, - 0 + 35 ], - "commit": "6a9f66ef324aa286d4fb8721a10837784e87ee98", - "sha256": "1s84gxiiicwrjijjdvz5vkgww3zay8m6xr0gxig749kd1dx9x6w6" + "commit": "7b5921877e748338359a25dae578771f768183af", + "sha256": "1jkninm2ynavacmz835s0v5iy10fw7b3v6hrnhvk1yr7zyiwhy88" } }, { @@ -74875,15 +74899,15 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20220119, - 1655 + 20220214, + 1526 ], "deps": [ "dash", "s" ], - "commit": "d57dc535cb19c42c969fef7184451918c91864bc", - "sha256": "0s2dx8xbyyscbx1swsl3j9drvlyf1mgk5vq3kfia7d2q8hg5z6sc" + "commit": "cfec608e1b95bc834e801bf285b0ff5451ccdf33", + "sha256": "1k05i8xa7c6nzgv0k4kngjnsgcpllvnwj76nl15an4k2jphcd17g" }, "stable": { "version": [ @@ -75052,26 +75076,6 @@ } }, { - "ename": "ob-ammonite", - "commit": "508358506a6994baf120be2acba86762f5727c6c", - "sha256": "0wr7p3sfn9m8vz87lzas943zcm8vkzgfki9pbs3rh3fxvdc197lb", - "fetcher": "github", - "repo": "zwild/ob-ammonite", - "unstable": { - "version": [ - 20190813, - 59 - ], - "deps": [ - "ammonite-term-repl", - "s", - "xterm-color" - ], - "commit": "39937dff395e70aff76a4224fa49cf2ec6c57cca", - "sha256": "0aibvrhwj2swv9ixl6hx4b2yicbpi095mvs0fib7i1nhlg0zciqd" - } - }, - { "ename": "ob-applescript", "commit": "23b075774be913539c3f057dcb7f24fbc05c37a4", "sha256": "1gk8cgscj9wbl5k8ahh1a61p271xpk5vk2w64a8y3njnwrwxm9jc", @@ -75777,20 +75781,20 @@ }, { "ename": "ob-php", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "0n6m6rpd0rsk6idhxs9qf5pb6p9ch2immczj5br7h5xf1bc7x2fp", - "fetcher": "github", - "repo": "stardiviner/ob-php", + "commit": "efb4e6d8540e6ca38c3aa0997116f5995ba1ea83", + "sha256": "09j53drzi2pkfzpjasmpfijsdlirh919vkg9yv9nhls2x3vgmrjb", + "fetcher": "git", + "url": "https://repo.or.cz/ob-php.git", "unstable": { "version": [ - 20211229, - 744 + 20220210, + 1406 ], "deps": [ "org" ], - "commit": "cff022a2aaaf1785e1937e232c31670d748b8c6e", - "sha256": "1g53j5wy7m3mkfbyk5m5rz49sacmx64j1xl5535fdc06cl2kcxjm" + "commit": "e9d46541ca1b522ddf423dd8ec5b5d2f00b0b5ed", + "sha256": "1828h5cvl1cdinx45dn3xfqw49p1ivm633h6kb73mpi1mkh0ywn8" } }, { @@ -75819,20 +75823,20 @@ }, { "ename": "ob-redis", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm", - "fetcher": "github", - "repo": "stardiviner/ob-redis", + "commit": "baba2cef36a0e392b4df720d257642bcac67e724", + "sha256": "138q9405v5ihp9d24x4jkrmzrfhza2hjr31xhz7nfc2b63vh6mkg", + "fetcher": "git", + "url": "https://repo.or.cz/ob-redis.git", "unstable": { "version": [ - 20210527, - 1336 + 20220210, + 1407 ], "deps": [ "org" ], - "commit": "ad31bf482a081b9c595a02ee6053c1426e3d8faf", - "sha256": "1w8wbiwzi8b3gm376yyynvc833skkvgylmrn803pnqsa1ij77jni" + "commit": "937099d74f2e8cb68e4166c141ff742a278c4dec", + "sha256": "0r5ciwdxnsw5hilx6s65mg649zzrysydfd28c1llhjwhjqcdhxrg" } }, { @@ -75919,21 +75923,21 @@ }, { "ename": "ob-smiles", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "0d07ph6mlbcwmw0rd18yfd35bx9w3f5mb3nifczjg7xwlm8gd7jb", - "fetcher": "github", - "repo": "stardiviner/ob-smiles", + "commit": "b3335e721482d50f474dd7cb1650788036162145", + "sha256": "0zbs2camiqcc9mkpcw41mxdrsl2b551si1yiqpnhv3smvc2ppki6", + "fetcher": "git", + "url": "https://repo.or.cz/ob-smiles.git", "unstable": { "version": [ - 20210527, - 1401 + 20220210, + 1412 ], "deps": [ "org", "smiles-mode" ], - "commit": "9f1fed213eb194924ab7d12b9d6e1074578a791c", - "sha256": "1x0rq9l9j3khp47q2j9bnyhhj2xrs4zggw9p8rmmai165drh1i9r" + "commit": "5a5462d25b24ef30960740202c3952c55278fb1d", + "sha256": "07qcydf2w5xspl6v9qhzyi8yvn8qagf926ybm38qjxxdfza0vjk9" } }, { @@ -75967,21 +75971,21 @@ }, { "ename": "ob-spice", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2", - "fetcher": "github", - "repo": "stardiviner/ob-spice", + "commit": "79b2eab8f2fc328df6c24661f35b246e46e6e5ec", + "sha256": "0sw5ffwbjlf2s0dbk883ljddh266p6crgvaf5ym8p5y0asijvp3d", + "fetcher": "git", + "url": "https://repo.or.cz/ob-spice.git", "unstable": { "version": [ - 20210527, - 1355 + 20220210, + 1415 ], "deps": [ "org", "spice-mode" ], - "commit": "3c77144ecb059411441730bb47f6d5892b62d13d", - "sha256": "00cnym62hp0masikr3ndk2a0mpafjw0cjx0xavcq486w2xi7r8rm" + "commit": "6dc2c6b9391ea8dd8123224f6c282b673b89dc94", + "sha256": "15lnmqzpgaz8n6zh0x9dm6hynl7rf1pcyf5m3fk7bbinqbxclljn" }, "stable": { "version": [ @@ -76294,8 +76298,8 @@ 20210923, 1348 ], - "commit": "fb005d5abc34bad8b7c39b9da04a16d997932a0d", - "sha256": "18ay9jrmc6ldywzrjac2gcjqczbsny7a4r2vf8kxaz8camgh7081" + "commit": "88b09cea663b20f9141fe52ce3e47c7289dc27cd", + "sha256": "01ziikn7lr41040pdb3zwvhhvpi2ybfh3z40yxq4zd1ahafk7z3y" }, "stable": { "version": [ @@ -77235,11 +77239,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20220113, - 137 + 20220212, + 356 ], - "commit": "ce462a63e32dd32bceea041f656bb79da953d62f", - "sha256": "1phqqhddsialm5ls0ab6jr4hwwj0isyks2l9pi1w1k9blkyqx994" + "commit": "7ddf5dfe9e982ee1510ceec36eeb4d8bb802ea73", + "sha256": "0jl9zcpxlz89fzvagvwz73y2qxq0vbmzk7rmqcz37f8r75fz63aw" }, "stable": { "version": [ @@ -77431,14 +77435,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20220122, - 1913 + 20220211, + 727 ], "deps": [ "org" ], - "commit": "303fcc8d5d85a4ebff2798dab50b2ccc0255ea5f", - "sha256": "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6" + "commit": "ffbd742267ff81ba8433177fac5d7fe22b6d68a9", + "sha256": "0h1689mzkcgnrnpjwlh3a9ks9vb0a8sj60nlyn9x2nkcalg6vsw4" }, "stable": { "version": [ @@ -78270,14 +78274,14 @@ "repo": "eschulte/org-ehtml", "unstable": { "version": [ - 20220110, - 1917 + 20220216, + 2054 ], "deps": [ "web-server" ], - "commit": "4db3756249b069310dabc0db43c7d9bbe55fb233", - "sha256": "05r4p1mxwy0a4xiyza3h2a7dy1w2px866pmvcg245xcsq77ikyz4" + "commit": "419932d6dbce193b0d90b1ccf9bf643169d21f52", + "sha256": "09cq6i2yzlpzmj5xcym6s8fji86kqcv7jy7r8d9p64fx74khh6jp" } }, { @@ -78565,8 +78569,8 @@ "repo": "Trevoke/org-gtd.el", "unstable": { "version": [ - 20220112, - 437 + 20220213, + 41 ], "deps": [ "f", @@ -78575,8 +78579,8 @@ "org-edna", "transient" ], - "commit": "835b316c7273e234383d1876d43ebc90a45ace59", - "sha256": "1wwx35smvnxdh3fq7077s98cmphfmwzcr1bcxawnnnh7dd9yxnrn" + "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc", + "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" }, "stable": { "version": [ @@ -78842,6 +78846,40 @@ } }, { + "ename": "org-journal-tags", + "commit": "11deda6e0bb96bf2e4542f18a40c16b874a512b9", + "sha256": "1j5zsm4lgqh3as0h74d759nldcb737lpwhw5dl77996y0ani5byf", + "fetcher": "github", + "repo": "SqrtMinusOne/org-journal-tags", + "unstable": { + "version": [ + 20220216, + 801 + ], + "deps": [ + "magit-section", + "org-journal", + "transient" + ], + "commit": "f8ad372c5839eeb882d2bd256ddd740e900aad95", + "sha256": "0ky4am88azrnhync6zr3ilq9lf5hknymm6m0cg4iphklx0694v6m" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "magit-section", + "org-journal", + "transient" + ], + "commit": "16e7ad11ca3ff3085f3098f492c5cfb3f6ded253", + "sha256": "12l0r1ayi7qwczaaa9590rqfmib8rj0f287c0s7gphmvyds078j7" + } + }, + { "ename": "org-kanban", "commit": "a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1", "sha256": "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41", @@ -78877,21 +78915,21 @@ }, { "ename": "org-kindle", - "commit": "29d08205620d51d4d76e3a4a6124884b5a6b9db7", - "sha256": "17sxvyh3z5pn2353iz2v6xjxp98yxwd4n7wkqsa9nwihsw5mmrrw", - "fetcher": "github", - "repo": "stardiviner/org-kindle", + "commit": "f5a3cc21b619d420c84161c82fac70f1b37cdda3", + "sha256": "18bp1p8hyzfp7vp5yz374sg5487i0a752b7cnr40avnq44j48d5y", + "fetcher": "git", + "url": "https://repo.or.cz/org-kindle.git", "unstable": { "version": [ - 20210930, - 1008 + 20220210, + 1408 ], "deps": [ "cl-lib", "seq" ], - "commit": "fdba34a47b670226f46ad7b3a4db4edc7f7907e7", - "sha256": "17klypc5fk6v9ccnyixak9ixyvsfzv3ivm7j8aiv9dk3acjf4yrd" + "commit": "fadcfd62e254d0c45e87d63128a82a08ae21869a", + "sha256": "0f61xy0hv3pjbhx9wmhpbi43nis90rsx1ljw9kirp99h64gg0jgd" } }, { @@ -78917,20 +78955,20 @@ }, { "ename": "org-link-beautify", - "commit": "ee5e68e4aeea824af0abef8b6552852a8436b178", - "sha256": "0s0hrq3pr3c7mdmnl69spn7k8905y3j75wkzncnq8dsia9s5q7xi", - "fetcher": "github", - "repo": "stardiviner/org-link-beautify", + "commit": "acd9bcc86c90e507fcd76f16e7ab57d64114f8b4", + "sha256": "1k1rczs3w3cxh9fryd1qr1dnr5v2hhxad1vcyjrqvyqpbm1dqnlh", + "fetcher": "git", + "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20211229, - 241 + 20220210, + 1409 ], "deps": [ "all-the-icons" ], - "commit": "c755af07a9ca0c75e99ba06412d29829a7dfccc6", - "sha256": "1m0l864rw27myrdyby3706f8ir4znibkjyprpi83i5b04hkbyfbx" + "commit": "e8be9d886b5a9467244ed906ebb48089d9406aa2", + "sha256": "0rivgwi1570ybzz136q02kijv6cjbqx8ncwm71kas0gvcp6i73py" } }, { @@ -80049,8 +80087,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220202, - 1733 + 20220212, + 1552 ], "deps": [ "avy", @@ -80060,11 +80098,12 @@ "f", "htmlize", "hydra", + "org", "parsebib", "s" ], - "commit": "9db9afb50407cdb1a8ec7c28bea69d0b6208fbdb", - "sha256": "1qs8c1sdz53pr2p53lqd1kx1747r4i2h9ynwi6dq6xab148zmdjg" + "commit": "b7d43f4c66baeea7cf9a1d3af8a3cc874a6abcea", + "sha256": "1hkqaq8ksda60bsp7qlpvpz66syms0qxs5ig693q3py372p6g9pp" }, "stable": { "version": [ @@ -80140,28 +80179,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220119, - 1444 + 20220214, + 1344 ], "deps": [ "dash", "org" ], - "commit": "341e829a730dd9eb1c14e2588fecb3ad7361f989", - "sha256": "0cj5ijf4bndx8n0ziwjp4q8wj779xhm12k0m0ld9hy21vn22z8l1" + "commit": "38724365176f50b7a94ad13c1215ca4755e16a28", + "sha256": "11zl5a350cg99aja5xmn48fgziqhi5ivdra61rk8yh4x8bmhxmc9" }, "stable": { "version": [ 0, 3, - 6 + 7 ], "deps": [ "dash", "org" ], - "commit": "4162756a7f0fb6f4734527ad5d6b879c3523ff70", - "sha256": "1jrbz367m3ss62kl9bq86piim9czvi8nky5g8iwb0hs3m9h9j3m7" + "commit": "0926af467579d801fa46c108cb4e55325328aebc", + "sha256": "12378ny4q5bixpaz6a93nvng906ys63g7npk3iw8j5mmw83yknd7" } }, { @@ -80211,8 +80250,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220131, - 654 + 20220208, + 1712 ], "deps": [ "dash", @@ -80221,8 +80260,8 @@ "magit-section", "org" ], - "commit": "eed1df90f571b19cae1581e7f5d938892b00c24d", - "sha256": "1pd887c4g9rykfz4sf7n6845b9md1sh64bychjbbwbj63375xvsm" + "commit": "b163c900b8ec2e3637bc251d9b90421efc771c02", + "sha256": "0ifvysgmdcn6gjmqm9cdb6rkl5bbg3db6pgj9gbzz734bvx3648d" }, "stable": { "version": [ @@ -80250,15 +80289,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20220117, - 801 + 20220213, + 1609 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "3ac2445f431bc39aa0ca5abfc80e28c0c06f0738", - "sha256": "07qiis3c7ypfvy6v6b6wsj993yp41cw8yi66gc0ssmg053vymz5p" + "commit": "714b519f000697983eee291f7a28d595ef731d99", + "sha256": "0sl9dy63g6isjj5kmcc3lijjlsjwdp1fb11zri454lvnlmwa4w8i" }, "stable": { "version": [ @@ -80384,10 +80423,10 @@ }, { "ename": "org-seek", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "04ay4abm03kn15cn45ldrzh2rw6gr6ia3qrj7hn5crd75ppwvln7", - "fetcher": "github", - "repo": "stardiviner/org-seek.el", + "commit": "7b9ce2952ee260d769d247ab20f7c7909042a812", + "sha256": "1nck8j65zchaqxq4vkq1flaw04jwv554cfnha2gmx3c9j47af3bi", + "fetcher": "git", + "url": "https://repo.or.cz/org-seek.el.git", "unstable": { "version": [ 20161217, @@ -80838,25 +80877,21 @@ }, { "ename": "org-tag-beautify", - "commit": "faa48723cbc4486c2d8262d00aa9967bfad81738", - "sha256": "1dn164z53c38bfzx8m22dynfx2wlw8cgcm63q6kvz5xsxqqwwsmp", - "fetcher": "github", - "repo": "stardiviner/org-tag-beautify", + "commit": "e06ae4c7cd46c2aa88782726e3637842f23932ca", + "sha256": "1rhmg2ff7sk1drzgfzibadin2kd1hlwmxy2d71rcy9ibmzhk8x0f", + "fetcher": "git", + "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220111, - 826 + 20220212, + 1727 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "98f419d81fb71d39c097c1a58f14923e9c705ba0", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/stardiviner/org-tag-beautify/archive/98f419d81fb71d39c097c1a58f14923e9c705ba0.tar.gz': HTTP error 404 ('')\n\n response body:\n\n Not Found\n" - ] + "commit": "10286cce91a1675c681c482a4f2d99ce5dd220e6", + "sha256": "1d9z3kczbs6jp02c2h2m36dixw7g5zy6h8xai9w1zhkzirqx6dmh" } }, { @@ -81653,8 +81688,8 @@ "ht", "s" ], - "commit": "8d90885d5a0cb5ad57b5202e2046bd3a0f3ce1f4", - "sha256": "1rp4dqm1qr6ndhrs7b06jhsy2ch8n9a82yma7abaz9hjdx6a6gz3" + "commit": "a9189e2688f774c8c3b9e2366d94b137fbf3d271", + "sha256": "1454wv4xska8lrsdl88s59zr5zi2wil8ip727wr5wp94n2jhq7j7" }, "stable": { "version": [ @@ -81712,28 +81747,28 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20220107, - 1206 + 20220211, + 25 ], "deps": [ "magit", "org" ], - "commit": "66367d6bfc5e00726fb74f7cd20c32175ab8521b", - "sha256": "0lc2lk9c7b92c1cna2pyb88x9fa4bydcqkp4zcn0khpdv54fmszq" + "commit": "42b7f682b3e4e487ff209a44221a729921241133", + "sha256": "0vns8fbavfgyazlhbvwgc17w3v5iaf7ng92na2sl4lvc33rk941j" }, "stable": { "version": [ 1, - 7, - 2 + 8, + 0 ], "deps": [ "magit", "org" ], - "commit": "66367d6bfc5e00726fb74f7cd20c32175ab8521b", - "sha256": "0lc2lk9c7b92c1cna2pyb88x9fa4bydcqkp4zcn0khpdv54fmszq" + "commit": "0b49d7a869b8fef3537a75df4db693ca3e3935a3", + "sha256": "1hjfsj12qx06m8ji4l2sg502a55sabar4h6c2b2i9nmp1xf5889l" } }, { @@ -81744,8 +81779,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20210615, - 1516 + 20220211, + 26 ], "deps": [ "forge", @@ -81753,14 +81788,14 @@ "org", "orgit" ], - "commit": "365b75609a9454dccf5681eb6075ca53bd32af85", - "sha256": "1y7rywlqhsvkism9dmzlb3sijd8isp6qqhgba79aqgk9wz593rkv" + "commit": "36e57a0359992e02312f453b8086512e77beb150", + "sha256": "0mrq7mrgvj5r0bmxa4365xycfwp6m42mdqi5l5pljr5xz6k3rnc4" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "forge", @@ -81768,8 +81803,8 @@ "org", "orgit" ], - "commit": "365b75609a9454dccf5681eb6075ca53bd32af85", - "sha256": "1y7rywlqhsvkism9dmzlb3sijd8isp6qqhgba79aqgk9wz593rkv" + "commit": "e11df20bfe500220bf48423fcc1529cd3ccb6bf2", + "sha256": "1s87svins72m9cj89xxpmkws85670djkx57pd90zqcs20qb788f2" } }, { @@ -82820,14 +82855,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220204, - 1606 + 20220217, + 1816 ], "deps": [ "org" ], - "commit": "e52b7e50db825027b5e770c433793b3284ce4367", - "sha256": "0gfzkzlfl5119nxlrc8dm1y6gqppvqc21ljy68nz2npp6fcswkb7" + "commit": "f7838b766d200efbcbe06dfd4dfc529fbe5a689f", + "sha256": "1fbgf7zdmx22a1639yixbgajcs61rymlkwi3hbdwp3dx5li6k78r" }, "stable": { "version": [ @@ -83179,14 +83214,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20220205, - 1046 + 20220216, + 1506 ], "deps": [ "org" ], - "commit": "2f1509cc145c3604a0b17a306603f231d067ea16", - "sha256": "06p6r86way5cxvp6z65j5hdmv09frk69qly2c02zg64xxymc8n55" + "commit": "fed9be1f4c317c08ca2372bd45cb9d1bcf8a3f7e", + "sha256": "1vmkj60lmah79r62k2gigkblilkw21ciyj324iwvk6hqmaahw6km" } }, { @@ -83203,8 +83238,8 @@ "deps": [ "org" ], - "commit": "c9c1be3ff0ac2464f0d514939887f34f9b4198b2", - "sha256": "005qrg580328l4h67i0mm2r540dknmn0bnqyy2vdpk75qc2rirca" + "commit": "b8722a0197c3ad935c80007b2f413bb005f255b2", + "sha256": "0jj00i7ji59qrw536wz13xzixgskawv032l5p4zwf7brqd573zva" } }, { @@ -83616,14 +83651,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220115, - 2346 + 20220210, + 1334 ], "deps": [ "cl-lib" ], - "commit": "415552b9548fb4fd929a62ec09563e94dfbec5c9", - "sha256": "0y5b6y0a39x82qrg7bjk1gs5xn0qj68gywz2wkxkh5g4m90kylsg" + "commit": "032e9bd086029b2fdff09c3c2e606e29682e1fb1", + "sha256": "0jjb1gl6qqkrvf4v03fp9sv69xc6qh3lc65blms46zkx64995c6r" }, "stable": { "version": [ @@ -83660,27 +83695,27 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20211122, - 1152 + 20220213, + 1457 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "b5f5554ec38ec2a4d5ef49a0ad9f57f6825d9af9", - "sha256": "1ic1a0j8gj930ssc623vi55jflyfw52gb9zkf3yg51w43cw4isfn" + "commit": "873025ffc85b5e40ec361e953218fa09c6ebd621", + "sha256": "10sinzpnk41xvdb1va9vv6nnwyyryvmyrvxxwq6xska9ab580g6y" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", - "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" + "commit": "7a83a138e6546f4c4a9988ba6dddc5339fbe7272", + "sha256": "0srqcrhbdmd39jdsvh8k3nbrkqrl4nlic59dp5bal5vj495j7126" } }, { @@ -83697,19 +83732,19 @@ "deps": [ "package-lint" ], - "commit": "b5f5554ec38ec2a4d5ef49a0ad9f57f6825d9af9", - "sha256": "1ic1a0j8gj930ssc623vi55jflyfw52gb9zkf3yg51w43cw4isfn" + "commit": "873025ffc85b5e40ec361e953218fa09c6ebd621", + "sha256": "10sinzpnk41xvdb1va9vv6nnwyyryvmyrvxxwq6xska9ab580g6y" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "package-lint" ], - "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", - "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" + "commit": "7a83a138e6546f4c4a9988ba6dddc5339fbe7272", + "sha256": "0srqcrhbdmd39jdsvh8k3nbrkqrl4nlic59dp5bal5vj495j7126" } }, { @@ -83927,6 +83962,50 @@ } }, { + "ename": "paimon", + "commit": "bb634388ab592171fbe2b9066d52e1f0f31ebbf7", + "sha256": "1rqhi45m4pz1vjm6q9h91p5z00751q9dkrd845rl6cpdr2nsr270", + "fetcher": "github", + "repo": "r0man/paimon.el", + "unstable": { + "version": [ + 20220214, + 2145 + ], + "deps": [ + "aio", + "closql", + "emacsql", + "emacsql-sqlite", + "f", + "ht", + "request", + "transient" + ], + "commit": "826a11d449a6cc8453093d79a8c031f43f753139", + "sha256": "183lvy7i71ilsp98hqifmdhagf2a57x7lbhw5qq0nzk4jjaam2yp" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "aio", + "closql", + "emacsql", + "emacsql-sqlite", + "f", + "ht", + "request", + "transient" + ], + "commit": "3ea3c862497573ea426d9f0cbfdc4f2d34e626b8", + "sha256": "00jff4q36wnpgi0qs4316g17zadqiinw5kr0z5gbdr6l21f49yzh" + } + }, + { "ename": "pair-tree", "commit": "ca9422233229d8703641d87d9250ad3f38c11fd7", "sha256": "0rv6yp2vzcvnjkrlihm2a2a62879rcqwnzw7ph535drvwfl0inws", @@ -84334,10 +84413,10 @@ "version": [ 1, 0, - 7 + 8 ], - "commit": "6790c7fdec490a69e7d460c0bea36ad343776f9b", - "sha256": "1zyrrrr8rmksr3rfsv96psk1z15wbbx1bvcfp3hf5ciyc2n79000" + "commit": "4f6ad761a7d508bb6b3e6539559929d2706caa10", + "sha256": "13d8psgd2j3vqmgwwf62gwyq7h6qlj8rrs31fxwjqmzzdblwqy1y" } }, { @@ -84434,14 +84513,14 @@ "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20210306, - 821 + 20220214, + 1531 ], "deps": [ "s" ], - "commit": "b9b77285fdef7936baea5447b37651f67c51f041", - "sha256": "1xg829a0wjrjh64lzccr65j5sr1zh9wzvbid65f0c733nyizcy0f" + "commit": "5c163ffc63d52631c1494c260b50d63c04c37a97", + "sha256": "0xhbr59sn0220ymqlxjm45zzphlbmig7jhbz8z8kwa9paw2bqnz1" }, "stable": { "version": [ @@ -84517,20 +84596,20 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20211013, - 453 + 20220207, + 1351 ], - "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", - "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" + "commit": "90595049634549e6d8872f719b13e9555897d17b", + "sha256": "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22" }, "stable": { "version": [ 1, - 0, - 6 + 1, + 0 ], - "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", - "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" + "commit": "90595049634549e6d8872f719b13e9555897d17b", + "sha256": "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22" } }, { @@ -84541,28 +84620,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20211013, - 452 + 20220207, + 1352 ], "deps": [ "map", "parseclj" ], - "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", - "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" + "commit": "ea7b5281ec80aca0bd1cc93a348aebb302497339", + "sha256": "01j8nrkcm2s0ps277b5zb4pys29lk4cq49rlcqpj19gbfpkwcvdv" }, "stable": { "version": [ 1, - 0, - 6 + 1, + 0 ], "deps": [ "map", "parseclj" ], - "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", - "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" + "commit": "ea7b5281ec80aca0bd1cc93a348aebb302497339", + "sha256": "01j8nrkcm2s0ps277b5zb4pys29lk4cq49rlcqpj19gbfpkwcvdv" } }, { @@ -85223,16 +85302,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220125, - 1708 + 20220214, + 344 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "72ef774320d9eacd4d79b5016e9e989ab176afba", - "sha256": "15da6k648r0ir515bpyqf88wg7f8rxqz60zk88c4277ywa61z1zq" + "commit": "326552eef71ae6d53e215c46be5bf532575b7abb", + "sha256": "1gvaw0684svv9v294f8zgmqa2ym2wa3gymn9y9v2slhamf51r4vk" }, "stable": { "version": [ @@ -85539,11 +85618,11 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20201128, - 2015 + 20220206, + 1742 ], - "commit": "298df111f081b5925f0aa0126a1b8d334117e0a2", - "sha256": "0r2j8zs6hwpfvwd6av35izlyd3kplnvc4c941vjjq7sm6j95q6k8" + "commit": "7a594a3d8f1c4ba9234dcd831a589e87f3f4ae86", + "sha256": "0ckcnqg2fn4m5zp06jlw5cj81clizrm8cxjiwz5rd4d9m9lwdrgd" }, "stable": { "version": [ @@ -85672,8 +85751,8 @@ "exwm", "perspective" ], - "commit": "541946caa0359c14c90da58196bec7baed122a46", - "sha256": "0mcrvv9mhg0cfkcp64hkdd9wh9j04hw0d9dz1ghafa4h6hf3azfl" + "commit": "8afdbf894a888854ce9dfbe0ad2a5dc41f75ecb8", + "sha256": "191xm4l5id480bcf2nlliacrn2a9qrxs18pfkd4sk4bn9xxz74dx" }, "stable": { "version": [ @@ -87997,16 +88076,16 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20211219, - 728 + 20220208, + 1648 ], "deps": [ "alert", "seq", "transient" ], - "commit": "596eed778fa30e7b33910f015543eda13abd1888", - "sha256": "0arhl9x9d4d1s4x5qcf1kn9hkwgsrs6sjn0rky10pgja7gqh6214" + "commit": "6dc3b5f913908bca8db85e4b2161a1de76c60a58", + "sha256": "1rxlz0l58g2vvlhf0y3s7abfph3nplvm7q4vrymgj1s251kjxmmi" }, "stable": { "version": [ @@ -88182,10 +88261,10 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20220126, - 844 + 20220216, + 1906 ], - "commit": "a50edecacf2939fc50ad2bc48f1015486a09f885", + "commit": "7b02960025fb89384f78ba12ad03cae0ddf1e411", "sha256": "0p12zz2lhm10yikhnq52z66xwy64gcvig42bzajv5q7x09qvvna7" }, "stable": { @@ -88208,8 +88287,8 @@ 20211231, 1823 ], - "commit": "ec3d3169a4d60b0374198580e31b6c59f51ab08a", - "sha256": "12ymj71fsps0q4rk2hcj80nf93i5iq93sg0fw6dkn8swdvmhp1lz" + "commit": "37a04117ac83b3ed24a2cba894443a32795c2f1a", + "sha256": "0vyg6va1wzl0h9sd85a2zy922w6q8za0fq6v07hcq956lhh6wi6y" }, "stable": { "version": [ @@ -88659,14 +88738,11 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200812, - 844 - ], - "deps": [ - "leaf" + 20220211, + 1529 ], - "commit": "86dad69c3a7dae770f6b99285647dff2aad81930", - "sha256": "01c82h5j7yggsbhbrlbcwl562mpd79c0i878129r4ivvhka3nha3" + "commit": "d5d854c3006dfd268e62c7f91c2aad6f86a505b5", + "sha256": "1brx3fz2amsrir6qzxwj4w8v0hhib5zcnyc5l00y5k7mrnaklh86" }, "stable": { "version": [ @@ -88686,8 +88762,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20211219, - 224 + 20220213, + 1524 ], "deps": [ "ghub", @@ -88695,8 +88771,8 @@ "magit-section", "markdown-mode" ], - "commit": "bae2d8aff61cbe05da6f3f41e6cf854ece4a41f0", - "sha256": "1p9vbhsal667cjh36wmww95c6c3srp3hqi2yfq9srmplma7ffc5n" + "commit": "5c44b06e314a43a30de8323cae75b1e87594f991", + "sha256": "1f2lrwbb85i31vcjin9b0gi89m2zn9w2npwi1sqp0bjd0ndimwp5" } }, { @@ -88972,8 +89048,8 @@ 20220124, 16 ], - "commit": "ea3daaf6a526a1ad4ae385066c99fd9643da7f94", - "sha256": "0irnp6v1i930s8fh1iqmbs4amyia9qdnggq7n5hxfi4ni0p66yqq" + "commit": "4153fed2c83faad90803f57a3c9364609eb7b3eb", + "sha256": "0s3mms1lvid47g77pp6681zrnvx1v0s08xyk3272nja5w16fizyh" } }, { @@ -89281,8 +89357,8 @@ 20210715, 1213 ], - "commit": "8c76f26c667a9748835a86ded0c7fc8f1c558b4c", - "sha256": "05fxlia6bqf9jcx963fa0kn06va256dj7hmdli04vlp8h748sljj" + "commit": "4db55e41560daa2a8f5d21a99fde65d75abdc4b1", + "sha256": "0c3dlip7k1dambqdnqrbr93a8fbg7q93g1vvkbq99fzvvyp867r7" }, "stable": { "version": [ @@ -89438,11 +89514,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220203, - 1326 + 20220211, + 932 ], - "commit": "df3d73e1f0ff625a09196ff3ba6f4be82a53fb3b", - "sha256": "1iy5i8mdvzgfirsv5k59v8i45fcm6cimlfl546hgzb9ygl6l15vr" + "commit": "0243ad7dc96072126fc6c23e48184a0419bab028", + "sha256": "0ryvhffvf8dv0x6g1ianisw7ff8zxvcdz5x043fld33mykfp716h" }, "stable": { "version": [ @@ -89844,11 +89920,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20211217, - 1753 + 20220209, + 1726 ], - "commit": "a61a1d8e5ffa610b794535995d58adf18e9ec47b", - "sha256": "1c6216yz2wb9c5yn5rq6jr9pwxb44vhvgnsi0wsh0rcccm24mdp8" + "commit": "df19c7ba0eadf9f47e9dd757a7d0350fc967da99", + "sha256": "0xh9x6b4fmbnvs8awdkg74msabchqf7lx9w3z14qwfzn4jjzqwlb" } }, { @@ -89943,8 +90019,8 @@ 20211013, 1726 ], - "commit": "3ea30d80847cd9561db570ae7f673afc15523545", - "sha256": "1yh2ayksfc3x6kavix8nk4y51gpajjrrf5cd9b18rkw2rn5xnb55" + "commit": "2f7ee91e326d95915b63918f968244cfefbc022a", + "sha256": "1y90vjdnz7174xlyp9rqc3jhj4gq0l40nzfm3nih9chnmz6ifgx6" }, "stable": { "version": [ @@ -89987,17 +90063,17 @@ }, { "ename": "proxy-mode", - "commit": "25224d3bcdb625314e931d5acc22f60c7192a84b", - "sha256": "0ldjfmxn8k8bzvdrlsfpijsmgn754aza54by5d59k7a1xn6d37mp", - "fetcher": "github", - "repo": "stardiviner/proxy-mode", + "commit": "6f61331b1d9ca910f01bded48023bea5f8baeb25", + "sha256": "14g6r3vvv56h9b84cc1lcri2xavifc6n0gq1qyi9k9qjls1mnijl", + "fetcher": "git", + "url": "https://repo.or.cz/proxy-mode.git", "unstable": { "version": [ - 20201214, - 727 + 20220210, + 1410 ], - "commit": "dbf163413e9e404c652cc0ea7185c623016a38e1", - "sha256": "1c5m0gb4qms28vahvi5kam1qf1hnpd9v1f6cwxiqdj8aka9ll8sd" + "commit": "620e48c6afaf760d0ee9f5bdf583fd91cd9d0ec6", + "sha256": "0xlla1ymqgpb15bycxl4xijlgcwir01krcvsyhxl4anmrpj2c0hm" } }, { @@ -91034,8 +91110,8 @@ 20210411, 1931 ], - "commit": "d7013f6799d28a69dbbf3329da7867a8afacce82", - "sha256": "19w4i7yymj204v147z4ggqwb0ghiz6zsh1ykda3x3rc32d5aap3h" + "commit": "67055f4221324a5aba057c0e7e3a5ffdc41a7e35", + "sha256": "03ggzjjiqx8q555vaif9c3wlzyn5bdql8pfwjiwcnxvgbxwz8l81" }, "stable": { "version": [ @@ -91382,11 +91458,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20211229, - 1002 + 20220216, + 1924 ], - "commit": "dcb376044d020dfe30f8e4273e61863b7d9615ce", - "sha256": "1638zl7aa2rf74d7rc396b5hda9fvlndapnivv3axc06mnf86rkk" + "commit": "3e28ca0310774c83026c927688610fa36fc4992a", + "sha256": "0606ypkwwr545ap09sc4x8c3pkal03xj70i354mv79gfy6n149xd" }, "stable": { "version": [ @@ -92025,11 +92101,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220204, - 2212 + 20220217, + 1940 ], - "commit": "cef5a55d2b766973db92f9d9ab2210c03fa8ba02", - "sha256": "0zzk0s4akx6ffsbhylgfflcypkkg36a3accxhmmdd11yn5rckv7f" + "commit": "a946f57c3af6238f94e4e750cffbc2324d7f4a38", + "sha256": "00mflc9i762pl13askadgn7nh60mfbf4r8wb4lfb0111q96x5nvi" } }, { @@ -92173,20 +92249,20 @@ }, { "ename": "rainbow-fart", - "commit": "cdcc8091357c42f5edbc1a13886253130f104242", - "sha256": "0zi1r8bgzd3g1dvginlp5nywyjk3lh495j6j3girgjqhsblnhfrx", - "fetcher": "github", - "repo": "stardiviner/emacs-rainbow-fart", + "commit": "c8de127d69c03addc9d93b712e2059f065a757f5", + "sha256": "0r9v9laaga02mzh1ch45a6y89bsmdr8433kz71fzrx6mam208i32", + "fetcher": "git", + "url": "https://repo.or.cz/emacs-rainbow-fart.git", "unstable": { "version": [ - 20211114, - 905 + 20220210, + 1359 ], "deps": [ "flycheck" ], - "commit": "aaaec8e20b3bde3a567baa501623c451f796a46a", - "sha256": "1mrq585wq4c23jv6fvphh03y4s8wjrh02dhd0l2369axl6bdslz7" + "commit": "4e5d3cca6cdc667e5da3300c04e1b3d1b00664a8", + "sha256": "06874ymiqpmx2isys0bf1fxw83xfzx64sxjq01xjzb3zv5ydy13w" } }, { @@ -92221,30 +92297,30 @@ "repo": "asok/rake", "unstable": { "version": [ - 20220131, - 808 + 20220211, + 827 ], "deps": [ "cl-lib", "dash", "f" ], - "commit": "759fb373b90dc4cf762a58217e81d8a3fecb5563", - "sha256": "0w677abkmrghphi2gwbxypyb59znyv331shmg4j8y5fcqf1whm14" + "commit": "452ea0caca33376487103c64177c295ed2960cca", + "sha256": "13wi9mkj1qhypii8zagxg0cly2pp8kvj3h76iij6yfizdhxq026r" }, "stable": { "version": [ 0, 4, - 1 + 3 ], "deps": [ "cl-lib", "dash", "f" ], - "commit": "e680f1a8f2591af7c80cad188340601b101b5ddc", - "sha256": "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n" + "commit": "452ea0caca33376487103c64177c295ed2960cca", + "sha256": "13wi9mkj1qhypii8zagxg0cly2pp8kvj3h76iij6yfizdhxq026r" } }, { @@ -93029,11 +93105,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20220109, - 1305 + 20220211, + 1223 ], - "commit": "18a2bdb3f6a5934cf39dbeea5899f10f55e753a9", - "sha256": "0qlcl0dp1ggydz0jcyxzph2vjj8f457jyb81c1a6ds5bvybv8m28" + "commit": "d073fa8d00411af58fced861b7236aaa23b0692d", + "sha256": "0qg81yasilwk15jpxm0177slh9byihni9kc217m44pn0fxgpnsmi" }, "stable": { "version": [ @@ -93219,11 +93295,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20220206, - 1140 + 20220211, + 548 ], - "commit": "2b38ca25e3392636fe936d3edad447970279a463", - "sha256": "0fqrhfk3jg4dyf4z8nx6sgpi9l5mxzld2w0icz81kr8vm9p92nmx" + "commit": "d0d380929460ff35534900e34ababad43d23c966", + "sha256": "178415wsvjvji4caz72mksrv4krr7aykh02cggnp41w66chm503y" } }, { @@ -94433,11 +94509,11 @@ "repo": "ideasman42/emacs-revert-buffer-all", "unstable": { "version": [ - 20211004, - 1321 + 20220211, + 548 ], - "commit": "947f2471acaf1b9d5162f8a886aed6a211dd8fca", - "sha256": "19nmz7nw8v2i395wzyva96y5sm5z6h01jh1fl6n9dpavq12s934a" + "commit": "0343c04a4408ff6cb3c8a9dff7d1ffee8256aa70", + "sha256": "16ws4j2fpnv96338z7vcibhscjrjmym910hsxc137lqrkavqhm19" } }, { @@ -94448,11 +94524,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20210516, - 503 + 20220215, + 842 ], - "commit": "4f64f0ce1fe3a59389a1462dc26d6ba89d44d51c", - "sha256": "05w3n8hv5wclgwy58wbnximkf7xi6anp8vpxh523dplzxd77b5q6" + "commit": "f08ef20d9ff4f03a00a8c24dae9ce416da0d9d1c", + "sha256": "0wyjh9ymj62rlvvhahcqy48xjw768x6pkvhrwp8sp8pyb64ghkj3" } }, { @@ -95655,16 +95731,17 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20220205, - 1840 + 20220208, + 1018 ], "deps": [ "dash", "f", - "run-command" + "run-command", + "s" ], - "commit": "93de193267da8be1d1f6a23faf3988797f597846", - "sha256": "1pz5d7dh6k7qbv5qq21g279il43zy5aipncbfh1kgnkq5ackk779" + "commit": "e2751673e19e55fa364bc917e150c72b8ccc3294", + "sha256": "178qs6k5z4s74xx4n6r4qadw4svarvm8sfdxm5z964166r8d3x1y" } }, { @@ -95675,11 +95752,11 @@ "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20211007, - 304 + 20220211, + 548 ], - "commit": "db66c1ca0f6a090f8c9ae17f80f99c878047778e", - "sha256": "1kfnk3pa3p50nfylhxhcngxa4n8ilqwna1k179w4abmnsm0r4xz8" + "commit": "3723346dc6d867bdc3fd86ca11c32efc43704d7c", + "sha256": "0082mv45a8ybfrrvw8jnc52rk2zw80i52gid1387q2hxsdil0csm" } }, { @@ -95776,10 +95853,10 @@ "version": [ 1, 0, - 3 + 4 ], - "commit": "b017f746503df27ccdca8ee6d2627529d64d76e1", - "sha256": "11fdxbv51anrjfdqqpgrqz2md9qkcn5y3524lzjippqi9i31lnjn" + "commit": "e35a1800fc0f9ed178539d6fb82ed885c1014fb5", + "sha256": "10972zw2h1dijx08j5h7aa4d717vhrmahzkslisy3dk2gd8y2v0q" } }, { @@ -95813,8 +95890,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220204, - 1613 + 20220217, + 1820 ], "deps": [ "dash", @@ -95828,13 +95905,13 @@ "spinner", "xterm-color" ], - "commit": "7261c78004317628d2fdaf425a4c1a1bdb687605", - "sha256": "0fzkpli0l8ir4wa4hibkhgia2gxc5pb56zr7mpfyd736j3016acl" + "commit": "6f7a6055cd5f21903ec1e405be096fafc03626ed", + "sha256": "070kw2lcj5lk1ps9azsamx1wz7zy9c7w51384pwanwc72fwbsaxb" }, "stable": { "version": [ 2, - 6 + 7 ], "deps": [ "dash", @@ -95848,8 +95925,8 @@ "spinner", "xterm-color" ], - "commit": "4aca1c28676fa53d5784b7aee3565f26d43751e9", - "sha256": "0lnymi6nxn5dafm8q0av07dcjwrqxd3gm4hj1pi26kw62aw0ws24" + "commit": "737b8ace93565a0435305fc46707307b2aad3888", + "sha256": "0l1gh6arxrbq927lbj229pwqk9ly6z97b581smh434r5bh5wk8j5" } }, { @@ -96338,8 +96415,8 @@ 20200830, 301 ], - "commit": "a83597a7e67a2aa05a0a8c0c9af0c70c61a263e2", - "sha256": "18nxc94gii1hq5m9p9am00mfc2yprhwdrd9d3hs84868lwv7rack" + "commit": "eb274ac9a18e2557946787fd84d231304f2b6419", + "sha256": "1fh9hdccs1qk8piar0fay42rdikacichjhanw80y521my727454v" } }, { @@ -96385,25 +96462,6 @@ } }, { - "ename": "scalariform", - "commit": "1912f795e5842be534160e3879bfb96f3440e163", - "sha256": "096y63j91910hqsy6qvz16c9lzyi7ni3r7h039z5zw2v97aggh9i", - "fetcher": "github", - "repo": "zwild/scalariform", - "unstable": { - "version": [ - 20190114, - 215 - ], - "deps": [ - "f", - "s" - ], - "commit": "478a15ccb4f825aba73262bccd3e61ce7017f64b", - "sha256": "1c76jnj35bkcq2rhdq6d57b7vf6rvn8rpzpx49ywkxz4cx36svv6" - } - }, - { "ename": "scf-mode", "commit": "376be7f8903dbea69643600ae14e934ee5e2a11b", "sha256": "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0", @@ -96710,11 +96768,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20211127, - 1220 + 20220211, + 548 ], - "commit": "97741be699f08952c79a630869f5772918b378aa", - "sha256": "01y34ghp02znckafq51cvzahlbqbnpxdwpdrcgg1insq3qv658wb" + "commit": "d93b69eed6947cabdfde53dfbcf4bd919cb1f154", + "sha256": "0r1c3b7w1mh7hpi7pi1szdac297w1ig0i1a9c1r7qs41id2bvw51" } }, { @@ -96725,11 +96783,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20220126, - 2331 + 20220211, + 548 ], - "commit": "1e9e09f0ccadf805e9bb4dbd1050944f82c5ed0f", - "sha256": "0n472jp8j1al7c4cf1k8l5my1hzln68ix5gl8vz8kpaxhlh0s8p0" + "commit": "99386fc01b3c7bc2e75458efca408a23220a5f87", + "sha256": "0b3d5bw635jjirkmym4w0y5x450zd88ic3k74jmmgf4fw0fl1q0z" } }, { @@ -96844,14 +96902,14 @@ }, { "ename": "sdcv", - "commit": "173e233b2dacaaf54d92f3bcc06e54d068520dd4", - "sha256": "1bj3b17sjd9fha686g6w191l4p8a1p8sb9br65xf54n6nd9bmv7a", - "fetcher": "github", - "repo": "stardiviner/sdcv.el", + "commit": "97663b3f4e6615f629571791f66d9bc3afeea7b7", + "sha256": "1y56jb5jy68ic1wwrwhqk2jwk49p90icbwrg80pxv1s6xigk2f02", + "fetcher": "git", + "url": "https://repo.or.cz/sdcv.el.git", "unstable": { "version": [ - 20190610, - 732 + 20220210, + 1412 ], "deps": [ "cl-lib", @@ -96859,8 +96917,8 @@ "pos-tip", "showtip" ], - "commit": "943ae3e90cc9a0a88a37cc710acd7424fd4defc4", - "sha256": "0i1ylvw7p46pkf3yyyzcdmdhsspzymnnnvx8s0i7vynngr5x0vzh" + "commit": "98e239c7380c63282845d5bc55ea6d605f5a33b8", + "sha256": "17jxnc8z2a5rdfrjxw6gfkijp06jkjpsvj0pyxrhmg94gimfprxa" } }, { @@ -96916,8 +96974,8 @@ "dash", "f" ], - "commit": "bdef718d17a09ba56b1bda7f6718588b4a33e06b", - "sha256": "0cd2lzb2z6cp3hlmwbmp98640q26875k3w5j0hqqg64rncxqx8yk" + "commit": "eea299701a4aa9500c4790c2a2e8c157f1d900db", + "sha256": "1ln4hpk759m7r9p0qc6fbz9s1hq2mnhmx1gz8iqab6zqbrnl2js0" }, "stable": { "version": [ @@ -97439,15 +97497,15 @@ "repo": "MaximeWack/seriestracker", "unstable": { "version": [ - 20210629, - 2303 + 20220212, + 304 ], "deps": [ "dash", "transient" ], - "commit": "a5ce1bfd06ed90bba9947a9045659d13f3362a96", - "sha256": "0gjwp0h9ip58da1p8q9s9pjfh0g6pav4gam9s51xnx8mv0vbgb68" + "commit": "4706db081bd214b272e0bcaabb66887e4b5b0968", + "sha256": "0ghnxli8xjlr5yb0c1jlax42dc4bjhz49x6mjm7m2jz94sa397ls" } }, { @@ -98332,8 +98390,8 @@ 20210715, 1227 ], - "commit": "c952c072e210c605b08aa5d2a917bfa3f92dfe8b", - "sha256": "13abir9kr4h63krnn206gnjfln895zzjidcaidrjc8zwnysaa8k3" + "commit": "b3e4eba2994c368d742b9593a2e618d7b02e60c1", + "sha256": "0zxww99hcvn5c17m6xnyycfjy2lwvlrfxzslhw0ifla1qzj7ipy8" }, "stable": { "version": [ @@ -98706,11 +98764,11 @@ "repo": "ideasman42/emacs-sidecar-locals", "unstable": { "version": [ - 20220104, - 217 + 20220211, + 548 ], - "commit": "c90ccd6a02538c7263f6499ca7bd4456ec06791e", - "sha256": "02nnvf4c78grdzcd62611qvlq93vspd09ffk4jvc047l2jb8nw6l" + "commit": "b69943575bfa7f13ee99c8b8871d3216ad24c85f", + "sha256": "0bfl4py2s3mxpzc60l9qmmdy079li0llzd6gsczwbmvfnrs1189q" } }, { @@ -98901,14 +98959,14 @@ "repo": "jorenvo/simple-mpc", "unstable": { "version": [ - 20220204, - 2207 + 20220216, + 102 ], "deps": [ "s" ], - "commit": "265ee01f6c7c6c44f103b740c37df14f4c1fdb16", - "sha256": "14z8sqs094xq1n3hynglh1bj38kmzwfd9h66nxp95wdxanzlzghz" + "commit": "57ee14ada8aec477ddde5e4f632c8d3d99a66535", + "sha256": "1gij7kjidi21p8sbywlj9734s5cq1h31h6mv71drcj3cna9n06pb" } }, { @@ -98919,14 +98977,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20210806, - 1022 + 20220207, + 2007 ], "deps": [ "cl-lib" ], - "commit": "7eec13672c2b6d0226d56de8b8b1e12a1f78aa57", - "sha256": "03mxy2f4i8pjmb1d9s6llaa4pmzrsigxaf1srfdwzc8ccaj1qi5n" + "commit": "a454901635dfe4142d8c4f0153e737ddc778d708", + "sha256": "0b0ix9h5in324bbyv9q9l9xrifpfhjs6zhr6r5cadd36iip40r6g" } }, { @@ -99063,6 +99121,21 @@ } }, { + "ename": "simplicity-theme", + "commit": "d90f310efac200b31d90b29261f74932ba06756c", + "sha256": "0f2ixpnil14509skicaf7rm5062d1w1429jsflack14niba41d1a", + "fetcher": "github", + "repo": "smallwat3r/emacs-simplicity-theme", + "unstable": { + "version": [ + 20220217, + 1928 + ], + "commit": "2a0aaf19cf1e99c50df0d2e6225a2d2931a203d2", + "sha256": "0xv1gf0a9i3ajxd6cprr7b62xvar6r6ia5qd4sjvr8pnaw3cav45" + } + }, + { "ename": "siri-shortcuts", "commit": "f3a67195c63059fbc2d2714b540505bb9cde49d1", "sha256": "04fnzv6sq5mbj5difddbchvp7sgz48qrhs5izhl5w1si5q2ds5ri", @@ -99360,15 +99433,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220204, - 1357 + 20220217, + 1145 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "2080537746ba808b9c1683a280e803e65f196a9c", - "sha256": "0shi2zazr44bnc1j985wvx2248gl2gp20v1kyb2mzsydw3w462vw" + "commit": "33d9f46a48809fab77fc0aef209196d99be4df0c", + "sha256": "0mxznpp521nlc2n49f05gwxcjcgq3ssmvsvsrzsr8abipdi5zkni" }, "stable": { "version": [ @@ -100271,17 +100344,17 @@ }, { "ename": "smiles-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0wf02aj9bhl2m861342f5jfkx3xws1ggcyszfp9jphlykw6r0v9k", - "fetcher": "github", - "repo": "stardiviner/smiles-mode", + "commit": "67901d48323deba9311b32100574972c7476ad7b", + "sha256": "1j3dpq5yw1g3cdalgrbnsw5429r64jiz4krh19zr1w86lh148pdr", + "fetcher": "git", + "url": "https://repo.or.cz/smiles-mode.git", "unstable": { "version": [ - 20160717, - 1120 + 20220210, + 1413 ], - "commit": "fbb381758adcb000a0c304be1b797f985f00e2de", - "sha256": "07lzr1p58v95a4n6zad8y0dpj7chbxlcmb6s144pvcxx8kjwd4dr" + "commit": "950a8b3224f8f069c82faeb0282d041f872d5550", + "sha256": "1pvbxmxhkmzhimvvzw2gmwhzkssgg8hs765vl0ly9jcdgqc46lgq" } }, { @@ -100610,15 +100683,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20220206, - 815 + 20220210, + 1654 ], "deps": [ "dash", "s" ], - "commit": "f629aa45bbfbbde99390e7d4791f14b649d79f35", - "sha256": "070nbk9a68ww1mrb4xpda59s3wlcxvz0x2krc0f1g546vj3drakx" + "commit": "5824a3c33ee51acc1d3cba36ef6892ebb3a8df1c", + "sha256": "0svjaid3x3l7c59g7ckpgsnmgh7j118rakmfs0qhjh5xla60bglm" } }, { @@ -101513,11 +101586,11 @@ "repo": "ideasman42/emacs-spatial-navigate", "unstable": { "version": [ - 20211007, - 307 + 20220211, + 548 ], - "commit": "03bc1255dfaa87fb6cb62a850877445bd7a14455", - "sha256": "0xyyc89205qc3i9q96jp1in3y3ravcfia9pc5s2smam01kqvipld" + "commit": "0365544483f957db79b8e617fb0bd8160134a655", + "sha256": "0c52dfy1jqmbkl8ml06xif166kxbyy9q8z33cpvkljh36ia23y1z" } }, { @@ -101528,11 +101601,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220204, - 53 + 20220207, + 54 ], - "commit": "38cfd66c3044f26cd1c7d6e599bc73f9b9fc0760", - "sha256": "1s5hi5kgq6m2ms9k2f0an3h0mf1lm9s5yriprkp7kmr4d4rk3c6s" + "commit": "cc331a92f5e81613796110a529b3f9fb511dda87", + "sha256": "1z4nyax8glnvax7fj05p2mgwy9g1gbs4n0lqghc4a6ih0cm314nk" } }, { @@ -101659,11 +101732,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20220119, - 2344 + 20220213, + 1215 ], - "commit": "50be652a6ec8590c3098f46094a92213623349c1", - "sha256": "0n7qwnirvkh2aprb7l1wj9rywdsn33a7s32716m3afcvy7z9pyh4" + "commit": "8185467b24f05bceb428a0e9909651ec083cc54e", + "sha256": "0ka7i2jl9vbr5071pbb3n8ckc9nqgpxrbfgij7wn33g01dpn2zjn" } }, { @@ -101748,17 +101821,17 @@ }, { "ename": "spice-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1my6dbdnf4scshjf299d4n7vsdq3cxhq9kmqvirs45y3qjm7pgpg", - "fetcher": "github", - "repo": "stardiviner/spice-mode", + "commit": "ae5f7b427e85726e4b4f2030a713c88d2e559f4a", + "sha256": "0qv691x5fcmb9xcx3pd0jqhl918qim0h9fg4r2mscccqnricshj4", + "fetcher": "git", + "url": "https://repo.or.cz/spice-mode.git", "unstable": { "version": [ - 20190608, - 1033 + 20220210, + 1414 ], - "commit": "e5e0644f03f9696f56dd69e2b6979da7f30ed600", - "sha256": "01905cdplj9icbxzr7sqb62x5qchzgvs8qjf5s4qga4x3vjh1dc4" + "commit": "f55c2b6dd35caace0ec7250b5c7b5d119235a23d", + "sha256": "1jkqwclk65rcyv5qj2vq7qpiimlrqij7c7fbjvxv4pf4zd2wx0k8" } }, { @@ -102619,14 +102692,14 @@ "repo": "Kungsgeten/steam.el", "unstable": { "version": [ - 20210404, - 1658 + 20220208, + 2122 ], "deps": [ "cl-lib" ], - "commit": "2b24198844e7296c68f870490fabe896ed101baa", - "sha256": "0vcqpsz843djc2blkbjwqhr8km8chckfl8fgr78ii5zg9wdlvbrp" + "commit": "08e7b3474bb065d128734b90cd8c6c9aa3b6aece", + "sha256": "1x1jdg6k75d3r26cikf7vfzh69sam39vlwcx4srqr5czl15c5ins" } }, { @@ -102720,11 +102793,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20210920, - 1345 + 20220210, + 1829 ], - "commit": "caf1c099ee5da59c6686af99c36eb846ebb7a610", - "sha256": "112l5g5s71r8krbcx03xgm18v5lm3r4dz10a3qss27s2m6a1y8i5" + "commit": "ce7c9805c9030fe28c4f29720bfe413ee4674c2d", + "sha256": "0pspxxpydzb5yhw1lmw5y6lcgrxq9zdrp40ckgjwdq0x49j7166z" } }, { @@ -105060,28 +105133,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220206, - 849 + 20220216, + 1307 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "13077c5e5eaa5621fbb68838ca3c15238faf73e0", - "sha256": "0z5h4g2c5ldfdsxzsiyj1dfwrk684vwhb7vx25mjvv01591mgq5c" + "commit": "9b0525e5e83de3ce86666c3d147a30a6f10f01de", + "sha256": "0apbf523gcmg9qkldznfshas63fvjm172bh922faflqn8wp8jb4b" }, "stable": { "version": [ 0, 8, - 2 + 3 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "4c981d6d65d612948227bde6ae8b7d601e0a190f", - "sha256": "0f600wd1wz2mfk6cbaxpd6f1sdpbkq5n4d1km5nzgynbjpr2is91" + "commit": "ac3634e2e7efe9c29c4311196e0ed67085d58f11", + "sha256": "1ffy17i5fi1bw5r5m6x372c52hc1k83wxdxvi4z0hixyklj48nsv" } }, { @@ -105181,11 +105254,11 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220203, - 2002 + 20220213, + 1913 ], - "commit": "6ca08f66585dee09d1e48ee600cbaab579720488", - "sha256": "09l7scif2sc0m9ral5nzv4rf02pwsk7z5822y77klj36zsrxigdc" + "commit": "5242ebb37fbf14f60c8eecf4461091ee22389912", + "sha256": "1j6f9y50w4h7cn4bl3dabv8d1i94kc0cf0rla825lglai206cwrx" }, "stable": { "version": [ @@ -106204,18 +106277,18 @@ 20200212, 1903 ], - "commit": "2f2a408f31d3f3e87415865676479091fea1749c", - "sha256": "0mw3lhw0g7b5abaq57q97376bpn4n6q7pb9yazmr8csv6apjk0xd" + "commit": "82d2e5abebb400997a1587115275bc2f7211acec", + "sha256": "0d15fka004yqmcx6z4brzrr37iadnggg7f31cf0l4qaqnhi9zswf" }, "stable": { "version": [ 2022, - 1, - 31, + 2, + 14, 0 ], - "commit": "a0a3b22d57d9ec2ee61e37c882467f5580749b1f", - "sha256": "18gp39nfw9lzg7d399sr2llaf87yg8rwwf4palncz7spvl0ikyfr" + "commit": "e47a693bc7921bd20ee6cf425f6ecd4f834249a4", + "sha256": "04agrdspg4q19kddpynhnngz5qrkrh3kjaccx5whb36a6p5a0730" } }, { @@ -106271,8 +106344,8 @@ "deps": [ "haskell-mode" ], - "commit": "9f86bc9aa03251065de988e57ffd209665a3acff", - "sha256": "11q86l6c82isb07al8lif96a8xsfih4zjxnamx9f76xxq0hxskqb" + "commit": "12c40a5b6d9fafcd3b895d9b90de1ac97483cbbf", + "sha256": "1gvn70a9w9fbn5wr3dzlnsyhyyrq602k61g82irh5z4amarq1blh" }, "stable": { "version": [ @@ -106882,11 +106955,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20220202, - 1805 + 20220215, + 1121 ], - "commit": "5df42d3f5569d9005f9180337aa88befaf77c491", - "sha256": "120lh5c01wbv92zljw8jhx16cdjp154bjas8k0bi461x1xa5mzl5" + "commit": "f78976e448853646e3b5e718783ddb8256bf341e", + "sha256": "06fc46gxsbc8wv3y68n4pxyz34cfln7b5pbrwih68qs4ybp51nn8" } }, { @@ -107343,11 +107416,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220130, - 1941 + 20220216, + 2303 ], - "commit": "440a341831398b825dc2288a10821cf7be1999ca", - "sha256": "0vaaxjkk6rllypfspvi2gb0kcfkgh3sipg6nmfwaz62y1kviwc1s" + "commit": "72b8c013936b8e8d891105144107781a43516735", + "sha256": "098j2yflc84xy0bfbxzdf5f413j6gy77ncvpn3j8xy9qi5frnn0i" }, "stable": { "version": [ @@ -107476,8 +107549,8 @@ 20200910, 1636 ], - "commit": "090677c53a2127d0960204b7b6d3e39f6bf2c7fd", - "sha256": "1b6g83gcjars06vcq7pbrwaw0cn7yqpny162iaf0rqaazr5wggx6" + "commit": "9d65b39ec3cee901566bead7a8f82941693c43b5", + "sha256": "1qmmryy2plw5qrrqh7y5q63sv93hbvffkl89sd0m1842xi2jzd2i" }, "stable": { "version": [ @@ -107587,8 +107660,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220129, - 448 + 20220211, + 1633 ], "deps": [ "dash", @@ -107598,8 +107671,8 @@ "tree-sitter-langs", "tsc" ], - "commit": "a94e4a645988a2c0e2369e27a2635f6555d321d8", - "sha256": "1pszg8vlhdbpl3q6wr60jv1pn52dpxl8lzmvrvsy5jwvlmiwy91y" + "commit": "f7d393b5caf601fe20c7543a53fca3d7e74ea09d", + "sha256": "0i8vc5mpwgkf21awnzc4m60paf13lwl0ff4ihks6k6xq65va3rhn" } }, { @@ -107625,26 +107698,26 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20220129, - 1630 + 20220212, + 1632 ], "deps": [ "tsc" ], - "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", - "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" + "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", + "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" }, "stable": { "version": [ 0, - 17, + 18, 0 ], "deps": [ "tsc" ], - "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", - "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" + "commit": "909717c685ff5a2327fa2ca8fb8a25216129361c", + "sha256": "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif" } }, { @@ -107686,26 +107759,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20220129, - 1702 + 20220212, + 641 ], "deps": [ "tree-sitter" ], - "commit": "a9b0390a751be0a631cf8a356d61933795d9fcbc", - "sha256": "10dscwcn6g0hm39jag2cd7avvwqav9xs43ygcgcx1lxcxfk6ib18" + "commit": "599570cd2a6d1b43a109634896b5c52121e155e3", + "sha256": "1sgpsjd3037pbvwk7lgw70gb4j0fyqikv4lwxwa6l5dwnqvqxgq6" }, "stable": { "version": [ 0, 11, - 0 + 3 ], "deps": [ "tree-sitter" ], - "commit": "a9b0390a751be0a631cf8a356d61933795d9fcbc", - "sha256": "10dscwcn6g0hm39jag2cd7avvwqav9xs43ygcgcx1lxcxfk6ib18" + "commit": "599570cd2a6d1b43a109634896b5c52121e155e3", + "sha256": "1sgpsjd3037pbvwk7lgw70gb4j0fyqikv4lwxwa6l5dwnqvqxgq6" } }, { @@ -107752,8 +107825,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220129, - 1122 + 20220216, + 1950 ], "deps": [ "ace-window", @@ -107765,8 +107838,8 @@ "pfuture", "s" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107803,8 +107876,8 @@ "all-the-icons", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107835,8 +107908,8 @@ "evil", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107866,8 +107939,8 @@ "deps": [ "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107898,8 +107971,8 @@ "pfuture", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107924,16 +107997,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211229, - 1448 + 20220209, + 2117 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107958,16 +108031,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211229, - 1448 + 20220209, + 2117 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107999,8 +108072,8 @@ "projectile", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -108256,20 +108329,20 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20220129, - 1630 + 20220212, + 1632 ], - "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", - "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" + "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", + "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" }, "stable": { "version": [ 0, - 17, + 18, 0 ], - "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", - "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" + "commit": "909717c685ff5a2327fa2ca8fb8a25216129361c", + "sha256": "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif" } }, { @@ -108554,6 +108627,24 @@ } }, { + "ename": "twitch-api", + "commit": "d68bb5cb21fdc7d91ba5548354a8214a6b603b3d", + "sha256": "1zsqm8nwjfsdbwkylxf2dc26zh4dy4ni6yv48yvk20nvcsi8sz80", + "fetcher": "github", + "repo": "BenediktBroich/twitch-api", + "unstable": { + "version": [ + 20220207, + 813 + ], + "deps": [ + "dash" + ], + "commit": "e48b0b350516e20eaf85514e8855c2fbfbf09c11", + "sha256": "1pfrqa7lc85b9ww54w15liwi0swj3h9vx41fcmv7w0b31fijmzjd" + } + }, + { "ename": "twittering-mode", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", "sha256": "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1", @@ -109025,8 +109116,8 @@ 20200719, 618 ], - "commit": "70b287aad04d97ec902ea2aa71cf9ff4b7d701ec", - "sha256": "0api91jqkafqglq6f1fqb0lac81dq7xr2czdwrb4m0lgkxv325sj" + "commit": "ad3913d41471852a56ee9c46cf76198de9b020e7", + "sha256": "0nzgrad4h2v9a5c7qq2mhj9q9yk0kags921pwlwn86ywq338mfkc" }, "stable": { "version": [ @@ -109069,11 +109160,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20211030, - 612 + 20220211, + 548 ], - "commit": "ab8bc10e424bccc847800c31ab41888db789d55d", - "sha256": "1vdaysc328gwqi57fp4cfbl96g76m8wc2qr53wgb3l89m9kx5sgg" + "commit": "e81c8da4416b15cac9d5ac7574e11471417a65ca", + "sha256": "1f25h3rx09ci56gkpypsscp8bkqmj7fr2yfniki0y92czix9x70s" } }, { @@ -109084,11 +109175,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20220117, - 2256 + 20220211, + 548 ], - "commit": "edf050d6133478d04fc06cc65914517b18d6bcc6", - "sha256": "1sbd5fmpc3kcw9w566aqx7css2bjbca503j9y8aj6h08hpais561" + "commit": "d4f078abcbeea614ac2b32808c9cadf460a61e2e", + "sha256": "02b95pasbgr82g2ii225ixfd39w2y7jncxwmvm7ix2pw77g9mc7v" } }, { @@ -109990,11 +110081,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20211008, - 454 + 20220211, + 548 ], - "commit": "e6e3dd50fb7e3b20e38db555950b2f417a12c993", - "sha256": "0iri2836zxadqdvivkmm0rz2ai4wxb1khnfxjmk8k8q274w1lslf" + "commit": "0e36664ffe9f278bb008107d1b743edfcfba60f1", + "sha256": "1ninhp8z9lr705k8a5pd8cvm3nwrml9wp2hvrv3lilmdr9879h0y" } }, { @@ -110011,8 +110102,8 @@ "deps": [ "tuareg" ], - "commit": "676e2cd6545fd327e02330d1ccb20c02d6b26eab", - "sha256": "1mdpqc1b67p5rm2jsbwy0gjjgdlfqcakjyh1cwdj959ykz4zy9ld" + "commit": "d5dbad6b807f09731d87344ea778b29c432b76e2", + "sha256": "0lndsas27h9mmrjv1g2r5jhwjip1si6xrinp58w04kvzcvgypp2w" }, "stable": { "version": [ @@ -110703,11 +110794,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20211103, - 1927 + 20220214, + 943 ], - "commit": "6250360b3b06f590dd37885f3c33a451a3eab5d3", - "sha256": "07xdl2ng435iy9zqrq1wgrmwygarc91kqmz6ck1ngvn4mh86ndxk" + "commit": "f6fd85d913c39603695e52d258d02e6030e3d42d", + "sha256": "032s7i4gg7cc35cqa816sji8bhww2wzlihizvvbbzplsz435mdbs" }, "stable": { "version": [ @@ -111419,11 +111510,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220201, - 1229 + 20220214, + 1401 ], - "commit": "e292c57d53823038733105d22f576a83b5dfdaae", - "sha256": "0687q8m5a3rqwdjgr898gz4nckyi5awksz5z6m6qhga3zmhcmqkw" + "commit": "899a46132c47b37e262e66ebef3bf7f89f9b161a", + "sha256": "0i0wbs9w3rlfqal3pwbvjqqd85yw5m3whmycgk4d1md5hcw8pdym" }, "stable": { "version": [ @@ -111442,11 +111533,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220201, - 1228 + 20220214, + 1401 ], - "commit": "b99fdcfdb5259b2d831302f38288bdbb3a21ed19", - "sha256": "09nbdyw4kjbfpyswjwn0rdffpcmcnl5y32vrncaxwx44rsg3y1cr" + "commit": "aaed826c9c7e34cd86f173fd30a9a677addf0bd5", + "sha256": "1hbxpjvbcksp5c5y4yz1lvyzwjq66ji6v61p7rv9jpm45bv6r09g" }, "stable": { "version": [ @@ -111480,11 +111571,11 @@ "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210925, - 1940 + 20220217, + 350 ], - "commit": "2b86fe42b85b602ba97ea7f757676d623cfbb8d0", - "sha256": "0dgg8qmpfwb2z7yzvl5hj298lx1dk056wdbyr74vvwgn450x77sd" + "commit": "612646c3e707f9665bdbd034a6c2e17cb2645c3a", + "sha256": "0m6vwvrsl4dnw42pd3fi2s513jjlq8km7gzks8c6jch7lydwxabk" }, "stable": { "version": [ @@ -111625,8 +111716,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20211116, - 1109 + 20220214, + 647 ], "deps": [ "bind-key", @@ -111635,8 +111726,8 @@ "s", "versuri" ], - "commit": "ddfd4be99b46ddc042139028980ad8dd616b7d45", - "sha256": "10wjzx8vq8k16dwcjppnr28pkiilxl2ak78h60h68flakmdzibmg" + "commit": "0b46ce53aaf1b7d96ec2d9cedbd5e143bc27fec3", + "sha256": "0y10y5r0aa84w1z2aj16w4pxfsvda6a84hkyhc6xjng5sg3j3flh" }, "stable": { "version": [ @@ -111670,8 +111761,8 @@ "org-roam", "s" ], - "commit": "38efd2e08345d02f64b768629e26fa4e4e7beb85", - "sha256": "1n1fhy9456d10isddfp29dqnjccs6hs4ymdxcs05c55sw2vgjc1l" + "commit": "266c491ee2d583648f391803a278e8c5befbd8bd", + "sha256": "1dw05c0kfrjv09lqdkwg8i6hkxd3g2zaclixfhfzgs2976a9r23k" }, "stable": { "version": [ @@ -111867,11 +111958,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20211217, - 1406 + 20220211, + 1304 ], - "commit": "cb65d5e32fae0da77118db492cd40b58585d5cf2", - "sha256": "0ai5kw8v3778h5ry9191xb7bcmqp3j92h800223aiclh3hrfdc3b" + "commit": "ed86134f91c532a38d2739dd15ea6cec879cbd8a", + "sha256": "1p23jr4h6hhalvsi3mk3kcf6dbph6di2h3h92ym86fxry4jjxlzh" } }, { @@ -112783,20 +112874,20 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20220102, - 1433 + 20220214, + 1818 ], - "commit": "9f64733e4ac563c0cda3685acf4e1c2cf600319b", - "sha256": "086jcw31jl3cb6ahgrgf40s7ydp7gv58pah2ai12j7j3g6vvdjnj" + "commit": "1217db8c6356659e67b35dedd9f5f260c06f6e99", + "sha256": "0ph5mrzz3r7x4dmy93v6affl4jznvic97a30mrs3kvhwyr2v4mby" }, "stable": { "version": [ 3, - 5, - 4 + 6, + 0 ], - "commit": "1bb1f723dab2fc8b88b7f7273d0a7fa11134b936", - "sha256": "0wz3bb7vzxqi3wqpn46z6ps00m9wjcpv9cfvqi7lyvm920sxzlv7" + "commit": "1217db8c6356659e67b35dedd9f5f260c06f6e99", + "sha256": "0ph5mrzz3r7x4dmy93v6affl4jznvic97a30mrs3kvhwyr2v4mby" } }, { @@ -113470,11 +113561,11 @@ "url": "https://hg.sr.ht/~arnebab/wisp", "unstable": { "version": [ - 20220204, - 436 + 20220208, + 636 ], - "commit": "08b3d086d1f1ac77a7d14f763063e75c29e600c8", - "sha256": "08zh4fdmdpi3wd2ysfv3awbq9lfvscanz3478k4fliw6igidk3qa" + "commit": "d266109b95e73281ae3aa1ed9a023346b6d39d28", + "sha256": "0fr3p6cfqxxj01bix9aiglfb2ls2grr62l735wdkn2r7lfvf5hjx" } }, { @@ -113515,20 +113606,20 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220130, - 1942 + 20220211, + 2034 ], - "commit": "edf4445edb613c8355c45209264f691268116f0f", - "sha256": "1rrzn34cqi2vf5vp4ip15qcprbm9y7jw9kh2yxkw82mxm8gh7m3h" + "commit": "f514f23258af67a10fc8e1c431bfe94702b6e65b", + "sha256": "095gmw87ch8mnwcldyab89a04wr5ahb2hgh0nd0gbhg7mkca17ph" }, "stable": { "version": [ 3, - 1, - 1 + 2, + 0 ], - "commit": "a4e720b12a0946a271a274bbe0b45ae07f83520b", - "sha256": "06a66119rp5vfqdzqk10df3qyh9jvjl6j3pqm03jy0b110v2bfa8" + "commit": "a762199d9bb8ee60311eaabf791b3dd64140effd", + "sha256": "1d98hagpm6h5vgx80qlh3zrfcb6z000rfc707w9zzmh634dkg3xx" } }, { @@ -113766,11 +113857,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20220124, - 251 + 20220213, + 243 ], - "commit": "c2f0d61646d2744167661e5ce60fae679d50c850", - "sha256": "12b42qcmc8k15n2zdvl264sz9w697f6dm9vynyw7gk3g16rydbhj" + "commit": "cb0321c79abbcf31a61d9be02690b434ece55d4d", + "sha256": "09wamwxplj02xi603jkp246n0qynjaj83gvg7d3jn5z0fhgr6blp" } }, { @@ -114684,11 +114775,11 @@ "repo": "ideasman42/emacs-xref-rst", "unstable": { "version": [ - 20211006, - 2319 + 20220211, + 548 ], - "commit": "4ca1c15e9fe98fadfb13098dd0ee104d5ca6abf2", - "sha256": "0rawl98fsx1rrhq051d77wmz1xp82m9yr9rgb8k3p5g0yacyfkfv" + "commit": "f07722ac9c2952e86d9e84546c3c5eb1a768247e", + "sha256": "1wq815c2bs1fqjkl7kjpzmhdlw95dsayvcgclnkk1bb70xgzsivg" } }, { @@ -115241,11 +115332,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20220116, - 2241 + 20220212, + 1742 ], - "commit": "a5920d660f660ed05f4ca63bfd5e70f912baf9d2", - "sha256": "1dbqjxyxl5p7hg2z249nlw06cx2hn4sciv7fvxlnyhcdnhhv2bhd" + "commit": "289d547e66b7699ee11cc889d2df50ba863a9298", + "sha256": "1dn66733fcwsm9bnq26qsl2zca1r9naf02rg7lr97q7zycj6lfbv" }, "stable": { "version": [ @@ -116159,11 +116250,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220205, - 2000 + 20220214, + 1500 ], - "commit": "44b59d15e4ec491129104b6d1a1a0ed8bdff645f", - "sha256": "1fgcdip4jn8j5668ws0pxma8hibsnsamk1gq0fb4mcb24mczxvc3" + "commit": "624ca6665e469b790dd66f6b6f0a1af10c384e3f", + "sha256": "11jzgrj8z2ich8n7f2s7lqnqdclmprvwwlxpkadd31dl7njc8fb2" } }, { diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 773b1f278e0..50366863d67 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -25,6 +25,7 @@ in buildFHSUserEnv rec { # qsys requirements xorg.libXtst xorg.libXi + libudev0-shim ]; multiPkgs = pkgs: with pkgs; let # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 4e4835783e4..e5bdc28b80e 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.22"; + version = "2.23"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "11n970ad0j57vlll5j30ngkrfyil23v1b29ickbnblcldvjbgwa5"; + sha256 = "sha256-CLQWbwwJnr6Al223GvV1hVNK13p2iAyjNF7PhdaU9N0="; }; # We have not packaged tests. @@ -36,8 +36,9 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://rednotebook.sourceforge.io/"; + changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md"; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej tstrobel ]; }; } diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 6b380e32bc6..894b7a43c01 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "sha256-uh6mXXJP/EpfvHTXL7PH+Yd1F5Q+6B01ns4vRr/2Xqo="; + hash = "sha256-rfk/csJJATXI1JvAHn2K/+fVLsqmkKxIbNWlcu1EhYY="; }; format = "other"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index d5d52010e05..b1ab8c57ee8 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0s45ydca4lmcyki58n4zmvdpn32x7z1q249i3qxcn2a5ay2mhhxc"; - x86_64-darwin = "1wab60dx5hfgmsw313qk8cbwvyq291d1q82hwll129dgcfhkrzrj"; - aarch64-linux = "1mkvca3hjcqf3k0v04lynmlm5j3lj86l5j15a505a3f8xp97yvdy"; - armv7l-linux = "1lcaq5k17km9p6xx26dpxgq5zrnjvh3yf8svz5nb5fa01v8fz4ds"; + x86_64-linux = "0ldfp4r7nb9npvjadgj63sd369nqmbgf5y4kpp93slsy1lbs0bk8"; + x86_64-darwin = "05z0jx2cc1askzzdxa8vxj8gp0v9rm1jw6005bpmijvyb8s2d30w"; + aarch64-linux = "1a5fyxzz51rb0af0wv3xh2h87yq00y5k501p7idqhj0zvd5mpqh6"; + armv7l-linux = "05byi0aba516whzry5qkxfkm82sy2dgv1m0hyycmnkb2dwmb552m"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.64.0"; + version = "1.64.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/misc/emulators/ares/default.nix b/pkgs/applications/emulators/ares/default.nix index 33a7858455d..33a7858455d 100644 --- a/pkgs/misc/emulators/ares/default.nix +++ b/pkgs/applications/emulators/ares/default.nix diff --git a/pkgs/misc/emulators/ares/fix-ruby.patch b/pkgs/applications/emulators/ares/fix-ruby.patch index 01bd57ebaad..01bd57ebaad 100644 --- a/pkgs/misc/emulators/ares/fix-ruby.patch +++ b/pkgs/applications/emulators/ares/fix-ruby.patch diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/applications/emulators/atari++/default.nix index 5e35dcaebd0..5e35dcaebd0 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/applications/emulators/atari++/default.nix diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix index 37e0d83f140..37e0d83f140 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/applications/emulators/atari800/default.nix diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/applications/emulators/attract-mode/default.nix index 7a3f61fd8dc..7a3f61fd8dc 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/applications/emulators/attract-mode/default.nix diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/emulators/bochs/default.nix index 1f02219c831..1f02219c831 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/emulators/bochs/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes-hd/default.nix index 6494185958c..6494185958c 100644 --- a/pkgs/misc/emulators/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes-hd/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch index d38efbc99bc..d38efbc99bc 100644 --- a/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch +++ b/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch diff --git a/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch index 85adb33e3ab..85adb33e3ab 100644 --- a/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch +++ b/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/applications/emulators/caprice32/default.nix index 6c2932f7e10..6c2932f7e10 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/applications/emulators/caprice32/default.nix diff --git a/pkgs/misc/emulators/caprice32/string.patch b/pkgs/applications/emulators/caprice32/string.patch index fabbbd80d5d..fabbbd80d5d 100644 --- a/pkgs/misc/emulators/caprice32/string.patch +++ b/pkgs/applications/emulators/caprice32/string.patch diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix index 11f24d59e5c..11f24d59e5c 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/applications/emulators/ccemux/default.nix diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix index 338c64a24b8..338c64a24b8 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/applications/emulators/cdemu/analyzer.nix diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/applications/emulators/cdemu/base.nix index 9464bde70bf..9464bde70bf 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/applications/emulators/cdemu/base.nix diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix index 06604e3eae9..06604e3eae9 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/applications/emulators/cdemu/client.nix diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix index 3df9e4ad543..3df9e4ad543 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/applications/emulators/cdemu/daemon.nix diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix index 15e595a6172..15e595a6172 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/applications/emulators/cdemu/gui.nix diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix index 7016a42d247..7016a42d247 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/applications/emulators/cdemu/libmirage.nix diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index aeadcf5c1c1..aeadcf5c1c1 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix diff --git a/pkgs/misc/emulators/cen64/default.nix b/pkgs/applications/emulators/cen64/default.nix index ddf45547337..ddf45547337 100644 --- a/pkgs/misc/emulators/cen64/default.nix +++ b/pkgs/applications/emulators/cen64/default.nix diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix index 92d0f5b1d36..92d0f5b1d36 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/applications/emulators/citra/default.nix diff --git a/pkgs/misc/emulators/commanderx16/emulator.nix b/pkgs/applications/emulators/commanderx16/emulator.nix index 73442215ff1..73442215ff1 100644 --- a/pkgs/misc/emulators/commanderx16/emulator.nix +++ b/pkgs/applications/emulators/commanderx16/emulator.nix diff --git a/pkgs/misc/emulators/commanderx16/rom.nix b/pkgs/applications/emulators/commanderx16/rom.nix index 5da77ebceef..5da77ebceef 100644 --- a/pkgs/misc/emulators/commanderx16/rom.nix +++ b/pkgs/applications/emulators/commanderx16/rom.nix diff --git a/pkgs/misc/emulators/commanderx16/run.nix b/pkgs/applications/emulators/commanderx16/run.nix index 1f14fdb223c..1f14fdb223c 100644 --- a/pkgs/misc/emulators/commanderx16/run.nix +++ b/pkgs/applications/emulators/commanderx16/run.nix diff --git a/pkgs/misc/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 3bc9e0b81cc..3bc9e0b81cc 100644 --- a/pkgs/misc/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/applications/emulators/darcnes/default.nix index 7919e0a9009..7919e0a9009 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/applications/emulators/darcnes/default.nix diff --git a/pkgs/misc/emulators/darcnes/label.patch b/pkgs/applications/emulators/darcnes/label.patch index 612aa1e3911..612aa1e3911 100644 --- a/pkgs/misc/emulators/darcnes/label.patch +++ b/pkgs/applications/emulators/darcnes/label.patch diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 49cb2498e64..49cb2498e64 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix diff --git a/pkgs/misc/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix index e56ca12a4e9..e56ca12a4e9 100644 --- a/pkgs/misc/emulators/dgen-sdl/default.nix +++ b/pkgs/applications/emulators/dgen-sdl/default.nix diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/applications/emulators/dlx/default.nix index 9573dd6d48d..9573dd6d48d 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/applications/emulators/dlx/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index c2d73d3e7ff..c2d73d3e7ff 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 56e107300b5..56e107300b5 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix diff --git a/pkgs/misc/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 90510d64522..90510d64522 100644 --- a/pkgs/misc/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix diff --git a/pkgs/misc/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index 438849e7fd8..438849e7fd8 100644 --- a/pkgs/misc/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 383e943ff24..383e943ff24 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix diff --git a/pkgs/misc/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 8e4d909a724..8e4d909a724 100644 --- a/pkgs/misc/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix index 7f332010153..26ff779ba05 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libelf, libpcap }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libelf +, libpcap +}: stdenv.mkDerivation rec { pname = "dynamips"; @@ -8,7 +14,7 @@ stdenv.mkDerivation rec { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5"; + hash = "sha256-JQJa3NZ9mQqqvuTzU7XmAr1WRB4zuLIwBx18OY3GbV8="; }; nativeBuildInputs = [ cmake ]; @@ -17,12 +23,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; meta = with lib; { + inherit (src.meta) homepage; description = "A Cisco router emulator"; longDescription = '' Dynamips is an emulator computer program that was written to emulate Cisco routers. ''; - inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/applications/emulators/emu2/default.nix index 7949a3f2b05..7949a3f2b05 100644 --- a/pkgs/misc/emulators/emu2/default.nix +++ b/pkgs/applications/emulators/emu2/default.nix diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/applications/emulators/emulationstation/default.nix index 4cb5ca9ec2e..4cb5ca9ec2e 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/applications/emulators/emulationstation/default.nix diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/applications/emulators/epsxe/default.nix index f39c2ae74ac..f39c2ae74ac 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/applications/emulators/epsxe/default.nix diff --git a/pkgs/misc/emulators/fakenes/build.patch b/pkgs/applications/emulators/fakenes/build.patch index 90799d977a1..90799d977a1 100644 --- a/pkgs/misc/emulators/fakenes/build.patch +++ b/pkgs/applications/emulators/fakenes/build.patch diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/applications/emulators/fakenes/default.nix index 6bc4b1480ff..6bc4b1480ff 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/applications/emulators/fakenes/default.nix diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index 9289fb081f0..9289fb081f0 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix index 8a759d00582..8a759d00582 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/applications/emulators/firebird-emu/default.nix diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/applications/emulators/fs-uae/default.nix index 4bd67908a78..4bd67908a78 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/applications/emulators/fs-uae/default.nix diff --git a/pkgs/misc/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index afe12aab0c8..afe12aab0c8 100644 --- a/pkgs/misc/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/applications/emulators/fuse-emulator/default.nix index 35e28ba55f6..35e28ba55f6 100644 --- a/pkgs/misc/emulators/fuse-emulator/default.nix +++ b/pkgs/applications/emulators/fuse-emulator/default.nix diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix index 0fbd12fc365..0fbd12fc365 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/applications/emulators/gens-gs/default.nix diff --git a/pkgs/misc/emulators/gxemul/0001-fix-attributes.patch b/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch index 3ed9cabc7ad..3ed9cabc7ad 100644 --- a/pkgs/misc/emulators/gxemul/0001-fix-attributes.patch +++ b/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/applications/emulators/gxemul/default.nix index cacb521c2fb..cacb521c2fb 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/applications/emulators/gxemul/default.nix diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/applications/emulators/hatari/default.nix index de98278b832..de98278b832 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/applications/emulators/hatari/default.nix diff --git a/pkgs/applications/virtualization/hercules/default.nix b/pkgs/applications/emulators/hercules/default.nix index f33055baacb..67506d36b63 100644 --- a/pkgs/applications/virtualization/hercules/default.nix +++ b/pkgs/applications/emulators/hercules/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "hercules"; @@ -10,8 +13,14 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "IBM mainframe emulator"; homepage = "http://www.hercules-390.eu"; + description = "IBM mainframe emulator"; + longDescription = '' + Hercules is an open source software implementation of the mainframe + System/370 and ESA/390 architectures, in addition to the latest 64-bit + z/Architecture. Hercules runs under Linux, Windows, Solaris, FreeBSD, and + Mac OS X. + ''; license = licenses.qpl; maintainers = [ maintainers.anna328p ]; }; diff --git a/pkgs/misc/emulators/higan/001-include-cmath.patch b/pkgs/applications/emulators/higan/001-include-cmath.patch index 67644e656aa..67644e656aa 100644 --- a/pkgs/misc/emulators/higan/001-include-cmath.patch +++ b/pkgs/applications/emulators/higan/001-include-cmath.patch diff --git a/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch b/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch index 0585c8a38c7..0585c8a38c7 100644 --- a/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch +++ b/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/applications/emulators/higan/default.nix index c5f38a040c1..c5f38a040c1 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/applications/emulators/higan/default.nix diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix index e8feb1ea7ed..e8feb1ea7ed 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/applications/emulators/kega-fusion/default.nix diff --git a/pkgs/misc/emulators/lambda-delta/default.nix b/pkgs/applications/emulators/lambda-delta/default.nix index a17a0eadfd5..a17a0eadfd5 100644 --- a/pkgs/misc/emulators/lambda-delta/default.nix +++ b/pkgs/applications/emulators/lambda-delta/default.nix diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/applications/emulators/libdsk/default.nix index 247aef118e8..247aef118e8 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/applications/emulators/libdsk/default.nix diff --git a/pkgs/misc/emulators/maiko/default.nix b/pkgs/applications/emulators/maiko/default.nix index e78b680d617..e78b680d617 100644 --- a/pkgs/misc/emulators/maiko/default.nix +++ b/pkgs/applications/emulators/maiko/default.nix diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index e0915703003..e0915703003 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix diff --git a/pkgs/misc/emulators/mame/emuopts.patch b/pkgs/applications/emulators/mame/emuopts.patch index b85291f52f7..b85291f52f7 100644 --- a/pkgs/misc/emulators/mame/emuopts.patch +++ b/pkgs/applications/emulators/mame/emuopts.patch diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/applications/emulators/mednafen/default.nix index f76ddb78bd5..f76ddb78bd5 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/applications/emulators/mednafen/default.nix diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/applications/emulators/mednafen/server.nix index 24c13bf0228..24c13bf0228 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/applications/emulators/mednafen/server.nix diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/applications/emulators/mednaffe/default.nix index 4874d5efee7..4874d5efee7 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/applications/emulators/mednaffe/default.nix diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 3e30be8c2a3..3e30be8c2a3 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index d8defe6f2e9..d8defe6f2e9 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/applications/emulators/mupen64plus/default.nix index f5d17d9d395..f5d17d9d395 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/applications/emulators/mupen64plus/default.nix diff --git a/pkgs/misc/emulators/nestopia/build-fix.patch b/pkgs/applications/emulators/nestopia/build-fix.patch index a7d82ead15c..a7d82ead15c 100644 --- a/pkgs/misc/emulators/nestopia/build-fix.patch +++ b/pkgs/applications/emulators/nestopia/build-fix.patch diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/applications/emulators/nestopia/default.nix index fa55c2e9635..fa55c2e9635 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/applications/emulators/nestopia/default.nix diff --git a/pkgs/misc/emulators/nestopia/gcc6.patch b/pkgs/applications/emulators/nestopia/gcc6.patch index 65dcc72c0c2..65dcc72c0c2 100644 --- a/pkgs/misc/emulators/nestopia/gcc6.patch +++ b/pkgs/applications/emulators/nestopia/gcc6.patch diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/applications/emulators/np2kai/default.nix index 0ed47af8f5b..0ed47af8f5b 100644 --- a/pkgs/misc/emulators/np2kai/default.nix +++ b/pkgs/applications/emulators/np2kai/default.nix diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/applications/emulators/oberon-risc-emu/default.nix index 749e3549bf8..749e3549bf8 100644 --- a/pkgs/misc/emulators/oberon-risc-emu/default.nix +++ b/pkgs/applications/emulators/oberon-risc-emu/default.nix diff --git a/pkgs/misc/emulators/openmsx/custom-nix.mk b/pkgs/applications/emulators/openmsx/custom-nix.mk index 9098762e40d..9098762e40d 100644 --- a/pkgs/misc/emulators/openmsx/custom-nix.mk +++ b/pkgs/applications/emulators/openmsx/custom-nix.mk diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix index f054b954b59..f054b954b59 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/applications/emulators/openmsx/default.nix diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix index 2e6aa683e4d..2e6aa683e4d 100644 --- a/pkgs/misc/emulators/pcem/default.nix +++ b/pkgs/applications/emulators/pcem/default.nix diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 2e22e7d9053..2e22e7d9053 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix diff --git a/pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch b/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch index 0edc6281a7e..0edc6281a7e 100644 --- a/pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch +++ b/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index e3126efe82d..e3126efe82d 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/pkgs/applications/emulators/pcsxr/uncompress2.patch index 356868ce7a8..356868ce7a8 100644 --- a/pkgs/misc/emulators/pcsxr/uncompress2.patch +++ b/pkgs/applications/emulators/pcsxr/uncompress2.patch diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index b84d18a4e7a..b84d18a4e7a 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/applications/emulators/proton-caller/default.nix index d10c4364232..d10c4364232 100644 --- a/pkgs/misc/emulators/proton-caller/default.nix +++ b/pkgs/applications/emulators/proton-caller/default.nix diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix index 9b147de4fa9..9b147de4fa9 100644 --- a/pkgs/misc/emulators/punes/default.nix +++ b/pkgs/applications/emulators/punes/default.nix diff --git a/pkgs/misc/emulators/py65/default.nix b/pkgs/applications/emulators/py65/default.nix index 66ba3cdf4b4..66ba3cdf4b4 100644 --- a/pkgs/misc/emulators/py65/default.nix +++ b/pkgs/applications/emulators/py65/default.nix diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/applications/emulators/qmc2/default.nix index 6c6a52fc65c..6c6a52fc65c 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/applications/emulators/qmc2/default.nix diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/applications/emulators/reicast/default.nix index f9e8e4d6937..f9e8e4d6937 100644 --- a/pkgs/misc/emulators/reicast/default.nix +++ b/pkgs/applications/emulators/reicast/default.nix diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/applications/emulators/resim/default.nix index 49d7721174f..49d7721174f 100644 --- a/pkgs/misc/emulators/resim/default.nix +++ b/pkgs/applications/emulators/resim/default.nix diff --git a/pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch b/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch index 75018dc8c4d..75018dc8c4d 100644 --- a/pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch +++ b/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch diff --git a/pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch b/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch index 9aa8db6ab04..9aa8db6ab04 100644 --- a/pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch +++ b/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e0045a3827d..e0045a3827d 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 2c49874e544..2c49874e544 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix diff --git a/pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch b/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch index 34fea554ef7..34fea554ef7 100644 --- a/pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch +++ b/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch diff --git a/pkgs/misc/emulators/retroarch/fix-config.patch b/pkgs/applications/emulators/retroarch/fix-config.patch index 1a71bf43cb1..1a71bf43cb1 100644 --- a/pkgs/misc/emulators/retroarch/fix-config.patch +++ b/pkgs/applications/emulators/retroarch/fix-config.patch diff --git a/pkgs/misc/emulators/retroarch/fix-libretro-paths.patch b/pkgs/applications/emulators/retroarch/fix-libretro-paths.patch index 203ce836533..203ce836533 100644 --- a/pkgs/misc/emulators/retroarch/fix-libretro-paths.patch +++ b/pkgs/applications/emulators/retroarch/fix-libretro-paths.patch diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 1280f25047d..1280f25047d 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix index 9d83c46396c..9d83c46396c 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py index 68f72103168..68f72103168 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/applications/emulators/retroarch/update.py diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix index e667afdf079..e667afdf079 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/applications/emulators/retroarch/wrapper.nix diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/applications/emulators/retrofe/default.nix index dc1a23f33b3..dc1a23f33b3 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/applications/emulators/retrofe/default.nix diff --git a/pkgs/misc/emulators/retrofe/include-paths.patch b/pkgs/applications/emulators/retrofe/include-paths.patch index 02eef2594ea..02eef2594ea 100644 --- a/pkgs/misc/emulators/retrofe/include-paths.patch +++ b/pkgs/applications/emulators/retrofe/include-paths.patch diff --git a/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch b/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch index dccf06fc078..dccf06fc078 100644 --- a/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch +++ b/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 0ea56d3a72d..0ea56d3a72d 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix diff --git a/pkgs/misc/emulators/rpcs3/update.sh b/pkgs/applications/emulators/rpcs3/update.sh index 0c8477c5282..0c8477c5282 100755 --- a/pkgs/misc/emulators/rpcs3/update.sh +++ b/pkgs/applications/emulators/rpcs3/update.sh diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 784ea69d397..784ea69d397 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 2f684257114..2f684257114 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 991d00a5a4b..991d00a5a4b 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix diff --git a/pkgs/misc/emulators/ryujinx/log.patch b/pkgs/applications/emulators/ryujinx/log.patch index 57e96e5c25c..57e96e5c25c 100644 --- a/pkgs/misc/emulators/ryujinx/log.patch +++ b/pkgs/applications/emulators/ryujinx/log.patch diff --git a/pkgs/misc/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh index 0861414f0bf..0861414f0bf 100755 --- a/pkgs/misc/emulators/ryujinx/updater.sh +++ b/pkgs/applications/emulators/ryujinx/updater.sh diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index 6838a7baaf2..6838a7baaf2 100644 --- a/pkgs/misc/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix index 1e939538cda..1e939538cda 100644 --- a/pkgs/misc/emulators/simh/default.nix +++ b/pkgs/applications/emulators/simh/default.nix diff --git a/pkgs/misc/emulators/simplenes/default.nix b/pkgs/applications/emulators/simplenes/default.nix index d073098507e..d073098507e 100644 --- a/pkgs/misc/emulators/simplenes/default.nix +++ b/pkgs/applications/emulators/simplenes/default.nix diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/applications/emulators/snes9x-gtk/default.nix index 27f3400cc0b..27f3400cc0b 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/applications/emulators/snes9x-gtk/default.nix diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/applications/emulators/stella/default.nix index 212c0669046..212c0669046 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/applications/emulators/stella/default.nix diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/applications/emulators/termtekst/default.nix index 56f56cffad9..56f56cffad9 100644 --- a/pkgs/misc/emulators/termtekst/default.nix +++ b/pkgs/applications/emulators/termtekst/default.nix diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/applications/emulators/tilem/default.nix index bde706e2304..bde706e2304 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/applications/emulators/tilem/default.nix diff --git a/pkgs/applications/virtualization/tiny8086/default.nix b/pkgs/applications/emulators/tiny8086/default.nix index 60d69432cde..a0cc6bd7929 100644 --- a/pkgs/applications/virtualization/tiny8086/default.nix +++ b/pkgs/applications/emulators/tiny8086/default.nix @@ -24,32 +24,33 @@ stdenv.mkDerivation rec { makeFlags = [ "8086tiny" ]; postBuild = lib.optionalString localBios '' - ( - cd bios_source - nasm -f bin bios.asm -o bios - ) + pushd bios_source + nasm -f bin bios.asm -o bios + popd ''; installPhase = '' - mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images + runHook preInstall + mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images install -m 755 8086tiny $out/bin install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm install -m 644 docs/8086tiny.css $out/share/doc/8086tiny install -m 644 docs/doc.html $out/share/doc/$name - for i in docs/images/\*.gif; do - install -m 644 $i $out/share/doc/8086tiny/images + for image in docs/images/\*.gif; do + install -m 644 $image $out/share/doc/8086tiny/images done - ${if localBios then - "install -m 644 bios_source/bios $out/share/8086tiny/8086tiny-bios" - else - "install -m 644 bios $out/share/8086tiny/8086tiny-bios"} + install -m 644 ${lib.optionalString localBios "bios_source/"}bios \ + $out/share/8086tiny/8086tiny-bios + + runHook postInstall ''; meta = with lib; { + homepage = "https://github.com/adriancable/8086tiny"; description = "An open-source small 8086 emulator"; longDescription = '' 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) @@ -60,7 +61,6 @@ stdenv.mkDerivation rec { 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; - homepage = "https://github.com/adriancable/8086tiny"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/emulators/tinyemu/default.nix b/pkgs/applications/emulators/tinyemu/default.nix new file mode 100644 index 00000000000..c32fd24fe47 --- /dev/null +++ b/pkgs/applications/emulators/tinyemu/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchurl +, SDL +, curl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "tinyemu"; + version = "2019-12-21"; + + src = fetchurl { + url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; + hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU="; + }; + + buildInputs = [ + SDL + curl + openssl + ]; + + makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + meta = with lib; { + homepage = "https://bellard.org/tinyemu/"; + description = "A system emulator for the RISC-V and x86 architectures"; + longDescription = '' + TinyEMU is a system emulator for the RISC-V and x86 architectures. Its + purpose is to be small and simple while being complete. + ''; + license = with licenses; [ mit bsd2 ]; + maintainers = with maintainers; [ jhhuh AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix index 64f311c4a8a..64f311c4a8a 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/applications/emulators/uae/default.nix diff --git a/pkgs/misc/emulators/uxn/default.nix b/pkgs/applications/emulators/uxn/default.nix index 0b797e2e160..0b797e2e160 100644 --- a/pkgs/misc/emulators/uxn/default.nix +++ b/pkgs/applications/emulators/uxn/default.nix diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index bb5e7cea4e0..bb5e7cea4e0 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/applications/emulators/vice/default.nix index ca0de2f8276..ca0de2f8276 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/applications/emulators/vice/default.nix diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 480fc009504..480fc009504 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh index 0dd3194dc53..0dd3194dc53 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/applications/emulators/wine/builder-wow.sh diff --git a/pkgs/misc/emulators/wine/cert-path.patch b/pkgs/applications/emulators/wine/cert-path.patch index f0727f422f8..f0727f422f8 100644 --- a/pkgs/misc/emulators/wine/cert-path.patch +++ b/pkgs/applications/emulators/wine/cert-path.patch diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 191fd4b2980..191fd4b2980 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix diff --git a/pkgs/misc/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix index 0ee1b3973d8..0ee1b3973d8 100644 --- a/pkgs/misc/emulators/wine/fonts.nix +++ b/pkgs/applications/emulators/wine/fonts.nix diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index cb857daef0a..cb857daef0a 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index b98aceddbd4..b98aceddbd4 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix index c6bdb401245..c6bdb401245 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/applications/emulators/wine/staging.nix diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/applications/emulators/wine/util.nix index cd5bd03130b..cd5bd03130b 100644 --- a/pkgs/misc/emulators/wine/util.nix +++ b/pkgs/applications/emulators/wine/util.nix diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix index 303d33df217..303d33df217 100644 --- a/pkgs/misc/emulators/wine/vkd3d.nix +++ b/pkgs/applications/emulators/wine/vkd3d.nix diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix index 61ca6515c44..61ca6515c44 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/applications/emulators/wine/winetricks.nix diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/applications/emulators/xcpc/default.nix index 633d44bb5ae..633d44bb5ae 100644 --- a/pkgs/misc/emulators/xcpc/default.nix +++ b/pkgs/applications/emulators/xcpc/default.nix diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch index 43539ef4ca5..43539ef4ca5 100644 --- a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch +++ b/pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix index 17b7b563c15..17b7b563c15 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/applications/emulators/yabause/default.nix diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch b/pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch index bb0491b373f..bb0491b373f 100644 --- a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch +++ b/pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch diff --git a/pkgs/misc/emulators/yapesdl/default.nix b/pkgs/applications/emulators/yapesdl/default.nix index 5f4b7771fb5..5f4b7771fb5 100644 --- a/pkgs/misc/emulators/yapesdl/default.nix +++ b/pkgs/applications/emulators/yapesdl/default.nix diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/applications/emulators/yuzu/base.nix index aff09134fae..aff09134fae 100644 --- a/pkgs/misc/emulators/yuzu/base.nix +++ b/pkgs/applications/emulators/yuzu/base.nix diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index 9e45ba0cd2c..9e45ba0cd2c 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix diff --git a/pkgs/misc/emulators/zesarux/default.nix b/pkgs/applications/emulators/zesarux/default.nix index 4df6cfafbc0..4df6cfafbc0 100644 --- a/pkgs/misc/emulators/zesarux/default.nix +++ b/pkgs/applications/emulators/zesarux/default.nix diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index ba2f5d6bdc1..ba2f5d6bdc1 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 3dafe274163..19a754d92ee 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-24"; + version = "7.1.0-25"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-tTdtVUQDBfVS3Rze1KKKR4wL8t8+ka5Ku9qcl+DP6Eo="; + hash = "sha256-zSbngA56YnJ1W+ZlA6Q850NTtZovjue51zEgbKI3iqc="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 74dc55fc5e1..0e61da0041b 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,31 +1,40 @@ -{ lib, stdenv, fetchFromGitHub -, libX11, libXext, libXi +{ lib, stdenv, fetchFromGitLab +, desktop-file-utils, shared-mime-info +, libiconv +, libX11, libXcursor, libXext, libXi , freetype, fontconfig -, libpng, libjpeg +, libjpeg, libpng, libtiff, libwebp , zlib }: stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.6"; + version = "3.0.4"; - src = fetchFromGitHub { - owner = "Symbian9"; + src = fetchFromGitLab { + owner = "azelpg"; repo = pname; rev = "v${version}"; - sha256 = "0i5g67s4ysnvbaxmi7dhan0hfcfk8an14xykkafl47pqfx33npva"; + hash = "sha256-2gTTF1ti9bO24d75mhwyvJISSgMKdmp+oJVmgzEQHdY="; }; + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + shared-mime-info # for update-mime-info + ]; + buildInputs = [ - libX11 libXext libXi + libX11 libXcursor libXext libXi freetype fontconfig - libpng libjpeg + libjpeg libpng libtiff libwebp zlib - ]; + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + enableParallelBuilding = true; meta = with lib; { description = "Full color painting software for illustration drawing"; - homepage = "https://osdn.net/projects/azpainter"; + homepage = "http://azsky2.html.xdomain.jp/soft/azpainter.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4ed4d257ba5..037cf7c8ed6 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , wrapGAppsHook, fetchpatch, bash, doxygen +, nix-update-script }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - sha256 = "sha256-0E1TeAhkiK+hFJ4oMoeZLvfRehTzdGF3AtEVwf/MaF8="; + sha256 = "sha256-Abr7trlms6bxOAqE6xNKRv51TBGNilNdBhUZUg7OTKY="; }; patches = [ @@ -47,6 +48,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Lightweight GTK based image viewer"; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index e9c624d3c96..9d8ae0c8d35 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.4"; + version = "2.12.5"; src = fetchurl { - url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-UrBt0QkSk7IP4mZYFoxFNJQ1Qmcb53CemvlYfsxjZ/s="; + url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; + sha256 = "sha256-MFWW9DTJ/svtgN3fbw+zeGpgg3pgIoC9jZ1HkG5p6sc="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix new file mode 100644 index 00000000000..624959ffa9e --- /dev/null +++ b/pkgs/applications/graphics/rnote/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, gio-sharp +, glib +, gstreamer +, gtk4 +, libadwaita +, libxml2 +, meson +, ninja +, pkg-config +, poppler +, python3 +, rustPlatform +, shared-mime-info +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "rnote"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "flxzt"; + repo = "rnote"; + rev = "v${version}"; + sha256 = "5g5SQJc5aopYxtHNP5T85TtcazovrveUCnMhJ90p2t4="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-vnLesWXdqNzlWNQsUVy03kfmcDNazQ1BbizQDoG1kgM="; + }; + + nativeBuildInputs = [ + desktop-file-utils # For update-desktop-database + meson + ninja + pkg-config + python3 # For the postinstall script + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + shared-mime-info # For update-mime-database + wrapGAppsHook4 + ]; + + buildInputs = [ + gio-sharp + glib + gstreamer + gtk4 + libadwaita + libxml2 + poppler + ]; + + postPatch = '' + pushd build-aux + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + popd + ''; + + meta = with lib; { + homepage = "https://github.com/flxzt/rnote"; + description = "Simple drawing application to create handwritten notes"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda yrd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 73c5a038aab..68744831538 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,27 +1,77 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, libpng, cairo, freetype -, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre, wrapGAppsHook +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, at-spi2-core +, cairo +, dbus +, freetype +, fontconfig +, glew +, gtkmm3 +, json_c +, libdatrie +, libepoxy +, libGLU +, libpng +, libselinux +, libsepol +, libthai +, libxkbcommon +, pangomm +, pcre +, util-linuxMinimal # provides libmount +, xorg +, zlib }: + stdenv.mkDerivation rec { pname = "solvespace"; - version = "v3.0"; + version = "3.0"; + src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9"; + rev = "v${version}"; + hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE="; fetchSubmodules = true; }; nativeBuildInputs = [ - pkg-config cmake wrapGAppsHook + cmake + pkg-config + wrapGAppsHook ]; + buildInputs = [ - zlib libpng cairo freetype - json_c fontconfig gtkmm3 pangomm glew libGLU - xorg.libpthreadstubs xorg.libXdmcp pcre + at-spi2-core + cairo + dbus + freetype + fontconfig + glew + gtkmm3 + json_c + libdatrie + libepoxy + libGLU + libpng + libselinux + libsepol + libthai + libxkbcommon + pangomm + pcre + util-linuxMinimal + xorg.libpthreadstubs + xorg.libXdmcp + xorg.libXtst + zlib ]; - preConfigure = '' + postPatch = '' patch CMakeLists.txt <<EOF @@ -20,9 +20,9 @@ # NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds @@ -35,16 +85,14 @@ stdenv.mkDerivation rec { EOF ''; - postInstall = '' - substituteInPlace $out/share/applications/solvespace.desktop \ - --replace /usr/bin/ $out/bin/ - ''; + cmakeFlags = [ "-DENABLE_OPENMP=ON" ]; meta = with lib; { description = "A parametric 3d CAD program"; license = licenses.gpl3Plus; maintainers = [ maintainers.edef ]; platforms = platforms.linux; - homepage = "http://solvespace.com"; + homepage = "https://solvespace.com"; + changelog = "https://github.com/solvespace/solvespace/raw/v${version}/CHANGELOG.md"; }; } diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 60e4504cc50..9f3c1c82b5e 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.22.3"; + version = "1.22.4"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-Zh1rWMdRXPj/+80Sqvp9cbV5sDrNVBebPRGTTWM1DLk="; + sha256 = "sha256-Mms7Vibq1Rlb2XbxiV4o1UsjDRJcwG5ZZdPOWHjnW2A="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 42bc0599866..7c76b22dc99 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dmenu"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz"; - sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y"; + sha256 = "sha256-H01wnrujfrcybroOZl4PE75Pok7jXJWw15ww8Uo0j9U="; }; buildInputs = [ libX11 libXinerama zlib libXft ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index ad568863d28..ac9b56f48c1 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "10.3"; + version = "10.4"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-rKUj2XeVI2KdyCinwqipINg9OO0IhCSFBjSeYBSMLcQ="; + sha256 = "sha256-3AwUfx8IIWJO4uVAhXJE5Oola+60VUpXUwmALqJo2vw="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 741a17be9ee..0ce868ada67 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.5.4"; + version = "0.5.9"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "PGrx2JBYmp5vQ8jLpOfiT1T1+SNeRt0W5oHUjHNKuBE="; + sha256 = "e47aaabcd940b54962625e224961e9b95b7f18b99724adbb6334cdc549617389"; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index aae492c63cd..7cfe873a44e 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,7 +1,10 @@ { lib , mkDerivation , fetchFromGitHub + , qmake +, qttools + , curl , ffmpeg , libmediainfo @@ -10,7 +13,6 @@ , qtdeclarative , qtmultimedia , qtsvg -, qttools , quazip }: @@ -28,7 +30,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia qtsvg ]; + buildInputs = [ curl ffmpeg libmediainfo libzen qtbase qtdeclarative qtmultimedia qtsvg ]; qmakeFlags = [ "USE_EXTERN_QUAZIP=${quazip}/include/quazip5" @@ -38,6 +40,11 @@ mkDerivation rec { substituteInPlace MediaElch.pro --replace "/usr" "$out" ''; + qtWrapperArgs = [ + # libmediainfo.so.0 is loaded dynamically + "--prefix LD_LIBRARY_PATH : ${libmediainfo}/lib" + ]; + meta = with lib; { homepage = "https://mediaelch.de/mediaelch/"; description = "Media Manager for Kodi"; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 184e09a275f..230ec3182b7 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-SumAHliY2cX2Q1umyw0ljCFmgnGKKHqoEFGglNJ/Bfg="; + sha256 = "sha256-ohfC10U7srs5IrFWPF5AKPwXPHaRxlYRK4ZZ0pE8tEs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix new file mode 100644 index 00000000000..fb8d407ef12 --- /dev/null +++ b/pkgs/applications/misc/plasma-theme-switcher/default.nix @@ -0,0 +1,42 @@ +{ + stdenv, lib, cmake, extra-cmake-modules, fetchFromGitHub, qtbase, kdeFrameworks +}: + +stdenv.mkDerivation rec { + pname = "plasma-theme-switcher"; + version = "0.1"; + dontWrapQtApps = true; + + src = fetchFromGitHub { + owner = "maldoinc"; + repo = "plasma-theme-switcher"; + rev = "v${version}"; + sha256 = "sdcJ6K5QmglJEDIEl4sd8x7DuCPCqMHRxdYbcToM46Q="; + }; + + buildInputs = [ + qtbase + kdeFrameworks.plasma-framework + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp plasma-theme $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/maldoinc/plasma-theme-switcher/"; + description = "A KDE Plasma theme switcher"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ kevink ]; + }; +} diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index bb1b9213fde..d478655eed1 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-yl4R/1flm2Lfvyh9PXlJcZ1VtnP8nBQC0i7zs4U+g7g="; + sha256 = "sha256-70fCyxiM4CiNuG4Lqr4Tq0FHak3wDcp8G93EKYj+0kc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 94af6d130b9..25f27bd5063 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.16.2-mo2"; + version = "6.16.4-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-o2TtkoKa4DQ6tM1GdKVEmkWoJvnvxQc514wwgsfTDnE="; + sha256 = "sha256-OnKz/Sl/b0wpZ1tqeEXhNxNNmQJXBhv5YNnKu9aOVZA="; }; meta = with lib; { diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 3b915cae5ff..88b5046d179 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -27,7 +27,8 @@ let # Courtesy of sternenseemann and FRidh - mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; + mesonFeatureFlag = feature: flag: + "-D${feature}=${if flag then "enabled" else "disabled"}"; in stdenv.mkDerivation rec { pname = "yambar"; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = "yambar"; rev = version; - sha256 = "0d8n9hvmxj7759pfqssqcl9wvb986qsph8bnjsjm9bf97mflhy6d"; + hash = "sha256-zXhIXT3JrVSllnYheDU2KK3NE2VYa+xuKufIXjdMFjU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 012c18c1918..79496760915 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.2.1"; + version = "2.2.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-nO5omfUdWQcvWmYfoGBHRpGZ6ihEeB6hyvyWeWVizbY="; + sha256 = "sha256-gCnIEwnwlX7Wy9sjJVtKx8HhtPAoPMUOKvl71TQn6Ew="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index 8bc0963338f..842cbe30309 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub , lib +, nixosTests }: buildGoModule rec { @@ -27,4 +28,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ratsclub ]; }; + + passthru.tests = { inherit (nixosTests) blocky; }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 5cc9fb612a3..6fb29619ab9 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -91,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.35.101"; + version = "1.35.103"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "q5GL6R87b3iYLiM9oJQgCOVeXzyNFY6x8fQ9KsDN7gk="; + sha256 = "UgperKruN2quKdFTf/iTa+dd2GB57nt+mu6KBe4VvYk="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1da699bbe98..eaac473bfdf 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "98.0.4758.80", - "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", - "sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi", + "version": "98.0.4758.102", + "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", + "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", "deps": { "gn": { "version": "2021-12-07", @@ -12,16 +12,16 @@ } }, "chromedriver": { - "version": "98.0.4758.48", - "sha256_linux": "1nk3vki803b30mc7ww911l68jfxmpp6mddyq02a3f68893qa2mcf", - "sha256_darwin": "09m5vsqfn6qyn3faf2p0dldll6fracjg6z81xzpyp2bh9zp8vk82", - "sha256_darwin_aarch64": "04lnbm9wiaz8dlc4qigxakcwghhjc3wvahvl5j80k8agkbv7fdvi" + "version": "98.0.4758.102", + "sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im", + "sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny", + "sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l" } }, "beta": { - "version": "99.0.4844.27", - "sha256": "07srkycb92sajbxcjbwgjcj0xgb17k9i4b7cg50dvz3pwdvm7y8y", - "sha256bin64": "1a3a66kmcim3f8wvi19330m2iixxngsfiwv44g8zz51qk4rg4wx3", + "version": "99.0.4844.35", + "sha256": "085vsfp08y4vmv73z37ncynvax645qm302h883skx9xk4yyjkynj", + "sha256bin64": "18kys3f0zjkrp1x2vkcc9vx6vhj5yfrpb88lli7ql6q9b0ijjjn4", "deps": { "gn": { "version": "2022-01-10", @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "98.0.4758.80", - "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", - "sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi", + "version": "98.0.4758.102", + "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", + "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", "deps": { "gn": { "version": "2021-12-07", @@ -56,8 +56,8 @@ "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" }, "ungoogled-patches": { - "rev": "98.0.4758.80-1", - "sha256": "0a8y9yz6xyh025gk3dr0ndrdwmrslhd1ph2f8nivmqk61j7c2g8h" + "rev": "98.0.4758.102-1", + "sha256": "0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 5a38d9d8d7a..7fa0ae18549 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0b3"; + version = "98.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "780a8e746a4a638ab9cfb69b1dca27135cdf64809883551c0e79e0409487660a"; + sha256 = "d572a56bbdaf004ff33ca5ea1079680a2af9b5b8ba9ca3989b34ba6d5d34abbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "44b86759ab9a5bb675d9d05029cef6e0be17eecbe140ad1ce5d0fc554a8dcf36"; + sha256 = "ac544b28cf44236f1d1e46ee5e1b3484c97cf732bc857eeae3682b501ccd9867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e4d73a06f2a918395c0428c4190cc080dd03a29a74f1677f297b6bd65ad488b3"; + sha256 = "18eff485b959812f916f6925d4adf32a30e1fd3b82040db1ffb1c03aa9e76a5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "256f2b6d21cccddcaed24b511f71ca4bafdfc08ce989ad1eef45ab9bc009611f"; + sha256 = "cb33eedbc186386dbe5bd96d294a202a3f4d43e72affcf62b2f5608580262902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "bba26f8b77d27c03a969e08d8974ec9f7a85e0237ca3acacc884f945a9b18832"; + sha256 = "34461a0d3e89768cf951f7a1d12a61732a66b38cc7f4493b028b1c49f810e265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "da1c22e87189c991ce27929abe2172ccce6f4a25c44e836ee865550e259e6218"; + sha256 = "6a7084f81c269b572f4d8b19ac686a97187be217e1a8e1a6d993470f60374d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "183bce430aa7ed98b72eb4492c5a9cf76a2e9961069140f272e438a5d20debc3"; + sha256 = "85b951a4c3a9f73f74cf4374b142fe86306e26480461e665fee92d4d920fa716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "145c856566f9063ba861ade8220071623df793b279bf2a3821742f9e0023af74"; + sha256 = "03de393f231f1b54babb254a139e71a051861656f050f31605a8351f2a33507b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "dce9827d70a5a7d182316d7286bc6cb4b5442d65bb5c3573d04b235b4a18616a"; + sha256 = "ba3b9743502aeb38f510873854dd054ba21250394097f12b2f3ff8883c6c1e97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0df80c30b78cde55015fab74763c7606f75eff72804166b5095eb321b51fa4da"; + sha256 = "56478d56ef1a6e4340262eff9f5f64925aa62bea4774e41cfe97069760dc3505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1df386c5001327bea3f5675acd52946dab3d0d8ff0bbcf65f8b291ac26a565d0"; + sha256 = "b76eb84e8c2282a7ca11cd3208aa4445b52ff24fd06e0f4a2445b326c71b42c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c271c6d047c4dee3ea806caec31e2719acaa55aaa608ad86283de45e22cd05f5"; + sha256 = "4f9325f1d1fbaa28a5be6599e2db4f55e69e5e10b0f11496e1c36e83c50ceced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "30a2deb4dd1bb82406731f71001950d01ffbb9aa7a24f333e8f322fb23032f6a"; + sha256 = "1f110c78565cace8c1def9c0343c0d4b2a0632d25a03fc0cda9462daa8292d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cbf31b80937ae4a425f4d5507a7f654958e7e93a6c12683c08982a3d14d2ba9a"; + sha256 = "843ef97f99c5d0396485e9821a0600a2f2a724ff76b147c7883c3b05c89c34ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "72c098b2512a40ce3437f7d329b46e648e4fd6e2d2b7ecdd1e3478b090cd50fc"; + sha256 = "52394ebc3694fefedf33a65626020bf78610bd8d8fd732605f254d0532f3e804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0c05717640e8ff2e0fb52a510dcf3a35db34b911cbc85d2721e7e7e6307f0083"; + sha256 = "5952065bc634b3a008798ac329172e68eafb9c18c84e99520465ffeadd36ebae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c29f815b19cc03e7d628fef8c86e4f06862e268b760e230cc7bdd04c2618a852"; + sha256 = "7346203ba006416b010c05ba217792caa53fe5472b1239450100d0d75b2be301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6968c6d591a3b43e169dca16628eb4675b8803b90aaa8f605ae35f2115a75d3e"; + sha256 = "272d56431cae04275648d25cb9b85c0d555cb839eed6bcd9bb8c088ba4983d58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "47a8cac44c7d813f23ce263e698dad6dad44181c570055973879e57beeb82ee1"; + sha256 = "5ce9c6d56b286aacf049580ca971cc5737498f62b6a9c177aa7634bec8ad13e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "476fcbf047743ea61d6e68d37a1bf1203d239667faf98abf5192f15e1b13b927"; + sha256 = "2624a40add509da75dc22e8438147b7556fab463dd44793b918bd91826a5a3f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "26abc7c1e8aeef3e4898e1dcd120651dd30400a6da9a1c2af5ff02b1b406573d"; + sha256 = "bb91268d5bdd7ca82642363c33af05223375596c4b2d4cf51195d1478985ec5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "66b299656f71875f59287c8da5a3c2b0bca53fb69ca9b0f7a0402ad1eeb1aa87"; + sha256 = "5c9e84e4116e2d65f87a8959bf384b51e9e1edbaab165d506c9e8051813bc767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "37c37849f3d7125da14e3a71c8a9fa522b8756fea7e3e3f8a5792ef7c3285466"; + sha256 = "389b11d44e6b50684e309b89bbc7baca1e86a2be26c3809b490b77fc3ccdb48a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cd3ea6fbcbc947acbe1767be78a14fdce4c03b0b44d53e3670a0ffc5ba14dc68"; + sha256 = "fd1a3ec9000492ddd64eaa2fb60bcbbd2a7af8b4fccbe78690378eb9ac365c07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f661d48a11f66fc326e86126aa5c0de37311042a454719cc609a1c7ff102e423"; + sha256 = "788018660eaf7b02a5e0279447e508863ebb75fed18299d4ae0279cb36f842a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "056f25729222d95316034f0365679ff449a58e4d77624687cf9417e10b52085f"; + sha256 = "3556d494d08f129aec339642a28dcae9f051cb0baef4344cf5bcec7326186f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "64da785531a3e2f4b8179f3e9b551723bcce4c1210e184a03c98ec3e2ff1e220"; + sha256 = "15a3d9d872d3e2e3ef2a795767b64a495f4b992aa72a80558d67b8f294d5b959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "34af4d1a91b7e09e80d2f89730851c508521d6518b0aa2d3ff1924a34f7efba6"; + sha256 = "9bcc96e62902977cb2f5f10fad4ada00c19a453d4c598787e92ce4e54e6adfdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a1b50e3ba15ae806ffd89ef22e12ee85ceda1eb17f458fb7e8abd6c4355a75d3"; + sha256 = "b0cbbc22406961bd076d0a8792e7a166280a52e29804129db8c39f5f24248fe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "90ec59ce7774bade28052f4f8b5861476e3fb52878e48c8909d250fb6b6e17ad"; + sha256 = "d82729e8551f3d4e9782d70c30e0aac3d1033acd57c0bb61c3073dfc7d1e8642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "3f09ea9568982a451798dece61a8f19131c4c88e98e2c03b1808503051873e73"; + sha256 = "66de45bf96a23242566ef04ae6e402e08b35964e42c704e4f4350171f28e3b74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "a483b0aaf523fe404a6b3ec07611812a5160cf8a5c05b0fee1afa6838e1949a6"; + sha256 = "851ab51c00f3e59439dd7f482fa3361634600e5c2b63be5784472df912288b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "12e17583c8932cfa6622ff68490e29d9e09d6862e8443ee1cd1d72f21f6516a7"; + sha256 = "b1857154f9a49ac0acf8e99bf2491af4dd84cab2b1f1965acdd321311305c7a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ac3809a3344ac239183a68551eebe5689c53c11c0a399ff4a94452a35ad86c81"; + sha256 = "59e4d31c6532096215b223f41a3a5e59c29db0e9007d8b26260997878223efe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9385c2bed2d3aa9b65651f396d9a2c6f8762dc4295319757f949fc9f04a6c717"; + sha256 = "56707c16711c7c90cadd66eaf3084498769827fdacf6fb73b4eca60185c1b2d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f65df6f4d93a39b5bbb1c4c7827eb094a632dff7255b78affc7cc9794a28d3fa"; + sha256 = "afd4b994549beb079ec0d04669824904d7f16e9ddd9cf323095ce32277d7865a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3cbbd914559e96205e665ad46cd9ba193428cd8d83df90c4fd4849cc11db13be"; + sha256 = "1e96751aeee49e229afc0715d2d1b93f216b159a716075b6481d59add59c8e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7b27f83190cdb84d2d9fca9bcb37bd1128086adfe772e676141fd9960c0de872"; + sha256 = "2950aed5bf345de03873a8a0ab35885aa766a88776213d5f58798235e8130094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0194000216bb517390d301166c37228e2128f3b15280cf21629fe13de5f536da"; + sha256 = "6f4afd656511c8cfbb933b8680ddee2bbf3ff584021193058e7eacabd152cf03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "24c92df984f7eff4f294e27324420b0350c4069acade0a304a3e433ea11fadd7"; + sha256 = "0b9cd7febe314aed67e85fba904b000dccd97d983e944a093699d80eb53134b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5a006adead9f8e647eaebbef8ca56a47116ad2fd1c308c4986aa81bf7618f815"; + sha256 = "6a122b779d99bc42ddbdd85e97649953185f472c97d352d4e0f0cf96198bcca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e8d87a8ad9033793e0c25c8954ddc4f405274468a572f46af494847481bedf11"; + sha256 = "551b20cc433c045a4e28628498548f6cc114998158386062be926238b674239d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "47964a5caec7f8ef0546ecba49e0d995dc9f67947fbcaafaa02789bdaa75e6c2"; + sha256 = "15f1814fb99544f7b093ba6cf6de98be069696175d9ccd93db049b8e0a723a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "67f89985f60d21b04a9a20449d38d673c45e74e82a1d5762d82713c02d3e63b2"; + sha256 = "bc89304cd1f68d18de7d8711f334a14d972c35eb4a779e212ff470157b15525c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2716ce5bcfaac25456a144eeff6e6b173600d08016574812abbb315a4d001ca1"; + sha256 = "f7a85d9d1d529f245d456eab76ad26cecb6a1d58a5da15b5b6d20544af989772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c028cfa29f0ea60f284d749dc9818772c074efe3d295590a34a3d6a4548a8f7f"; + sha256 = "f5b6c4ea7c8817f9b8740aa0954c74c7cedf30e659bdeec4b9b468ac7430ae25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5bd24eff8a4d95f27ff8df44d014d007c943a54fd1b5689435a1ce14b7f61375"; + sha256 = "24d68a73da9e817f02233a4c39e1a6d56aa26d15b17a964de0d10cd65ff8f6aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0483ce90f8702febedb73674d3cc23348a4e7ef62445084430636f0c4c1fb287"; + sha256 = "86f7e09688943b242a83bda19b770f4720aa495c9f8503a79d22abb8a24793a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d7b41cb2cd6ae22547d2c4d04dcadd5c4c05a4abf2b51d495baa749d4a2158b6"; + sha256 = "52cbbd83f54f4e93b08d874f7f68cdaa168bb663c10c4a3534918bfef4812793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f5a5a825787fef1f8c4f2a0f0c013e8d39bf1a08c4523d79069c5fb335c0e5a0"; + sha256 = "aeb7529d9a7dc88a23094589fd30c04f2d1366e5dae9a92bb16a7c9bbaf476ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "64d8c649de837049c2f0f73736a74f141de5bf426e11d19f4e0a5553cba6412e"; + sha256 = "9cf3e5bf609bd86f7cea748df34279fb9f421e76a3e3935e33e5af1b3ba32f06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "01ba137970e9b538bc09195dc3da66927b56fab6204bcab60a85e03055c80a0d"; + sha256 = "c6d6d9524aeafef73aed12d2757520903a53deff32ddf55873e038f1a1b3e37b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3a6b4e12f88226b0f19dc066a0f11cadf5a47d87f38540cbcc9f34e82c54290e"; + sha256 = "c238bd3d49236ccc80d85b8ea9a5bfe95f7a93bdd9fc82f09dde2de314412027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ecb9e0e63eb778892ce15d5df03e50bca8948a6e8dc3369b030cb716b172789a"; + sha256 = "b34c10751ef34dbc41157711fc4f02c5c9d26104be971b1c9001704c2e695e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "31968f898a8916705c67e71bc5010cea11bb43e544f27febad644a624b32c773"; + sha256 = "859629828f358f3b7933f98292f3df0047fa012cfdbc4db652eea0fcebd944a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "105f4f83a1e0ed15e568a218d49fe5108462db67cda228e088cde3679dd48e04"; + sha256 = "ae70facbaecd4b11d8e39eb6b40615c63e37eb9020933b443326c3ec6849277a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "37932385223cebf7a3f59c362c2abfca321bfab0fd6e5e3da6daa0ec76257784"; + sha256 = "63b939612cb311aa31b9f2293e82cd0aafb1a857318db2f8cb022cd0d868324c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ae5c8fbc88f15edf60fa1830ca19d32ca3277194c0669717360659da5ad07b68"; + sha256 = "85c8edd159ad5b2843673a9beda883a349bebf1133ad64fef2685a61bbbb8d4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "104cdce0099e51d71d3ae3b8fd4ec40a256d893450c8fc905035480be5d675d9"; + sha256 = "fa5d9116fbb25a8c1b816357de21aa8e376ee0983c12ae6c842c0a015071829e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d2e0055207f62681e4cc9c11ae1cd986179af1581af0252604762eed6637e726"; + sha256 = "e744ece030a07f84c9cbf8a952c5dc2ab8fc3cb3889405978f79665917ab62a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "8b03198b1d6424a1cd024fe17ce62a99c8b1b8c41798b0e229f802752a3b4551"; + sha256 = "466d376a9f0caf60242aa0abb945b8899ac9d80080da3c4546c74d9e2e6c131c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "5f5b132f3292cc0938e28f2c483a03b8ec76a95a306d3a928f2a2bde03f3af76"; + sha256 = "c3077f608d9a5f655b50a0a14c024f5f8bca2dd6ab75901915fc379ec5e31311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9ba3cbfd2061d15356ebee861bad6d78be0cb5f4ea0ad9a13170ecdad67981a7"; + sha256 = "de64870f7300f66ec653af11f4d38320c1b63f6ac2bcda3b7d21610ab83598e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "700d224adc519fad23798afe919538ae54d53cfad4a74974ecabdf254afcffba"; + sha256 = "91ecbb951fe4d987b226b40a9bb7efec4119cb43371fb57c98deecb538704ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a75fa004af0cef3548238264f7997ad60bcb46d415e3e91ff6e9b16bb86a4a9a"; + sha256 = "bcccecd3ae6b89c6972a24d41967d20b487d55da6d0d489de0e69da6d9e95c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "614d82dbc762f0ef2f565d95e5bff8d4212f8fa8174f294877e0ce155d75fb09"; + sha256 = "808f5583b067f74ed584804ea4a32ca86bab336f808944ee5877c7a964bc84d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a6b8f0c827443f32c25c478aa11981d714a57fbf752891c2f018fa9542820e6a"; + sha256 = "2bdd1003f0a77b0c2d3703fcf952aa82dc8e0e56801945810fbe2343ff45c4f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6227882b432684768b739058e7f1aa15e92157348e19b36053e70255172f0b04"; + sha256 = "c31423b965a44848021ab8b148ebef815451c706c0ed21e2272cc4d9a6404fa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3b2590ff70bf7cf8998dda933506c86515ebdb81b031fb15f925b02d5cf88f04"; + sha256 = "ce8dac45e0643307e3664f529fd8f22a80e3089bb17593febd730bdd554920a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "09bbea80b952af6eb5358b2afbc785afbf04ee44a27b38f2f72dc6fa49417086"; + sha256 = "1dbcb8f8a7097cfc9d52ae1702bb29995f1585a0e817a0bfc587dfb0779cf975"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "f0ef3e5e72fcf72ff49a5b631bb9216363fb01440da41d939e4b653e84527694"; + sha256 = "3549823c524d86ef0b60174425c49c6fd91bfbd8e7f8dce371eea882d0e09fea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dfe183f6a40d50e3871f632ec79f397e302fd130c43af2c26c6b24acc114c4fb"; + sha256 = "67b85d1b5229e7dcc0207ece3fcee3e5b3b086086103ceecfe34c80333d4c2c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c12fb2fb918a38a39655f3350676f290151e2fd6e44acff88379f3c4752743cd"; + sha256 = "b7ebf1834baed814479bc2471ebd1090fe9f662b80cf177542cb0cf118f82774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "14d1ad150edaa100c535c9b007fccd3bbfc0afe09d3035ada361c202ab31cbf8"; + sha256 = "bb19bcd207a6823c6ca304f13acbd7640aba4bb9fac14a4ce4fe5a3280823091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "cd99ae37b4e8552cae7911c86f430900d8d21c96264dc2940c335cc050b8a62f"; + sha256 = "f22e4c6b8024e724dc2bf09bc1f7d66109551a07acf9c2c638165ecc6e9280fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0cf0c23c90f24ef417b460f57b566b87e06ad11df178ed3e7006a7a7a8acf7f7"; + sha256 = "7896e4fb06f0566f07069f724a0e1e96f9532eabf76108efa92738a92a6ae8d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "58bc7ea18c851d5a88c047bd41b836e9beab1f04289d0fc33e0b1d9fd7e55b3f"; + sha256 = "3ab3b8ccdbba37af17943df1d5f5b070a1c3826a55fbbba0c71a1a3f2342a3ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "13914c46edc3e5da87c394468cfe83f0811359b2d30d6572b1c3c9726af45c3b"; + sha256 = "4dd9bbca09dab4c57edc9a3def8fe768888f698e01186a5154a9b5fdcf68cda9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "818fd12a70a50061c507c8e06d7118ea7d1062ac905f8b70d31010710df642f3"; + sha256 = "8db73e84467ef07a82f75224e36d4038fb29bb3d6246624cebab9c645a65d1a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1d70241ed0cc861c79165a770a73b580496fbbbb6a2530701c02073c9995fc4f"; + sha256 = "eab61eb7a5d353ae33573be8eb37c141820e545945229ab9db248263b7033c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3b906867dc5a0ecf4dfb0e034c8e97a3fc39e5d0531ea483c8a408b32df860bc"; + sha256 = "41d282f7d6ebd9e0a084c4a4e8e7f6b59a9433feb4c006c5ada699a4e4d2e19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b23189c437535a4fad78bab37b81d95e3fe5774a8c3c4c6bd6d77d7f785d2e30"; + sha256 = "8213721fa3601bc529f5fc2a97f7f64adf544b994c607947e94e104d5ff5c96b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "08dde33689c92e2c23971b0aeec581ba420b502a118c45799e35d52087113055"; + sha256 = "f8ed04bae5dd80366ed92be6437b01887310d914b306b172e303da78a878df0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3a099e8247e4f15879233624489f4df971493bde2019f47a18da3523e0ba142c"; + sha256 = "a9dfbc40e42b55ae876cb44499ed2b245c184acc4299b358fe6844c6f80092e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "94497a259e974c3c13bf2a74a4a91180710b57402fa47bdead77cece66696b32"; + sha256 = "8f2f3fcfef222377dce579308736948dbfdf29e7a0aff42a8b553990238bbb4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "006458ee81bd21b2cd3acd5b7893e90cc97233a3507b2247355b183164771502"; + sha256 = "900de26055afc2ddf81d4480deab7711f0232ce034fde90f01e7314526866eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a1173235bd09193a5fb6081db6af934ac5cea619bcf612c244423cdfaef75861"; + sha256 = "f1b34ccfe1a28f7c3f9ccb1700ec91c2c8c0eab45b074dc38386818969c1d945"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "ce6a04ad52b0ab49fd4db6724fe43c1f054fec37fe2434536985642fba1999db"; + sha256 = "7458224a8dfcfa1480ea95a4dcf6dfdb62d1e9576838820855cb23baba23bb94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "10f31d9636f9124aefd213ecb06da9be7ddfe70e2413ce66a1c1f84407f33319"; + sha256 = "6441f1bd46807575c11b209a35b9f5003d418c7ea439ffa8c7abd18355635bc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c83e8170ef55f271fb9c933505cf66d4e42eb8973d6e1751c903ecda3bc92cd6"; + sha256 = "c65364bcb6078efc0e856bac29ee758bceb016e838cf74723768de3872e57e71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "484905693e9e952a56627561f10ab429e7ddd2df5b534252f60aebe52ed41b95"; + sha256 = "3ae90a452b99a039e4d9590d92d4c58ce5684c6237c1d3bf7679ff3b422c99ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e17d15802c8d94770c6368aac7d46585483353053968c66f40f326dac00587d0"; + sha256 = "4dfffaf009936d7dfd6614c496fca8884076293122cae401255ef34304176bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e03b1c472787bf1ccf33568435b7873a4d6e8f43a0b82a01751995e8ccebda9d"; + sha256 = "7fb0f40583398617a3469c1a0ba5a83443857b872b9b6b0deeda957b3796ae02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1952bac0df8fb98273d0a4310f3141e928e6718eb1a91baed6d692088f041171"; + sha256 = "4b943e4439c8f07d3de7f9ac9e17b2af3a1d2a29bd4b917fd11664e1ea249e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4d3a70f4cff2d11dccfeabe15c30ed99b74bf5058ad8f8c795d9bfd2db1dc11c"; + sha256 = "08dd3aea42b2589fa141aab23d5f9c925d57cbf45619fc9b7b2d64ec13e29dc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "dd1c33d8a1769f2d4efa39eeb248a7cb6e2993f4b3bee38884fd997d7f20e026"; + sha256 = "b1130919b88f96d866dd54938dfb63250df118a6861e8a0eb8b32943c027ca33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "623926088fa86ff736832cb35044d7d134ad1f4ff31666ba7dcbc31619c3a07d"; + sha256 = "9f1186860c19e4f6301ab0bdf39c2824038bb14b225dd8b8e43cca5b838ca92c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6276f0e417d45cad209e0f57ac0276f52854f5172f7829684e4c8a49c0e78fde"; + sha256 = "70e66f4edb9e6c39b404205094eed21e8df186571c581f67f8176c78d5a41098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0412368189b73bf54d5679c22271ca82f47c10ca1288431fdd16a42d51cbfb21"; + sha256 = "7a133f4f6ed1b67715ace63839dc2d4a1dd79537ff168177ad5a329d4c482292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "67060ebdf9d7ce14c45db9edd588f99fe0485971674f791691766127a656575e"; + sha256 = "b8b214903b2aca2b0e5d4de1f152e67c5a71ac6917903d92f2000629b51aae97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "2c79a9307bfee1727a19cd212fed10ba02d31ef49bd68a51cf0ca0a7faccf2ea"; + sha256 = "884696456c121f511b0661bf9972492e01a23d3e106b00c219c598855df7557f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a6ce4fdcb3716e2f70fb83502fa9e9e90489ac58d26a25627eae7b8402a0562f"; + sha256 = "676ac6c717cc21496baa6135d18bc7cb625e58c3e12c261bdac2a99401c38ec8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "21e4519d0403bf3e158eefe6c79d8283f2cc1e0875d91acdb995c0e83c56a9a9"; + sha256 = "c86f2615962a16d7766ae21598f82caf77f0cea341e0b931dc1b9ed90a9c2f02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0c1eaca5b928c2a1cc5a60a2dbbd624280ed2b55f10446bc886158e95af39199"; + sha256 = "14875cec0478392c2dc4c79de855f1c338e7737132f6a4522e65e02478072d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e7716acc8417dbee838710d3efe670e081712ed3facb26bfa43864a574463ff0"; + sha256 = "9aa8bf0ada8766019bf9c6aaec64c005239c3d9d82c494e81ddede4f822b0bc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a90e61e0b5a31ffb7cebe747e8a6512e68baba210f234913af1ab8e90c79206c"; + sha256 = "a822d9daaa748c6f64628dd7f4fa2cd0b8bdbf57a77710bab2cce990aa052874"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e75ccfcac893ac7d54d8cf849044385ed0749de77dd53be7a1b1686949a4699d"; + sha256 = "209a83d4d7372b7f2ab578622c3e77110929bc4a1d572c2b3d084e5c2b183d90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9c2286f7cf0d5052e44ac9aacf139e2c8abe9d212407960663819a8aa8436bd4"; + sha256 = "20258167e5f470435d01fea08faaa1854872d5bde35c3a48e4028e8a61e5e894"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ceb98c5fb103e80488f8821027144b0d7124d0f76d360b6139308763a1ca33c4"; + sha256 = "948ed50f652aa1f0d16de7923b29d6c4ae1e9f87a16cf4d6e195a94e7c0bb196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f648e363da8ec8caa13ccfcc4d586efe0ac4e0b0d3574d295c95ac81dda937e0"; + sha256 = "65eb92ee9f63176db9efb700ce8b26c2f9d1d4a4ce2d66ce2b12bf0a083f0db4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "06b61c45238b90f8bb838193fb5035dc63c48fba416f16b7ab9463597bb92ab2"; + sha256 = "ff3d52f5060ce6b69a52ab54baf53ff767a6a948fc5385b38452ff1ddd32d10a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ae0ce800b1455aa4c607123ead63edf228a55f4bdac14c267746cbb640f60418"; + sha256 = "d8dedf187004a64a6484657230796066be8819be188b6c73edf23a2e516015aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1d7f47bdc98efaeda62dc2f3d1d16949a8cf3de96dcf87fdc30015ac7fdbbee5"; + sha256 = "5f6e10610a2f3431ea75f36b5abe3a79ae2a877fc912733be7b7ded63c2d0434"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4a24c3368e2f88f75f81af2e17050e41160d99b27720517cc34a7772533ddcc6"; + sha256 = "c6bfdb386e2dbef46666582b97057dc4d87da0a3da708f0834cbfb46f01553d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5282d6c566361c74d5fb8c8d0f992ba5e929f2183b3abb9d479d7f1d53470dbc"; + sha256 = "d657648c3bd243d005b7b8ae9b720c3dd14ebd7fab10a5aeda332abec34adae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f88988016fc2a8fa5543822d6fb1ad84c57f8f0d8ed2bafcc63552efb2361085"; + sha256 = "653c7ac40b697418ef9335b5d84b4791126a4d88499c7643b8691ec7f7f2674d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "252a9f2b5b99100abcf4ccaaad9982d48ebf903a7761d36e2aef766985fc0ec6"; + sha256 = "caf1f6164adc422f9b6d15998acace1644b3b7422cc049302151e3edf060c8c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8e67fef2d4e2cf87a2961c7deebd244a1dfc7863e8474510aa196d54e199b4bb"; + sha256 = "a500f80b351209b849689cea6eb558f039c2ccfa2f88544473c9e6b6592d5d73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a687d4abfeece55bdc35bb000a802ac6a67bad8af6cdcf88802b7d42c486789a"; + sha256 = "4c3c78cdaa65537de0577889eaf2029981e57b70a079111f26a53cc28ed234c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "27819a8e87dbce94ca4bb2b3465153c6ab974c52bb81b2517fc685b2089548f2"; + sha256 = "5ad92e4c565807f377900c3c588b2e7090335259bb529b71af45b37b9a081067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "21cb440725cf0378021b4a6a858fa3d344b39292a61e4a774d065e9e41668e24"; + sha256 = "c5dd205aa822a311fcda06018ba79fec68ee8c2b05d5ecad1d2dcb103da87509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "ed0bb4aef9a5ff6790bc36f3ec45bf140ff23343a36716bc59fbdf4cb31c0976"; + sha256 = "613140f6f288290d93a0a41811372a46debcf9de05dd1858dcc5a97e242bd657"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "436ae41521b50068bb5fc9768936c4a4b77bb0a37f48ddb84cf8946a4a7ea76b"; + sha256 = "ab6cd6c4e09cf5dce87a5f072068b7c49c203296a5ce0c32fe41fad4d4fec495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "dc354dba3016dbe13ce744fcf654b292254c8fc0f53e55218952c6fbb961fcaa"; + sha256 = "93349da0b0a1529e8b5855519175f61e064445572b9acbdaac68695f7157ef14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "87bdfeab9856f13736ead5c3157d05a5d0b73c27a2ad0d7537bb63d994cf9703"; + sha256 = "e5d6800770146e6c1e4cc4d91202ca4749b6d922ee5965bd82a6acf7448f2677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6dd1f7fcf13e9c651d3359eadb1b8b2c13aca121e294ee5856f663a712438ebb"; + sha256 = "22aa961e8d40f0d4bface131a19ff0cc0f88b9f66bc9b63c3038ae2b878cadcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "fa5e600d2cddd4c93596baa0bce310cdfee9eef12df808968972382bee32f57e"; + sha256 = "722ba0c78b51491d8943823e0aa972147c0504d7c65dd7c5eea29377abcfc571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1b277fc9646ea8d060c1bb554ca04e42b0099c70a44e697990ac4289712eb12d"; + sha256 = "96b12801ae70101cbf4620e1fbc8e4cc074e4f07017179586cbc5ab208fe9f0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "370329076e609bcccdda5f472b334cb8dfe3df0e8eb696d22aadaa44f8b0b539"; + sha256 = "cc97cd08c428bc52616f6db25e9dd50f9162c29758d6c44160ebdfe745211d0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9b9e685fc94652195b00b5a959e48d81142b7589e0ac9d163c39f07cecadf27d"; + sha256 = "982fab751bf71de830c9f5866943962f3095e70c4918f65201f8f51c99070898"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f4b851f9a39fcdfea9034edf0f4930632da04d9a3b949c65b682e30dac63cb45"; + sha256 = "c5e9739a2b8f60d578a8a1f22f947d25e8eb14049ffdf57a3948a50e34400156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e72943c2f034282b73aa136b272dc7e7e9d2bdda5b2c2db045029f05a0e8b14a"; + sha256 = "7441aeda63c2e90a26a342c80846a4ea0a48d4d4807aa2fe39337401d9002a54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e2451341887d6dc51f3aee8c8b9a7dc65277e3cc9df9e2fafacdf67da838e48a"; + sha256 = "83d26111f5d82644ba1601df382aa57da851f69284cc4fcb88d943a79fa5709d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "01a03a21f479475d224fa7559a5b4e98bf978f61f4e472a58b1d1d272cf5fb24"; + sha256 = "1c845264e89286cf8a5171f372930189455b3e2e0b959f8e271799c4bb00b074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b64c925beb57420c5c76c4c4ac78282beabe4a6ad7fee19bd6bd4a9af2153422"; + sha256 = "a8e7e5e6cc3da1aae7c016dcfd28bebf35b4f5ef9a4687fdc48175126dfd1043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "250ac76432b7312bc1173ee34a32d0e658c0ea658664eb296b7c5dc2c1fb6ca2"; + sha256 = "20b081e9f5443f247520f6b78283666c695c574fe3113384b81c8bc1b6e100c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "bc3a716efd7cdb0538714ba3469a5303a9496b0b1f81d43a41b55434c047c991"; + sha256 = "6dab96866f64e882c8b7a42c6b66146b9c6f34e0934304dd192aed28692acd05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c6d2e017c5269064a5716d54f5df9f2e2dfe621f9f24e7d2a9dd3bfd6b47983e"; + sha256 = "a81691a57dc6d64c425254688baedbe16589887e99a88328efa391d7c22a7cd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "0f3e2947b7e03ab0197af6817774a7e0bb11fd5dcf13df23ad3cb2899da49cba"; + sha256 = "e22bfd17a291bf7e890f80b054a9a608a8b7537a401c2fba0ea97bfda531a06a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "161d898a2d74fbb709fb3d19c7444c9892e035c2876f66384c920ae3f76e21f0"; + sha256 = "ff107e3b42e93ccea47c0f4b6fac05fec1904333e1173cfd193028b1c7a02ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "8bf24778507063352156caa82fdbaadfde5c840f2637196d87cd314ee89a3833"; + sha256 = "50f460b541ae13cd78699642e0853bd198d9c2604c74e1894b716a7226a82b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "77f1a913c4e2973593edf6982eaa767185ba4b8ae91c16b967e8f3c7e82d72df"; + sha256 = "13acea425da7fe917fec2f7daeea24f7705c6af770f02918097cf795dca4f4f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f4ae877d906e7427703df3f219c0c95abffdb995328a80de3b069cbc5eba4a42"; + sha256 = "f0ca828539b50b41c478b1c48ad96c3db25bf2dcc3eef5924e55b477b01a7339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "0d3371fe5359ec1d23dc58e00151ee81838c18a8e9fb665d48c3276ffa34809d"; + sha256 = "93b756eefb43ec5ccb8c2da88804ceff1388db4cee07cdc1e4d9e745b5b8c971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "7194d571e3cd92afbb8e19c5ecfe15e0c0ed4af28961008efeaf5e475ed8c1a9"; + sha256 = "5b4a364a9e288e9b83b0c99ffba35ebfeb37984e0d1b4fbdb9003f5eeb490bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "79a5a4d97a106dafb9ff6ede0e853dbbf24aafbc3f654f5b8244ba2a09ac6ff9"; + sha256 = "5b6438b6e2d27ed1e5b3139b707610f21b977b3080b83e5cec1375482124895a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "fbc2bd2dc236706d1e6599d32a6aef5b4dea0b2dbac4a0d59854205dc66c6958"; + sha256 = "882246ace511dc8b8daf9370d134002cca9c470c2420c7110325813c86ef17a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5d1b79b6be89b593f79982460bc10d160f8914c4544a802045562547b59ba364"; + sha256 = "d49c6a19ab9538bb731ea4b0bf272dd35aca39bac41cba5e440d9aa3b61497fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c55511e3e8546d31230e8735a85e9c2745d3358567e424324bbc850c8f9399b2"; + sha256 = "da3e2b86437ccebe811b1b0f7c79d8a875a9f682596cafc3a30d216b584d3412"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "009a89d79b2020f8e86a9d61b21b5751afd3aae053ce0c037b3cf303f528cec0"; + sha256 = "7a6889b3e6859ae3af55a5df7c7d13d7b52be3a8b0643ff9b14b7ebd436cf2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "06b51518cb8a3ef97c084f1cafaab34a8175b7efab66e16d3f4f1f7d72aa9df4"; + sha256 = "1a7942f57ed945628815b3ee536b892acec11a7d4a5c7ecb31bfb6c61fd05996"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "560b8a7cc248639361ba08996a477d2ef7eab0482f41bba67f0371c841ca490e"; + sha256 = "7eb32c26f0e4551abe340567558644a41c101edea66042eeffef299b35f53959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "cc0a12c6e2feab652d08d28a27b79a9481209f4c3869372b37f1cc5e27ff8e70"; + sha256 = "608e5e80d8e5bd48e327f1b827835ae0ddb2dcfb2921d33c1e9bb895da695641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "25541e2722cdf1621dc42ad529447c31c0e9e8ccf7300f87d89f2e1f91240fd9"; + sha256 = "9b9eb2dea61ac0dd76252321caa2afaa98a3c0b64faf3d1f354e9b9cf02b1761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "cde1314a8135543aa98a9c28c083e3f57700be9990ba2ef780f6dce4a8de6dd3"; + sha256 = "58217c4383dcd7720c7362839c9326c93e8cdf0982fefc4844b2c6ba66ea0360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "f85d1f85763fac8e748662d1b493cd06dbdac37960785cee0e8946daab10fae6"; + sha256 = "89f99e044b69d89219974772d385f5d86b64c9f12ba1ac9a2790dd61ccfd44b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "34ff1895eac6fda351b210ae65b2edbf837ca8a5a5592caa33750ccdf529c6bb"; + sha256 = "303ebd0555d448182167b9bff79f72dd7fa247c1fd259c3af0d1ee3f0f4e339f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9769e7039a980ae239d242fd6ed4438e7b90e1fd91f7d9ceafd52e8183bde1a5"; + sha256 = "f89d9021207399c9ba56db03add2ed8e10fca3b8273f2cc4ef79814730af9cde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "1217469bc4707454ece2ccb422e99e85724845760a4a78205753c07354a2d6aa"; + sha256 = "12d5492f712b993df46a2083fd2d3958da8d5bcde7e11ef83482b3d6c0c0e5ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "e70d4bb799117c0343a17f57adc733dac1cdbacf30dcfe0ebc195da3de091408"; + sha256 = "26937f627cd4c14bc354c9e39378e56ef06ea18519f5b6344ca6ebcbe1ffbe1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "91bff99d4326c16466ae3c4d1646f14cc8d341cf93c71db6dec117ae24dda154"; + sha256 = "2de70b33a112c662a158493a14e05ca45904a0ba9ca71d2416ba59ce81bf4192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4efb3b03955ab8cae4925704fef1a1d1ebc20c3bbdbb9332d1be31c2aa0f16a9"; + sha256 = "dd3b9ec61dca822106c3b88df842f0380a75c1262bef82be1aef6040df308e1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9c01453ebeaa772eb1ad092400ff6da05d6a36d901fe4f9ca9d98bf4c41d2d40"; + sha256 = "997a5202f5da86b665595b7f0a4c793527428c1d78c60831ac6b52961ee466bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "697bf0266fd4cb19e42619054795bacf4e9a065dfd976086b074be47038f86ac"; + sha256 = "80577c41032e229cba1c2130ef66a428daa0ce238a12f15e1815460c02f0fa93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "7314cfcd476f18054775d03d96787afd4572437c507b0387fe3104e272e66f32"; + sha256 = "15d92dd24481329ca8f742bd71ffa6a5dd20a4c6362dde813f4dcba663da65c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3fc8dc069fb41aca43581f3551a485f4659a760a275beac5087f479eba0b4605"; + sha256 = "59d49f04138c120b6f9e4ea8d9b902f90dad86fcc16ff82af47bc198635f5747"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "22ea3193fbdddec8deb897ad5551fd94ceb659cd8493a04db51525c29ffae0c5"; + sha256 = "3b82478ace0de50b1e9e60715da1e90f97e6e938577c75d2be44d313354291cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2f3dad5c917a28b41fc1ca3365316a281c6e6560283d2002364c2bddad5d7a52"; + sha256 = "62eeb120929b980e1b0c30a38054a84e821b3895f73be938274f52cb19791038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6334e79bb84d78fad334d9298c8104472ce7297c17d80f28144cf0751c42ac80"; + sha256 = "a5a304bc7671a16ce9e41158ad34ac7e49406740d22decddab2c5a004a76a8f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8fa05c175f271723e107ecce6d2a7d6b8e5afef5578ead1d6c8ece920d4b0a91"; + sha256 = "ed8e69b18fa20ff70effd6417d3e457ce4e820907bf550d9f8aca5ab135e12a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7b6751f8883c439f1fefa3b1c220093299f1dbd27b8a49c467113e8200849a72"; + sha256 = "c5d3904f8f09309b0c75f80676f156261dd63bc37817283bc21f577c99c900f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "81dced560a8048a4113c3a99ef72137174de6bff64a0ef4f0bd669f3d7f6d89f"; + sha256 = "e7b96b422b949121511e4cb289958c9efa96f0d0e3808e20a97aa03b4c441529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "692746c7919b64f23bc92c00a7e7ba60f54152430887b608b84bcc105a436a33"; + sha256 = "6333056941db9f5ae7679c3aa4213570f1add3f60fbf67729a97b7210788744b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "52f4b321e3e149fa0317d610f85b4637b464c79b1b2046ceb9dfe2f4e56b6c6f"; + sha256 = "05c050f50704b62324aa699856c3a6cb57e2d5bce783f9e39861a3cb92c7eeff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "3297b5b0d67381d1b7f9c4f76b767c6a5f76388d473afe5e9bf0df94a7bce0d9"; + sha256 = "6519d91cf5798d4b14ea3743ab4b1ce547031b346926b8504c16aaad61a9f023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bc1eae9950eb6bc6a79fd185835aaf7b3c9394c7d19bfb78348a1f4987315636"; + sha256 = "7abbf189b2229f911a0aec5fc294ac0efd9e7ac9d657aae08e7f867cd0128179"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fdef69d9e24c00616b177dba71e2c5db29f8c945cdba4c3dfbb39753b1f01a72"; + sha256 = "b02a4906ca96a545af361f5aa29437d3d4c873c3ca29db4ebb36fa2128b3a540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7225b70db5b568634792f18f0f6ddca4ab94e00b225942c6a4f5c4741ac9858c"; + sha256 = "b1cf1ce7d68359b1d18059434c0aa13ef9871a82cd3c3e81fe5bb9c3ed7249df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2c7f228dadbb2b3ecd424ab2e80a532e17e861f92095e5de5ded2006e79e9dc6"; + sha256 = "6eb2146f30a6e4b73f5d5ccff0b6a9483753ec135cafb9d16ee7d693de26f9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "63fec6dfd214dbce4b344ed347eeda9adb489707e06e6a4e1ad6fa828e0da7ff"; + sha256 = "ac7c65f8569531fecb469e37ae8728fe42ef0ab7d542be4051cef398c2db0fe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "8d584d48c4e35bd7ff1438c7a80e0b353bb4871ba946119c36f1fb3bd135518c"; + sha256 = "acce4ec2bbf346fa76c5d40a8bf3ee3696484b8de4e57135678a3a60ca5c3857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d5e7514a67a288e755d7ae30f2dd680e2138e50666fa15c1b710d0a454a51730"; + sha256 = "7260ac1017a5b4452b5aec0de30894c6619c5f480aa6f1df67a9e876ac83fcde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "1557cd8173d79820d852d99c0cbb07249c2bf17bb778670e437c4d408329fbc3"; + sha256 = "b9327040072808ef614944b659304ce14c6aeceac82afcfd45454d610ec9d019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "2001ea5bb925d5a1e845844d03c441c2cea9a61b042df518d16e484a3a7901ba"; + sha256 = "a4c5d9b87878d269be2b6314c1347093e04c8d21300344e3435288da0e325cea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c9994fe1e9212281fc007ba8f6b703856693deccbc083e17dc94b6da8ed29a72"; + sha256 = "4d0f8b73c3cc034604330787a4d8fcc914eaf4cf7a3187041bf924b6a450d62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8c6b207b23fe66c7506da96df7de25270218ce9ca61bbedd693fc6f69c970d53"; + sha256 = "c152c0e843a69e6c099995707d838b1540b58b9c74f42241926ff2415321c63d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c9c7cd8c6195588bfbe1c812425f94e7b2727fa0ab73e247b543cf85ea09b171"; + sha256 = "da96cd06713a231bfeb10a1c077586579aef855ffeab88de13e9508cceef0661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9b7688be959e16f4ed652ddef4cde0bd5b3df391b8c43c33b6234ae5ba404987"; + sha256 = "b7789d13580a7149f7c3c03a234d40e56f95782654e0c7b24078d95106a316e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "470596584e9bbf2795624b5baf878955229472450fa7178c9e4612408452b170"; + sha256 = "1c6fc47bf87316ccb5cb767d0a42aa685cc2d75a923138803897d0aee0035c24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "814e5c7e9609b6ae72d2c4c0e012d503394ee6c669e777a0e3b4e4dcb4c7612d"; + sha256 = "647f29a9cffaf16abdf8be253503fee7df5b54cfe90e311a7d1f978bfe53243f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2113a0313ed3d675bf1adecd574bd0112fa5c03d23f670e522928adea6c97265"; + sha256 = "2451a832ef04df012d6114c6a9bb6f99a2dfd673f4d5a1ae5fd2b048fda3ea2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4e759986facde4229324402963e0442d1592147c8f4bdfdcec5ec067e2d0b123"; + sha256 = "c8b0f6dce66303ff77c33d33516f41070ad470d04ea7a159d8a2407e072b4617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c77990635980e56d3856b3793f186a61aaa6da43ee0e0970e7ab06953596f85e"; + sha256 = "fd08bf4e07e05535c39469307bf423f64d16df910e3dbe29f608818eaf63b5b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b4a725703b13e230f84c3a5aa1b9532a7755888a2bf7516b5a0c3a79f70f1ff0"; + sha256 = "b1b07960637d5bcc3c540ecd3ea91c9aae6d602506416093afeb68ffc9a84e37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "fed127eedb2d7bf82977c9aa3311e40eca083b7fdd6a7e58f44b315e209c3267"; + sha256 = "b21137ca94f8426338635c2173be59474f07fe7d6eae7bdbd062311a5593dc3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d29db983e9791aea1dba8f483cf9399ca032fe081e6e8cbb08d9fac3d644c582"; + sha256 = "652c5ce25e695ccf5cb8145f1c71660bf39e6bd9b2a951f468cd1d1967811f2b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 29a506dd1b0..8df80ab526a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -190,6 +190,8 @@ stdenv.mkDerivation { ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ''; + passthru.applicationName = "firefox"; + passthru.libName = "firefox-bin-${version}"; passthru.execdir = "/bin"; passthru.ffmpegSupport = true; passthru.gssSupport = true; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index eab96830a8d..c3d034cd5a1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0b3"; + version = "98.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "dd41bff1f1401eb376a3ab26154a42cdc35e409cdde24435737d753b15435fa6"; + sha256 = "75ed4180a84010f7bb509f9f8107e303c6243008071f0ab925313aab0e4dea60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "963103d54c26d76abeebbc86480836408f8eb7eeee96178ce53d6fc269029603"; + sha256 = "b4c380c4d73ecb913a1ffcf0dc0d3dd771240f1188204f728464df8a65671013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "51862a663ea34d9bb1ae78bcf7846f6148dd8004cbdc6ed49c1252590262afe8"; + sha256 = "247918ac04cdef6ad1452f1d7cb0754f48c70cdffc2e20a3187901c72a023f30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "24857b772fc0a7b018c0ceb51913b1a76df59ef3a95fd41f464e1c51b5201e6a"; + sha256 = "68514334b54f4a626d7eb37f563bb39f418d6be4b980c7d3d31f417153d51482"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "44c45ef6d101d0bf6f57d663ae6943a7d3bce248eb8feb35dacde292b2c3fcf1"; + sha256 = "cf6a2ade0caaed45038a1237d4881c2e07867d1ba283432e7464ffee5c84258d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c196437bfc3aa231859ebdd2f335eea4991c4eae6bd3cf9c64f4eb195704b1e3"; + sha256 = "5c481ca36bb79dbfa5f4e6b83c76a0746b6f4f3fb69200642315a9226ec04809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a1d1eb29a51a84c2c779bd2090a7a064d1b7d290e0389672351821d414fdd35d"; + sha256 = "676169af51ba1089aeeedc1c57fc19bf383fbeff03df5b13ef401b63ec9aa249"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "1f78b12ceb1951ca0e354ee04ff6a7893fc7596480b9df1c9eb443800778e033"; + sha256 = "5e030aeb833b356b145c8ee624ec18facd95c16dbed374d1f2e90c4c14427404"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "b010759c37cafaa3e296b2b71ab19d2850ed62043c3a04e80b21c4d9e9acd235"; + sha256 = "7211a76921bb81307bb14bb57c5e062fde21de58fa61ef4f676652cc2c5d365f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5d58e3ad0cf8de459d68b60653af865bc1e11a1b69a6decca9e630675405885c"; + sha256 = "a2a6dcaba8188b205207bbf815b899a8413a494af1e87060b1da73cda1a8ca0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d3f1ce059e17f6a14cad30ef2609cffe61bc3495bef3ada1a2941bfd8bbc440f"; + sha256 = "fd0bfad035287c35a809c1fbeff9b00e78f6c5a067e8b301c30b76ef37922dc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e06cf1c020f3f65e99c4816b054c9f79da55f892dde27d8acde17ebc24fbc840"; + sha256 = "ab4d58c4640a4b0e65d824e62a898aa19674d37929c1748a27e4aed8e5be0e97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0f9644f78246459e2d7b0c8c1dabc5c33d5d20d2c6d517cee20fb540db501cd6"; + sha256 = "0429ac4f1050234a28ac1cb3fea8eeef0a763e4c316154e6f02452fde434d968"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9b78dc607de8f66352a778c05186806b0fed9afa8474fc4f2f9346c4298d0be6"; + sha256 = "c69d5c22998d097213fc0016a344c967064193e81fdf45b2bfd5f1687883690d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "cdc96bf52e2d9d463e1caca4eb567ec723311678233db59d1cb57a2e7e16c593"; + sha256 = "7d06915a6b86c9bc8bf408fabbb2db73f56c3f0dc3a81d7c11324b564bde3d51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "91c833ce44c24d3fa7b90bab56d0994c930649ae39403c6888a85c2e22fda7c8"; + sha256 = "3e7ea4aebf641697f182c1ed5cd8848a4aac239f1fd7082f5deaf7911ca99f5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e8602e1cf72f9b98dceb23694eaeef70a82bf2704cefb4dfa9db380a31eda03d"; + sha256 = "b151987307e07fdc86ee14a9c0487c3be73b954d28c5beffd9b00ee05740da15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4d7ab6dfbc168e1edcf7b06b9da65e88b805cde7adc14519e2139fc811188b24"; + sha256 = "433edd8dc45eee166d14d1340453637985f8e606d635ebffed09f20c93cf851e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e0288172d3e7fd5f9d8631cb36a7f69118aed0b3daea8ca6d4bda0eee53a2353"; + sha256 = "46b731e6ebac3d2e729e69a2d671b5980f6a2d8ccf83c1e6828feab93bff73ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "eccb1283cee2fa9d6b35ed0cf30f789f422094cf2fb17966b9a406026bfea2d5"; + sha256 = "a6f5e1ce2b6333468a250c1a28bdcb7e44539315ecaf3da09091f7cf3c08f3db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7769bc1d977fec4e0b5362fdfeb0b0f52bab1d0b12b012c90ff2b096209bc7c4"; + sha256 = "bc56c9b18f7d8ecbbdb6f3d4b56607bcf9355156174d537e0e85d41f32876be4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "71e3b186ceb1333f4b95429e63abb1c0807a7f1df2c0e8da26b5af866ad077b7"; + sha256 = "35b574db65cd0f4511d745892690dd2e64fa4c0ca1eeb2be56ad2259b45f48c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "cb4602feead2f7e7b407e83594ad2edd9de856d334a7f9cfd392a7764adfbbc2"; + sha256 = "2968f69125d5a203c2edb96bdb9a922d26064c7f903d5d1b9d7f5d0f7a4aef8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "36ad536374a186e2d9ff4c2894749ae43c512555ce2fcd5f67b0ee76949a764f"; + sha256 = "7f5abde625cf25801bede74f74cdc1413c3dee3a4288eaf75d5e967ce133a88a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8f4c854834fe8bffc682f8c29ee674771f70f78d28173cff3beaab13ae637c54"; + sha256 = "1626c5996088df57740cd8907d61210c8081bb0a2a1b19d8bc9129c14fbd6dfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3381fa208df76553b85a53cfbd4ced059cfccaea1a8e246a5d0d1c54efed8e8f"; + sha256 = "5bed3b64b239ded8424a27b01a8456248e317b8e2b8ee92ef50c9462574189b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e98d88c0e6350e477404ef14fc7348ee79f25fc9e31ed2031c93b79298fc37fa"; + sha256 = "cf79cade9876dede8e6a4886875181d153169ca4f8ae5bfa9958c48f2abdcdf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "26b84f335c5ba6238d69a7537686141188226859d17b0a64c71a1ca0ac9e9d70"; + sha256 = "544ec72d7f304ba702c134d1325f6589e30354d3d4b03d641451bc2f560446cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9371d5111ee591ea4179c4932e03d1686b4f8555c5b6b1dc110382b43dc046f8"; + sha256 = "5a5775bc02aa61edf7d218ffc9506e70ca2dfb781f0abf5e4aabc288328deb1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "56336434a3be39e71459a3ae990f3dbf826fc53ddd33410b0208e4104fb9948a"; + sha256 = "27bdd41a21e159e19bc9ef1464f1f76ac48126decd2942b4a18d4ea0777db743"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "75105b2ec1f269e044332dfd1736edf0919141d3ce7ab979da06ac6a47c361f8"; + sha256 = "7e3d58ae913c919aab4f716308a9fdc6cfb590538b0dd0b90aad3dc099caead9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "86439e96051f460ac42154274401cf4f50102f89590e67e78024a7e0928a2dcd"; + sha256 = "553b4b1025749f374f82acac4e529799d9e555754e63ae4a8bdf016ac8ed620e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e94714ca233a274a0229bfd6c9e5daceaecd2cab30b8314464b766ac79c1fc2f"; + sha256 = "7514590c9dc0d9181ae439a637640ee1dee40e00e9283008a54ac3a07ec8256a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4b88a49838eb6f479feccbdf3109e3ae7ffb1215a433233d0200fe8713475344"; + sha256 = "ffd7579cdb4e6c8f5e1e66b26e3b064362292d93776313b9ded9da4a3b764cb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "216868ae9bf52b914063b154015efb07ca384f5a722064ce9ce2ef2191722c80"; + sha256 = "1f8457a73eb013abd48669f4cf1e109d307f307881e1d9b46ba9aafb09ecaebb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "38fb2079928d7fbe4e8181a14f7c7d955d41fd14f0c73f0122d91c9eb1ef7929"; + sha256 = "6e9798462e2c2c0c50927276595c42539880cee4f58d00808cdfc5113aba9399"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bd70c4241e3e8233458b7ff6bc2893de43e5917284222146a585fce47f785a5c"; + sha256 = "95f41bc7fb4c6fa19851827e0712bc8d7c9344eddc3c341172478fea583265ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "edac88def8dbbcff4cb4b5c33ab77f48d6b96a8ee1765649913028cd92d4b4a1"; + sha256 = "b785913074c6d311380b382b63d57c2eae45dffee759d1aa0cd2d0c12f736e1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1dcb25e73b9dd759cba339bd24b769c279c9eac1a4d2b47338ceac82d9e45bb2"; + sha256 = "1b7b37e1569244fdb6a11fa1d8d371d01756150bf376662b2b0246a4f08bfb37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "122331ecadf4b63319988f781c819f11f905d685f4a549cb08454a9d8478029e"; + sha256 = "8623a915fcc694e5c8295bc1b95b4c6a37aacd0aed505f91239a2ab48fba8d72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "45f8c33eff249c9373dcf558648475b171be65db5fefa873f7553ba1ce77f2d3"; + sha256 = "52cf134be5f9981534a93d454cd7a893fd605026ad814a7257ba0e59f4cbbe1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9480b304d5c9ec6a10dfd480484dbd01dc41ea1cacee4b05b962d4a5bced4427"; + sha256 = "e06f6fc47a98f4564a65d236f8c322e5eaaedb98d049171dfa1fafaaec8bb690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a287cf31defa7923a7004451fb2cf72018ee507cfc167a67899624f7b8375d97"; + sha256 = "a93e7425c0cbcd7579fb4de0a7ece495d77c01eb2ce2a11a9413bc6a8baae3a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "792b12bc891d6d6b4e0c14f745641f54e9c50ecc10222ee679a206a4348d0c9c"; + sha256 = "66b42537cbd4d2338fd6a07b86c52c44f1210124f4c3572518c5bf7f0be217a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "958a2569663fed2f45205ddb744e4c1a62210b678bae94e2717e8d4a66161788"; + sha256 = "637e898fc7bec9727fa489498abf1e6989a32e5f8b92340d0f645aa1150885c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0bd1b2ab4b063faab90a1c2158d9d0d0fc96f7fc81389f06190af39c9247dc21"; + sha256 = "b1b6b24039321e322f0b7d1fd2c59de13029aa56017e48e5211c18838744e9e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "09523f090a020e658e14eaeaafe65a6db0793d389c8dbf0671f9f6d3b291482a"; + sha256 = "5ad069400e47bae81e7e8581e81763905b3334ca5146672317e2986fde7fbfbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "39460a0d21b63c39c5aed3467a2177441e23f15222abbc44535b96ca2ac869db"; + sha256 = "0c80a2786e149afb12de10a49584d6017980e3b52fa1c411d9db289ee537290f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "7dc87ec09c0fc046a42c583c6ec84d5116ae71ccce466abdfdf8d88578d4fbf2"; + sha256 = "39ebabcb230336731e5be1d4024add0d639b3ef0c9d9d94a9b59b5bcf00c6263"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "bbc73998584297e0eed998927c574eec7d81aa37530be11e0b68d1b89fdf31fb"; + sha256 = "8646c156daf2b9e76f1cc93bda605186c8041114bcafa8b67aa27c767297a830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6d4c0748a49fe3b14ea9906088ca99e1865002af3bd3fbf1121a67409018a51e"; + sha256 = "ac9284b3b994f9e3505808cc94391e04e62fc70a75a7ec4919dec56b79a63f84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "595cb5d60786e691078ae1aa8e76ede002f2895fbfac3d9519467f382ddbbbf4"; + sha256 = "3627584688564c9fbaab025f1fc97eb988dc8b5c4eed58bd55f3fa1cb08bcd12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "59b28149d3724582a5b4c0b4898bda5818d762020eccc4f40d4054cc6752fc62"; + sha256 = "b0a8e54764b3f0d947894d0daf2a5031d43a65e19fd3bfcda7f0499ff065441b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "13278da244a1cf7342235d75eaca237402432e73835d944dc9d5bdb9c5e967d7"; + sha256 = "b6cc1c4cbe1cae43a45f5fe1b2ea1ca6c3d0de7cf2d085b7e5536232c9213bf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "de8d8b310cb4b90e40d15e3a991810eee5f7d5418ce1d2b8ae1490c040c9b2f5"; + sha256 = "069f7428b290da1db567a21ae0a5dc54a0cea3ab0012248658d3a273c9b45abb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8f400d8effab470e0823ccfa2fe1ba9f49422faebc576d9775a8194957b4d97a"; + sha256 = "a7ba3abc8eaa5348b47b287b98961506e87c40740c25b88e0da611153e95f992"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "de78ebc094faedbb79b8b3c050dddd8d89cded9d7f5b8cacf96a8ae0741ed5f0"; + sha256 = "ec46b6e6f2c852272dc5247053a55797468ba911dad70d4b1d927465ddd6ba5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7b46ed0c449eabbed031a6c944c725e20eff8560adaf579afc386728a6aa078b"; + sha256 = "c401224b42efadc03055787bc20df523cfbde82b65d1b885a0ef6ff23bed9a21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2d51003f43ec3ee6a4891f65d9b1c248bae86da174c997d5cd47b779c403ac3a"; + sha256 = "323f765f5db4ceb5dcd167ccb4c997bfe820498aa2249a1fa2557285a1f2ad5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "18a3afd1e3799ae4af17ca288b3ca2811437d752851e3043b6b2d506db2e1c95"; + sha256 = "053e095300c9c1ccb3d8fff574aff799c40215482cb977087255d69dabf9362e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "62acd5a8e0eefed468022331f217cebb7e59e629ca8b26010cdd345fcfd3d50a"; + sha256 = "946d5de91994de14941bbd9a4a1ded228b97eb76d503c8aeb164d1a718758257"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4e0ee6d697fafe9b855f3112ce745bab71b53c383a181b94dece0a66589604e7"; + sha256 = "ed084fcb7285e047548c0969914bc43fa3572cbbb5faae91dc85688e2de77a7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1a6ae8edf5732a766c584bc89b7d51b97ad491abccf59cc649db8f250908ea0e"; + sha256 = "58fcdd5fc46f80aef8a736dab07ffce340175ef07845a3c09da0f7056b30df3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "f9a53290d295b9be23338bb7b2e6427f75e048f04d0614451a8a23352c286264"; + sha256 = "3049e29781a51f1e9c1f5da7ffccdcc52b71ffd5e7e068a17b364d7b71b91982"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "99261f267895a39fd7ddd376c87fe1a0dafd1c18467e5fefe17419c9a1ae058f"; + sha256 = "10c4764716f879429754d9665f439c2b23dab89c9a1d159ed229569b987ccb26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "4c3d5200221d7d7bea5e9263329dc216bf74d9f2c822e1b626f8c051262aafaf"; + sha256 = "a46fbe8f8058d9280d28412bac9e3172d9554f0da6c5f5bfc97258e15bb1a5b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "16a4857eda94f8f561fe482f9e21ea53c8a84404d1cf7d3c01ed62a6215aa95f"; + sha256 = "a99eadaf1d78c5afab26f951f3ee69d49326bac0db27132ac931651a2fa7eb39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "12171700aab404bf48914952564a0bf862c816eff294885dd441ca5f68a48bb7"; + sha256 = "b7da10f47cc22661606c3e2d7ce1885a4b6a5aea42ef7e17ec80766d9c5d92fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "636950ca09f5a406581c1605370c85c610a6f53bd2e8adb4987e4ed7dabfed7c"; + sha256 = "653bc3cbcc3145ed8b93f3835486f2756c51318c74c8ce3006fec19420b771e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c7ba5162bbd16ad181d19ea42d34d6182c9972b208c98a009b301bb27c865357"; + sha256 = "efc1573dd48edebe52a4ef241132715db0a41b75db7e857f3abd0631fc2e5d02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e0cf100f60f73cb96c4ef942240375034c792036608e646a0412fb18179b4316"; + sha256 = "a856f24cfdc51898dcad5e2ccd9f9bb406622d33daaf03362fbabfa11893b413"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "4e2c43ff8dd482691190cdbee40cce73540f066b777e3c345acbb4b1622eb166"; + sha256 = "1cdfb66a7616eefe00025f70f1e5fd317890a141e5495066971fc53e3102106d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "de92cff3604a82952e49e04777a098cbe7e0fb991a5253e90c66df68f02a598e"; + sha256 = "c8a127fd0bc4edb0eaad1b06e32e050ffe1df11ef657e05d89de3ec97f8fe607"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a88e3919ea3c8c29b1050e7dec608e62d986411fd4ae3fa8dd38ba55f9dab1f3"; + sha256 = "6c4f66d3b22cf226ff9fbfd05e0ce463d80044bccf8228721b5b8cc5476e8d1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e8a37f0ed391cd8b7a5bda1b4a492a5fa0201e06521c3c4863df8536c4c2da0a"; + sha256 = "08d7eab6ce8f18abde13feab2ceaabcc3e23652730a3ee7dc98d8c9234043b0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "284a8064fb0a41aff769af21194fa2359a951dbe2134d6415d40a41d4a5636f0"; + sha256 = "e6fa1e2b5b3d0ce7586fba3c0d2f9c34514c767bae4a5066052df2bfb511907d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "01ac969a91b8d778ed08bb2f58faac842c1c28dda40ce8c0b90b40575658ace9"; + sha256 = "2c6e9d6804839a525925ad29adfafdda06ecdac1ccf034a2afbcffd5d13dfa66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4348f3da5b2b6ac1fb2fe370d2a4c820933c5100baf3c529fcde1814e32f1fc0"; + sha256 = "f3172fa7c4655496565322f717f176d908ad60d97c99692a92bfb948186d17a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e55e104417153e939c20be42e6307dc36fec843e9170441a3bd6f7d205111f5e"; + sha256 = "78f88185772cf164bf548d134b00d602cc9cbfe88a5b29e9c4a0c93f3de74efc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "73be90dd466c418f0f1e7cd231234823c9aec4b37c73d419c272d5f0c6549408"; + sha256 = "15f31bf52e10de228b50be002deddc1cc89ee6a882def6420d1055f021f75b6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "e310eb44e199a44f5c6dc938c5278e0cf5a57b0eca9afe93947caf124499a512"; + sha256 = "b4412fe101e6de2ca6f66d818823e48e337f06490645bd58455c6e4f9aa6723d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a878f821fe66613200a69619d26bebeb5abd6e7a512f687dfd939ea7b055117d"; + sha256 = "420aaf8816745afabe98906716a8b23d0e0f84de677538a102ebc290c0f57154"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a485ef9d3785f4dc8c9ce88287f597c550a489901b8c48ca9f760d8984c6c385"; + sha256 = "573aedef6185562efcb03d11e0fe2c19f28f16d593f598b529eab5c80648d91f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0ecc83a16278aefd627e50e317ad426d8bfe7b68f4633941e6bdbb20e0f1e043"; + sha256 = "13a4fb70bf63f3f99321998e6e01a1eebe745eeefb33848b345c2020c0e8befd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "0de3848f27c6be45f54429cd9679b19a661b79e857eac8c4852b511857a25395"; + sha256 = "8daa190aa592e6e11fefed3558c3f91cbcee630e20c3a452ff88d333b483885b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ebff08a86bfdb646c02add5e9226cc3f09e096d684247c1c67b9ca6faa48f33c"; + sha256 = "21cff7fb1234defe7732e4e933e24cacfe27b782c37c447f079662ddb6a58d85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8221220edc9041f76a493feb7ac3199d93590c2a4145fc1d7e62e961188b3f3e"; + sha256 = "4f9fb449f2524d47994fa17e8a561b8706f48b36566cf36c39b590a26b04ec55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6f0b612c589ea43323dc8534111808cc1588dcc8dbda09cd4c8326ee513af2c4"; + sha256 = "f9fedd16f2ddf56c8be38579b29ae2c09b4e62228674decb88475be72eed93a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d21cb5dcbb5a6a290d83f96ab8fd171254f54cc8586b0513689d30fa059a7555"; + sha256 = "b62e425beec561b02a273e2a432eec4e857683ad83295376e902852245ee7b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3cf9572b76b5bc627130e27105ce39bc51e55ba0446b4ea867593d7c36b546dc"; + sha256 = "ce56109695065dbbc78251d436d490bccc895a1a668c3507d6231f71a1046ada"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "269d9c9b50acc393ca9daf4f19404cf63e2e792028c26c03afb992f67628bd3e"; + sha256 = "38451517de283d29f3147b41b1438c99a74eecc3fe56c042637344585bb4d8e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c1d304b0b4a7b5c463c07ccb982b16a0265cb1fc114ade7bc4b39f8e9158f5a3"; + sha256 = "ab9d0993bf83de703245b62fac86453c091ca46f2b0bb3e96c8cd1be30fba295"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "17ccb256c21e7f7a0851a980952cd5cb006a9d29176b40f420b0002017748da4"; + sha256 = "8d5d39a0c363817c4d728c6d6d9cf215d136e60ea989a0578cf76930f5caac5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1ecd6d4a20e74d1b3116602a4661b6ea1d1e70f786c88e1452a61230125d4ca0"; + sha256 = "e1b4738410bec169f0947c2d6df5048c3c1ca51f632a2a94233be51963bb0947"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "681857e16b6767b0d66e8d51423b360cfeb8d107839ad52cbeecf1e7003d66ec"; + sha256 = "b950e0e6fbb707f4c0dd70b491b100f890255077ab756af92d419e0d0518cf27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "3122fcb6638c00f489c6540c3cca4312dbdc5de5cc16351746e83c68d02a45ac"; + sha256 = "e01cb86ff2b60435d5717dca42e522c5a4824c09486067574cedf8de09d98064"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5e4be58a4891d7b1363d57fcb9ad67e5d1379401cc3df49a5f9ea4fdf71495fa"; + sha256 = "e388cf188ed66903c46c0694aac5725ae1f2015ba3faba4645277d6456719721"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e904a8e65e8637d01376a08908bba94f437f952eba13a68b81b0a40936044e14"; + sha256 = "b6cdace1499535a36e4573914b49a2c3e4ce9cffbad250438bbaab78f3dbe4fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f5e383bd0268098f82791079324eb1457298d95431d497adbd6023f12c762932"; + sha256 = "d269fe06dfb496fdb6b9ce50d7ea4c9064e8070bbc2a47e6e6641aa79a13e772"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "ae99c4ccebc0b938ebf2c20758a815fdeebae0b81715db79d8385d6a649bb6c9"; + sha256 = "0c6a0ddb0937c59ff5b88d09ef291e685cb29f8435b4fb6227eb0c12b82d20b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ef7ab3d8b6b51d22f0f30b836024212332aec6989684b9a22a4f045662da6080"; + sha256 = "efd0afc4e2ce06b094a2c1fb005c246bf8dad02fa9b8e2a0037e6f88f0fccb19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b3728cabcbb46393796b5b948daeb5821b70ae29a8571fb5295faa40d9a8e592"; + sha256 = "29ef8698f0026dedf638fa32a2ed32d0014e131f41500969d271ca62c38f5cc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ecfcfa573fe215d94e48933bfb276f6dbd573c92a062f4f3ec1ed83ef0da83a7"; + sha256 = "244697199ae0e2895f242c64bd6f23d641deb124950ded7a0c0e8d1e18017636"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "37558cf0fdf41c728b2a22fc2b8142af011ef7beeb924e08de2400f29b2dede7"; + sha256 = "77bf85d57fb887f5f1e0073daf09807286e2e5d835ecd9400f698dcf0108a949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "29a156bac1d7ffe10d05690fa3a82820cf246450ef1a77697e4f7f346c9eda13"; + sha256 = "6e18fb3773dea1a99c9ea383868a9db07e2bf2a0ba30b9acd283107a3b557b17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "631e34ca2499d6767a1fdc7b944f08841bdcd9e3c248f1e4f0572465797e819c"; + sha256 = "1be4cc0e4a2b9c4cd00813cade9b09db97f3cec3087d103c0204cfb64bceee12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3500810a58a0cd5192982fc5536902e377458589faf0e8c978425ac2fffb19ee"; + sha256 = "c18cf7a7dd09718fd59457e8eb7153229061e4962e29abde5e83add456e2f086"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "979342ef754af3751a5466a5d54b40291f87dc8f084173330b2e337aec84c516"; + sha256 = "d6ac7e4e279ce4858f77cf3613c05b4d6dc0ac0be4cfd66aa880b5761f9dbd02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "55fe1b0bdac8f8dc37acf3159ccbef78e4054c499ac8df550b215826eeeeec6d"; + sha256 = "b785f4a680031be8ab963a66df4d61dbc54510fcd400d7e061c54e4bff554dd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ff090da1c4a6d6dfb12d1750dfbf1f37fe57e2f5f93250d30851da215f6daefc"; + sha256 = "69ccaf431b505db72245a8a6bce287dff88993055cfa3bdafbb31ef9783598bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "67027d0efa86c8fea2d27821a99a30e3878a9c478d9f26af3ecfcbdce336f896"; + sha256 = "d779e8ca6fcf77cd4c5e0edb4883d0d28dcba2eba456de9cd4216d96e7aedb03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e7c2dd2447f157a2541540ea24d0732dfa0dd84b116824d87d7bae53a572883e"; + sha256 = "dcedaaaaf1d9acac61fdedaf893d288052df18a925f8853722934ef54e92a71f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "bd7dc68d840a6a53a525a8a1229e0abca8aa2af14bee6c5f7198d877f3ecab1c"; + sha256 = "b761e7d712a9ad951a00ee73f36eb5a764faa1285ce22af168e4dbe1516edfbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4a21599535668ffe96f3adb56801aa3c8b5aef40ce2998fde430e34cbb4898e0"; + sha256 = "f640b0ffc029f473c3638ec8e08884997533d087cc8590a35458571403b5396d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5f47de337347f65ba478c48c373d12befcde1b86b99102feb0c921d149541d2a"; + sha256 = "0e56091cf2787215884df9c1dc0e2c208021fa99088d0dce18324b18b0b57aa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4f11bf8857f65091d43835c4c1d16097189e184e72abd2dde6807e8b22370f8e"; + sha256 = "39d1c2ee79f1434f263ff804122d9dc20744c8c050513c95c75d7c424a5325c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "6b426096f9a652e1eca190320fb485c5573c94d7f7558dc70f58b6c49508e5bb"; + sha256 = "09544d8f51134e5f74c5d90b98844e49ee5b0be7ed5c63e2fa9753a08cfd2600"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f374d64f64529238f867b76e7e894065a32b75b2d669787f1f7285f23ffb653a"; + sha256 = "c76d10c0f9036b33e5e0048fafa7b4d8571af5e27f25d7dc92c336ffac2726da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0806aa2abdc643eed084e7764acae24ee7da7e01c8482b35de5af0cbd809b9e0"; + sha256 = "c85152d5ba80dc5a843312da61aed21834257bede5019b1042353a7955ef0e35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b41a39b046956ba4971c4ef163d9da6f7ea6b70f2dd419fdc278995bdc300723"; + sha256 = "52696aed9eaf8be1994c88ed50925cc32f8139aa92ed9f9e1ed91d8c01468e44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8869e2fadeeca2c22c7732f22cd9709d8da9b435b6e4f9c9d384f67405f0fc76"; + sha256 = "e60a2d3079cb76ce879cda5d9c67ca33938d501c3ceb517fd69b58e6f932bf2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3d339e3dcfe1ff4273d0a35f1177f580c8158b6457add582cc23f67c00676e56"; + sha256 = "0f27a6f422d03c65879233a22cf469cf287d24d7c250dcea2bf8d845af303bd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ed129dc3258a62a6e1f02b881d78b2d6348b95b99c2011005644ba484968e3f9"; + sha256 = "639027a3d48570d8bc98965802f9b7661d545ece751ad1d734e7e303f8649962"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0691ef7be86c09cc92fbebc431668d1eee722ed85179a068ab3c548cb6f50058"; + sha256 = "44f2a552486e6f22b111e793d0e69a67e635929f02f6f3da814dd2daf22210c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "86629f77d8092ccc4ddfbbfd2613535e1fb3a76e70c10fab46081a87cecaffd8"; + sha256 = "02e56e76df00d39b0a8fd68038a9e8c956ceb512867d453f47209cdb9ce65597"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "5225e99833460c3098057602b82be9e0e52f2b00c060c29c1ca7310e2dec8384"; + sha256 = "2386378b0917c770b419ea6561823ab0cfebe36c28a36e7747c47fe68201f95d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "0d97b86b2b6834ae518820e83a0f4af5318f3eb8848ca69ad4e3cf2dbbc56e6c"; + sha256 = "382c77faf5501c3f03c626b1a8c99bbbd0d60cff39ab1b0ed33c7a3903866d03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d44a9db9a6638a6c69c7b4ffba024d5b5028407533eeab387c2c442f73078d47"; + sha256 = "9db254a521cb2185c82522121ba5f7d75a819298abb3c301b6a8b06007d242da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "df47ebeaf3e3eccfa2b483e46ffc4f7106299d62337923964249c2a7ee070a4d"; + sha256 = "16576d6924c772e5d05285a8a9367e3cfbe407f26f96c499fd829529bfd3db4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "4be5b5876f032e09d87c90efb9da8f168f722b46f71adc0ec036c4a1840a2795"; + sha256 = "e26dd072353546dab184c4fd527525bb23201a8ed05c3c2bb672cf5a3da2e776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8ecb3ec4e9387647d3361345a420574887c74ca8bd38f723bea6d8ba4b2f4c81"; + sha256 = "e785cc2e7c9abefcf9b4114f778def4789635e1bd0f354082ba1040435d9c4f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "15483453905eb6aff243af3c536e6d73a88dcaeee4363e829c30fa3e2e9bcf1b"; + sha256 = "7debe05c2c0128f6a125c627b26e441547d4da485ab263c5b5190cf5cc04b3a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "991445513ebb294c2bc8e5833e7631b791cbcc72ccd501ee883665b3b0b62ba1"; + sha256 = "6da5b56b5df3fda1f8ac8f35ed80a0150e66809ab4ae18af8e114a7e45bd10a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "036e8d167fc43d940d19ac8b90f4e136f264f16fe7d012fb1827b10dd47d8442"; + sha256 = "e145c6ec469038e9cc2e195770fd5eb467bc3859c465d9c570df06e1af0d9532"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "056ee174fe2a43aa714abe4e59521d2f040fc326cd9d4d36b8ab2676fefba24f"; + sha256 = "d95b7f7aad0d343bdfd8814f38ea59ebc277ea85426fb447173b0a1b4efd9a74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6f30edc15658ae9395037751fab17c115391f22d4e2560945cbee436344aae92"; + sha256 = "def309ff0f7916df41f34ffe9ec2260a0738da4a2657020641d6d03ee2faed93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d3cab8f98f1011b94c8b887db82ee3b64051f03879f83594113a0534fb7a730a"; + sha256 = "1dfb7e8a36039e5bb434f1273cf9356a3826444f0f6b058897d16d4b9b0d8676"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "969d9e3ddd308b96fe6475b04e0eaab162aa89f98daa9f921b52a2602e95c93e"; + sha256 = "1c3e77637bba527e9a229665fc4a4921f0b26e05c14e5257a0b28507db34f08d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "874a5cacf1f6025889a4fc0961b8c26f78a56b403e76af8e84cd6bc54de3455b"; + sha256 = "d54c2e3377e75dea8400d9b5486259f9be1158e44f520439912052bc2097624a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4d369daaffdaf1a28d940f98f3f3d4c3936c5ccb3f913c3c1f0233b4ee448da5"; + sha256 = "a91f89a416dc77cda507aa9a1bea653f48249f55ba4655489a4376ea92cf066c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f5138a6569f4c8779c90462b3165fb7bb2351d48e9a81daa88d909e475eef2df"; + sha256 = "ce38b5bc0b04a1bd86e2f5cf345c25718103d347803eb72d46f1cb90553695be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f410a1786eda2f9b7bc27e30c438f4e0a090b436b871c0614f6fd871f4eaa2fd"; + sha256 = "201ec9e0bb4058d7183024545af8eefe0cd3505fe557b2d541d8a7330c2797fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "60aa12adff74ff46ef37141293acc39b4592d61512c9db0a3745a8a41858ce67"; + sha256 = "997a9884e4669e6e883703934e4d747f784f38fb374ee43c7d30f82b9462bb2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2187efe8640a541ab3b9c11583d09c977cf3af44c280887b03c5f4ed05239439"; + sha256 = "fb97cbf935b6ae92c8c17be640820e4be73fed59d385bdeb2435ac2253c66651"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "1d3a3f28c0a99d56dccd1fc354a56cc1374f4f87a76760b410b616d0128f83fd"; + sha256 = "d999259f970084c684cf543460efc6faa3677eb839c67e9743af24232d81ecc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b2e0853123208160486936e98ba978a7d509d8d4e0500c89bbe522ea69a4ff67"; + sha256 = "d9bcf799f9d744ba94197900e2032cbc42e4eb3f5ee2d429ede4e2ca47c45d63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "43e9ca38b6ef601d7834b2b951b4a14394a6442d0da1d5045b83a5ccbf7bad40"; + sha256 = "69e55dfe9e542f9c4e0cdcd75e24c346ac565012b2214ad99534ff643d5b1a9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ef20972394355ce52307056b94af6dea64a3f6b1cf1887b3796505baf4645fde"; + sha256 = "b10c9af0a38a7cc456d7392dbb4a01a964e68fcaf963868011ba104a01c10f59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ec106d9e5ebf26c698106c0b751a54b1af77959a39ef47ef124433a3b610f146"; + sha256 = "114df4baff98d81d046a069b6a3271f3cd385cafff9681bb1bdd988a4b806eb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "19b20479c0df3f63a0d516bfa4521f0c7cb81e7fb9873ad801a6f662bc7558ab"; + sha256 = "79cbe62f30dc117fb656db52ba61895dc830f2f53b8f02edb69809a8fdfe4722"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "200b9ec8da001ef900fa77ba7954ad67f68504e29ddc78a389847f076d9812db"; + sha256 = "babe5ff8170ac703bc95db0c9b54e6c05c12e198dcdd42f0fce9eb2b2a366606"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8400fb463705221d80015a7b69388478f851231618bd3be0d9fffcc6b35783ec"; + sha256 = "a4e3648681178444d8527539523fcd177741ca74a11cf608ae7cfe9608ff46d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4fee1c00876e71f6d8fe8194ac48dc56bb8ca6da2e5ad41488e1a99e3c65a32c"; + sha256 = "42dd57a33216a86ccfaf915dbc2513b6ff9441ff5820cf51b0a97bdaecf1c00c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "c7aaaffd7539351180240837e1930b8303b1eb9d199a1937940f80041aca1632"; + sha256 = "8b296ec5f02e7135209f83c53bb4d18c652336a4068b17db99b10dc9d3500744"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f54d11032e4b929e0d283223744aec809c46d66a875dfa9e07fc2a9237c5edbc"; + sha256 = "85829c8e7d52e7e5879d52897ffee0763f3aa03b754647a4d4c0e2d59cfad230"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "c7e1da38ea4886454f252c656bc1fd9809cbbdbf06b159cc40674e9e03ce0275"; + sha256 = "89f0205a14d7b97c635382d3e2ea045103eda9df9f0b7184e7655626b34e39f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5177db2a4e0ca4bbdbd9d7e3fe5aa5785f995df15df4ac4213bc22c2f9380a59"; + sha256 = "f9f88f5d24d5edcd157a030b482c50175bda9a9d4d95499b668227438045b6a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0e5d27dbb6e1ed3bf87a60bf62bc90beeb1c503fcc545b4a22767fda0e8e695c"; + sha256 = "7da0fd946c235948ce659947e53f389955e12a10251d2ad564ba6808e13aee76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "54250e1742ebd3cd0db36ac68f5790fcb803a4b63d77293905727922379c84f5"; + sha256 = "9ffa05fc839c67e5c709b6203627b75b7bf7765e5e52e7151561ae0ff36d43f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "887c2cf008099abfd6cae59203f660e71618ad63d8492f0f1de072debab84450"; + sha256 = "ff45d74bd695b8677ba76ab1cf6a7726ac08d7ea0c6ed6f705dfedc536df8112"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "c34caded0c323906ff15538694b37e3c91a00c731d7f4017434027882f160086"; + sha256 = "9494973f7facf05b5636bce50a39151596b827a3444ce80a601c66e55b488af0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "f66ebec1bc3783cef6c57436a3f9764b52942f2466195fea8e5435275a276411"; + sha256 = "ef0b115274304dd0925d643903f15ac7d6c26281ad5ec57c6b73a0a0beb97486"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6ac73b95d650bd7f8454345a041d7f9a294aed2cf249d09ab726eff5c6df0036"; + sha256 = "79c7211ec24d7855f890cd83a65411302f0ad4296ed19fecb86969e62ab6c01a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9f436cf3504f2629cbec87051539e00782c9942aeef4a03fc4fd44000dfd1b93"; + sha256 = "b4fd3ba21a5c906cdeab13d4db78c4d8c43dae758211d8edb6570d49561b9f26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8759bcafc09fd00beda7f9795b49675d2dcc153d96020198c9c4117c30fe9c0c"; + sha256 = "cfbfaffe54246e4ced8a35edd67b5e28567d9d61ed4fe867f11fc479864e8a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2c5fc7af589d06e2bda4de52b6a079b4c8ac9287b71b8d86a6462dd63f64f62c"; + sha256 = "74487e82d428166a870b0593ea7be3de9b912132542ff98bd3276e1b9091fc21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "0f96f8938af715461ab1267713d57beeafbca389aa291931c1712cfee375dcac"; + sha256 = "004d5e020a627f95572f2c52bcdbd0ef52b66134c5ad64328c810ba2a910cfba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "1a8f36abd3b638cb4aa82e66e4dcbb13a56c0fe967ae3187686217ffac0c37f0"; + sha256 = "4102b176aa98362b3ea6bca76bc5ad3fee3849b833f192d55c02ec72bbd7fcd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "01b349d1656b2cc480e22d1a1a4eb376ae3b0be65a4b64d1cfb95e29b8e3a7c0"; + sha256 = "acc2990be46dde74e93acc0e20d5c59acd2ec9b0ca2d3db1bc641eba9e17dd6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4db2f4df874ebd5914ac143c9963e108d45c9822474b43d32b7a417d9a0c14ec"; + sha256 = "c1a286c4369f13a6df8dbbeb9ef60dea11d36d38e1403d8e9bb8387fac2226d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "fb4f87a2f1c735fc19da371872990a4dcc76ceee2a0f6776e55b06780795589f"; + sha256 = "35805803b8487ed6f28bf8cf6ffba764c479cf0eb11bd418ae2613831ede598a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "a9292aa129c8dc538014481865f046b8dbd069138a4ef73743137ad609656174"; + sha256 = "deb2e23159d458e4e2b030678075d793a0d68e87fad38473267e7e7d57939715"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4da6f323d2cddfd0a6f85f61c75cae777668cfe4a88a9fae3ed6297702604e35"; + sha256 = "bb0c6227d2903080645a7c7ed0665db6922beda6438d7b82060d890b9ace2a64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "44eddd02a18b8e419d44bae127a4f37eda740f63fb7524891f3a435a6430f64b"; + sha256 = "b06680a771d8a347c25b65a56cf76bbfa1294fc8c7a2a303bf92175aec1e952e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "aabcfc84e1a06d901e29b571628905871248a3148fdfa9ebe1b26995db92fb81"; + sha256 = "0519564a5e34f3c9c9ae9605f520da542bd69f20f9410c47739e30ed290ac5f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8a8b0fe064719cfb088ac61e412c7b1f2d6d66ea523d7f6742efbb54cf53f0d2"; + sha256 = "8a5d4685384eaec411a278f92aa2c09f667df430cb65920dbf4f2a22ab749b22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0bba256df30a3deeeaf5edb946fa535b762cdb42232f8e15f3d1ce49743c121f"; + sha256 = "6083bdf468dae23a0cd69506e04615f7312dfce6ee0fad744432f316001b23b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5ed15767967d579d6809fdc0fae86f0f42b9f8ec2e024bd40aa151147528ccec"; + sha256 = "42ae9e4a00b8a939a934505e5b4898dfc5edf2ef7c63451784770ae8e942dc3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5e6f78700f74229fb3dfea3b408a5ac78f18892c6ec407bd85017467a5687ba6"; + sha256 = "2d808b21afc4b1af9ea72880acac4c017566e74d7a6635d0a3e9302159961f2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5eb1de045ee119d67e0251be6223f7efb3fd26d8cebc5f372f4513d0928c8a51"; + sha256 = "799099d98be61d2ef50988e4a0dcc910a3d089c8b1b156c340bc6f306f0c05bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "78b467f1ceda9ef4d181d5549855241ed37381dc08d4e282bdfdf0db3b0625a3"; + sha256 = "0627104342fa014aa267b4874d88592aad131b8b71ae9da4864233217dac9fcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a708c94b51ee31a40532970d59b2d570c87aedeed24454aace5f6870eaccfa5f"; + sha256 = "cf22010a41298f31839c61c749b7f643f92b792050d62060305284d77fc21b35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "0095fd3dc0eb4eb46c55ae3b2ccc65bea69127aed00d6fac446fb9c9274f4302"; + sha256 = "588fed1f0dc77c8d5a18ddb33d04c5570efe80adf3e96895b1b0243e82e92535"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "c8f052d0275c803da20f62172976b44357861ccd8599d9d70eba9a2c96594824"; + sha256 = "6d10537d9268c509fed6bfd86eb53351b772ea2ba96c0f386d589765b0f1153c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "efad15e6aeb3ad1287cc3d0e3d0daa389faa7f348a002cb5c7f52f812eda8c33"; + sha256 = "4ececc1167184b3a531f8176f4282b34b2f5e2c98f329af7dc67ac5be5efefe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "dfff091b8e2f6b19842335da51f4cc7107401268b91c1bee55bb473ab5f245bc"; + sha256 = "2860a9bf015972a38b1a15bfb532b87c65e2edb7b9ea8ed2db8ee6ab03d4e281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "35f3b8459096105e29d87645ebfba3a93fb23412ac7fcc30357f2ebbce658f2a"; + sha256 = "97134e6fc0b07c910f8a2ca263943724e3f5790d62b4f0d2fc697c3d5a15a6ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3727440d1c3fac9b5761e3f79e46658dfeb5bee2f3ed17ec78697d869be7a7c0"; + sha256 = "5b38cc44c7d8aa425e70903f192f2ccf8cf4dbcd40952d0014a6f16c81ec66fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "91808cdc62ff8f8670d3c22acb6c203832471ade8e24fd606a2c00312fc39d7d"; + sha256 = "e5e7db1ca4c8bff1623bd2b78b1d66617510419a893f324af8092de1a9476a51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "947f2cb2572e17d04263e5ebebd897a6900d22dbc85196826e316706a8622aa6"; + sha256 = "357410778b50cd6da76d178dbc88efe9bdf01e71895699e1616ef4dff253aae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d5baa22518ee5f189f780d159aef432591c7d4855cce7f1dc4c67d48c69d5780"; + sha256 = "f38359d87aa018b4bd8fee63829a04e7d552c928b945f74c3f2e0ec21524ea03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "25b19eac0ad6491c7285633ad61dab8f8d2833ba011b7aaa8dd1a2d0eca2b6da"; + sha256 = "b23c4436a5fe3edb954c2ddc16ff16756d672a89afed91e0753b6f9c7018e9d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ad284426be9590e9a118c5f151c478d15e6d964beb46312fe7172347783e9162"; + sha256 = "7156717a71e9fcc8d98eb0fd544b5a3bcd8ade7e805e7a2806b3b3ac363e2402"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ee90ff4921848363791e0486fc8810d892bf07c448c576bc4c0ea09a6bea8e55"; + sha256 = "5e5b2764b860bf45e5cc738c1d6ce989a6f85b226ebd4ab59d236295ef596a51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9cc4ec8d6ac780a0fa8ad01b5b16438a0bcb290da79691e7dbf993033bd919f0"; + sha256 = "74fbfe561438450fc28539c6d88e16e89abcfabcb025dc57aef87bb2aa64bee0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6018bca3d3963b3b6dbed521ae068d15f659b6779240e8ed1f9c3c66ec75b932"; + sha256 = "12467aa41392d7429a91d01e35894fe5bf3d18cfc4091e349490f063e4b69247"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index c1cb916762e..bcedf9d22d8 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "97.0-2", + "packageVersion": "97.0.1-1", "source": { - "rev": "97.0-2", - "sha256": "00fb7xr6hrcyh3s7g52fs6f7a1iggpibj0xafblnl7118fh73g25" + "rev": "97.0.1-1", + "sha256": "10gbnkmyivawwqn3gf5c98l49b03j70gbniaar8bfl80j8av0v5j" }, "firefox": { - "version": "97.0", - "sha512": "a913695a42cb06ee9bda2a20e65cc573e40ca93e9f75b7ee0a43ebd1935b371e7e80d5fc8d5f126ad0712ab848635a8624bbeed43807e5c179537aa32c884186" + "version": "97.0.1", + "sha512": "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c" } } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 5e88de35655..b428687025d 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -42,7 +42,7 @@ let # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled , extraPolicies ? {} , extraPoliciesFiles ? [] - , libName ? "firefox" # Important for tor package or the like + , libName ? browser.libName or "firefox" # Important for tor package or the like , nixExtensions ? null }: @@ -152,24 +152,7 @@ let # # ############################# - # TODO: remove this after the next release (21.03) - configPlugins = lib.filter (a: builtins.hasAttr a cfg) [ - "enableAdobeFlash" - "enableAdobeReader" - "enableBluejeans" - "enableDjvu" - "enableFriBIDPlugin" - "enableGoogleTalkPlugin" - "enableMPlayer" - "enableVLC" - "icedtea" - "jre" - ]; - pluginsError = - "Your configuration mentions ${lib.concatMapStringsSep ", " (p: applicationName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; - - in if configPlugins != [] then throw pluginsError else - (stdenv.mkDerivation { + in stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { @@ -219,8 +202,8 @@ let find . -type f \( -not -name "${applicationName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; - find . -type f -name "${applicationName}" -print0 | while read -d $'\0' f; do - cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f" + find . -type f \( -name "${applicationName}" -o -name "${applicationName}-bin" \) -print0 | while read -d $'\0' f; do + cp -P --no-preserve=mode,ownership --remove-destination "${browser}/$f" "$out/$f" chmod a+rwx "$out/$f" done @@ -369,5 +352,5 @@ let hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; - }); + }; in lib.makeOverridable wrapper diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index d425ca11fd8..a629de63729 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "6.4.15"; + version = "6.4.16"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3JPnXOpjHjBZMdOtggjSns4cKc7uffJS1RkTAKGxAVI="; + sha256 = "sha256-yjW0XlMXa1MyNIud3uGm7RNj47B4Bp3DK9tvBrfqkoA="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 05c985d9d97..b14c98b4453 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-bgc9M7shcgL1gQ9klUP0JIY4UeraO1oLsLEdG5tOLpY="; + sha256 = "sha256-IjkksHa94gkNiaeksGHlLdeHlLS/uwI0GnKK0d3s5wk="; }; - vendorSha256 = "sha256-T2a5FBjISXprgMA6ye2xwAFLE62Qb3AUQVjpGtnduU0="; + vendorSha256 = "sha256-3PzaMB7U19HnqS+zRbIupErE1S8+MzG92vQFq3oxHpE="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index 6ef24ded1a6..c1383e8688d 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAtsXNmR+Sg9xmvP7x6b2jAJkUcL/sMYk8i5CSzjVos="; + sha256 = "sha256-6/+S1aj2qoUPz+6+8Z4Z5dpfyOi/DnrLLUpPgBn/OxU="; }; - vendorSha256 = "sha256-kPYvkovzQDmoB67TZHCKZ5jtW6pN3gHxBPKAU8prbgo="; + vendorSha256 = "sha256-0Zi62FmX4rFl3os2ehtussSSUPJtxLq7622CEdeKZCs="; meta = with lib; { description = "Kubernetes object analysis with recommendations for improved reliability and security"; diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix index 5d056907264..5e78cc9b72b 100644 --- a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-doctor"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "emirozer"; repo = pname; rev = version; - sha256 = "0x784jbcwd34vzdnhg2yldh5ivkxvs2qlbsvaammbxkn04ch1ijz"; + sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY="; }; - vendorSha256 = "04xq5kp1m7c98gb4fd0dni258vpfnhv535gl2qllfcp2mvk3mn55"; + vendorSha256 = "sha256-pdg65q7iMkcpFvSVUTa07m5URLQNNEfWQ4mdGu4suBM="; postInstall = '' mv $out/bin/{cmd,kubectl-doctor} diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index 4e945e45640..32130ee96d2 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.7.11"; + version = "0.8.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "1224ssqdz9ak0vylyfbr9c2w0yfdp4hw9jh99qmfi2j5nhw9kzcc"; + sha256 = "sha256-K94cGU+cFHOrAGXjHQFFFJYhZi9zNfdlGy5eb2DkcV8="; }; vendorSha256 = "sha256-95rteSEMOBQnAw0QKuj5Yyi8n3xXGl0Tm97WiyTGxVw="; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 07302ddc1ef..3954a143e5b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -191,9 +191,9 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.5"; - sha256 = "sha256-zIerP8v6ovIx+xwLsSmMFH41l140W9IwQMvomb/pk8E="; - vendorSha256 = "sha256-4ctuErxZIaESfIkS7BXI+eQcdatXE/1p20P9f890twM="; + version = "1.1.6"; + sha256 = "sha256-Y1ARRCzqYBUQqpqwVrH0PPOZ9IWnw51yfyGFD/6P/ro="; + vendorSha256 = "sha256-RhGiY/APd12v0Hoqw381Wlk4oDx7aZt5zZvqkR99rd0="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 96a53e21551..4a78f01a1ca 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1vcwzksixc9n016gf8zavkdk7ba33zkmymclvjwb32pwsanvzdz7"; }; - vendorSha256 = "1yl9lmqvw70a6z0c85vkzvdzyzqjizfa1rahfw8gb175fax1f0sz"; + vendorSha256 = "0v4xk1ia6zhh4h2rgpinfl0hs300lk84vabm35mjahch7kmvfhvb"; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 30966deb0ca..73506867a32 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.65"; + version = "1.2.67"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-uQO8zJ3+eAu/F5vmaGCd2qqwK8GRlensqypRlK6CXSk="; + sha256 = "sha256-SCSj+spANhbrdhj204fsvshkDi0fKmt8jbc11UHJARw="; }; - vendorSha256 = "sha256-dRevwdLiSsM2zzNQ913ytXf2XxZOfLWAUiJjk04mY28="; + vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3cc1f033d76..4f19fd924e7 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { - stable = "0.0.16"; + stable = "0.0.17"; ptb = "0.0.27"; canary = "0.0.133"; } else { @@ -21,7 +21,7 @@ let stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk="; + sha256 = "058k0cmbm4y572jqw83bayb2zzl2fw2aaz0zj1gvg6sxblp76qil"; }; ptb = fetchurl { url = diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index b6706d64786..6de6922913f 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { description = "A client for matrix, the decentralized communication protocol."; homepage = "https://apps.kde.org/en/neochat"; license = licenses.gpl3Only; - maintainers = with maintainers; [ mjlbach peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index c998f869d1e..9126a587dc7 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -5,10 +5,10 @@ appimageTools.wrapType2 rec { pname = "session-desktop-appimage"; - version = "1.7.6"; + version = "1.7.7"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "PNjUslqLcSxkRSXFpesBr2sfre4wetZWfUQTjywdClU="; + sha256 = "iMJk7/Q3Kh2KwLs0m+DAPVv471iPZcsIs4+YCSbmeIo="; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 5da0536b379..ed6a4bbe084 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 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220107"; + version = "20220216"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-sB8/xQgSORtwupcwSejKUhHoz04exdYS0ymefw9wXDQ="; + sha256 = "sha256-hB5zjSBOcpVW+kGja4DP0syAvYqkeDBJbtg0y2sX9w4="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index c76393d69f5..9aac3db3594 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.42.3"; + version = "3.42.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RGKeagIojsEApm/VlBOgaLa5zWJL7TJVqimhZuom0LY="; + sha256 = "+oprem1GsinbXfIv3nZCVFIjV/4b7NexjlNt/piJCmU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index aa46529bdba..184804a8788 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -2,9 +2,11 @@ , pkg-config, gnupg , xapian, gmime, talloc, zlib , doxygen, perl, texinfo +, notmuch , pythonPackages , emacs , ruby +, testVersion , which, dtach, openssl, bash, gdb, man , withEmacs ? true , withRuby ? true @@ -12,18 +14,13 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.34.3"; + version = "0.35"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "sha256-P+kQSDv9gVpcO5UOImp7yoFWBT/TLXrR6xoKijrK6Ig="; + sha256 = "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8"; }; - patches = [ - # https://nmbug.notmuchmail.org/nmweb/show/87o84iza9r.fsf%40starbuck.i-did-not-set--mail-host-address--so-tickle-me - ./test-fix-support-for-gpgsm-in-gnupg-2.3.patch - ]; - nativeBuildInputs = [ pkg-config doxygen # (optional) api docs @@ -100,6 +97,7 @@ stdenv.mkDerivation rec { passthru = { pythonSourceRoot = "notmuch-${version}/bindings/python"; + tests.version = testVersion { package = notmuch; }; inherit version; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch b/pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch deleted file mode 100644 index 91c77df7010..00000000000 --- a/pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a642ad542e3d3f34e949c5c66923ca8a6e6cbbd8 Mon Sep 17 00:00:00 2001 -From: Stig Palmquist <stig@stig.io> -Date: Tue, 11 Jan 2022 13:23:13 +0100 -Subject: [PATCH] test: fix support for gpgsm in gnupg 2.3 - -gpgsm --list-keys output changed the label for fingerprints from -"fingerprint: " to "sha[12] fpr: " breaking tests with gnupg 2.3. this -adds support for both. ---- - test/test-lib.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test-lib.sh b/test/test-lib.sh -index 6bc0b723..3de608f9 100644 ---- a/test/test-lib.sh -+++ b/test/test-lib.sh -@@ -145,7 +145,7 @@ add_gpgsm_home () { - mkdir -p -m 0700 "$GNUPGHOME" - gpgsm --batch --no-tty --no-common-certs-import --pinentry-mode=loopback --passphrase-fd 3 \ - --disable-dirmngr --import >"$GNUPGHOME"/import.log 2>&1 3<<<'' <$NOTMUCH_SRCDIR/test/smime/0xE0972A47.p12 -- fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p') -+ fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*\(fingerprint\|sha1 fpr\): //p') - echo "$fpr S relax" >> "$GNUPGHOME/trustlist.txt" - gpgsm --quiet --batch --no-tty --no-common-certs-import --disable-dirmngr --import < $NOTMUCH_SRCDIR/test/smime/ca.crt - echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$GNUPGHOME/trustlist.txt" --- -2.34.1 - diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 494f371016c..eb708962e01 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.5.1"; + version = "91.6.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/af/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/af/thunderbird-91.6.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "90a7b62161c8e4bd0dfcb0c69995e80b1733b86513d5786559eefd0ee19ca6ec"; + sha256 = "b0d36d12bb29897b4502fe28fd5d05117b8cf3c6f2a8f9a0a88542b915587cda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ar/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ar/thunderbird-91.6.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f7167cdff08c42f0a067e8631f8ae85ea12f301a7d49ba8919fa90cdf5ac1aaf"; + sha256 = "26c86b4a73085d1b2b08e73a9adb1a2e8148fce1c8b27f3b1f9566fb72269361"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ast/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ast/thunderbird-91.6.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "74ffcdac8a170ba700d2c58066c66143129a7f21f8123c174dfd598240f2271d"; + sha256 = "f0ffeb6273b2c748cdeb2b6e73e17848c6c1b583ee0dfae1ec7eda8b295bef09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/be/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/be/thunderbird-91.6.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "aabe3dce7ddcfcaad6212549f7ce709c6832c01aa7cfaa15fad82d75259fa8ee"; + sha256 = "b55b54e87b28329d717023397d42d162299bf89dc47b6db5910b57263b377645"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/bg/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/bg/thunderbird-91.6.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f0fa8e63643e1a44ab6997caf148812e749004a450825b0b77f1ac0cc52c6ec3"; + sha256 = "93d99a4eebf65152ffede2b86f94f0bb4a626c0a0b0925514e529785b717ec21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/br/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/br/thunderbird-91.6.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8391eb495214140878bba1f658cb1dbab4a93187f32bb99e65613b09db70269c"; + sha256 = "944395c06dbc26d14add54d6e9e990496179ee0e956d585d84246e90d3a5a058"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ca/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ca/thunderbird-91.6.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "82b1498ee1745b087b58f44ca57f1d355b61aa42ec2787302e6a59dfb5391a3e"; + sha256 = "426f1f2b8c3849e60e1e88e74f33c1bc51f8de3007fbbf9d58c0c477e7c4d0f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cak/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cak/thunderbird-91.6.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "52761eec2ef3327ea5f435bfcb73dd4a5c378e78d57f9849283460ed39318af8"; + sha256 = "04baa09f4f28e62057cb4a62981f916c820a82be5c7418367be67a5f1f180dff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cs/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cs/thunderbird-91.6.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "406bff52470379be7d6b8315909067e1a1f7623a7d4415a23b6f53ea4f896064"; + sha256 = "d724b84ac07ec0dd8f81b790f4baf58c2d81f9d1e8aa121fe379aa968fd7c78a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cy/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cy/thunderbird-91.6.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4fa869d8592709da2ddba8657424475377aea9617ad411abb25c8ae8e55612fe"; + sha256 = "bde7231dda570182a0c4e73645025aad818be321bea0c0425dddb275b28d438c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/da/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/da/thunderbird-91.6.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1ed471dab670fe7ba58ccb4fe39bec2f3ee6625a6713c3b1f3fe9703e0a703cf"; + sha256 = "b671d892a013f551ce32c3ee98d956227561a9ad9f168095521f8be1899bd1fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/de/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/de/thunderbird-91.6.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "16b6e291489f37699587b62cafb3caa3e09ae21b160c9739afb35ae450dcffbc"; + sha256 = "cca775ff187ab71db985c031ff08d906fcfba2aa2aa25ad204f1223c94ee1fd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/dsb/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/dsb/thunderbird-91.6.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "3872f1263a7ba9f6a31f1fcd26440ab3ec231efca678cd75459bd71a4b0637f9"; + sha256 = "19bd301bb47874abaece776961e85b277ae02cfe772c11f62b731d19c3d87b39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/el/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/el/thunderbird-91.6.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "aaab178dc1f6d9f1818f63b98091113546bdf36e823efc0c252979b570406ef0"; + sha256 = "40f279167634c0903f60297a76ce483a34233110c34d50d01fdd976f65337e41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-CA/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-CA/thunderbird-91.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d2e98a42a5de6793f34725f989b645a0531dfca95e014e58bcb951fd5a4f9681"; + sha256 = "41ac7d58a099e68cf87f604d77e8fa844e48264b52409b9f8637fc777d15bdad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-GB/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-GB/thunderbird-91.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "4459fb379c2299be6915a5a54ad6963dbd80dd5a9838baf1d2edcf63ef0354bd"; + sha256 = "e20e547b074816931fce3cffe04eb7b9690439f047b2154d2f0d36b7eda9071e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-US/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-US/thunderbird-91.6.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a88c57cb36623d18a53c1940ccfa5874c222b6a2e44aab7760ccd6c70518f748"; + sha256 = "08e963292b4e63be2dad7a24eb125bca484107b05856dcebf98ceddaf47f1e87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-AR/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-AR/thunderbird-91.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "979514cb958a4626d07379099c3fc77ed4208cecd3b0af9c059a04064e60df43"; + sha256 = "23775b4446630146d6e6c34760cbb9c155a21bfa759d6b18135fe28e80459c7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-ES/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-ES/thunderbird-91.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "745d0865606c238512e01e414305f83664b1395ff9d02b36f9df37b1bcca0e2f"; + sha256 = "0ba964ad2cc0d86b12e8498ccfd374931d0e26fb163994704aae622a420bffe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/et/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/et/thunderbird-91.6.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1a009c0ec4ad94819de0eb006c6f0919080271e8d5c6c5b324c6624657ef8440"; + sha256 = "94a73f46e5e2e9672a0c54a4a445c5a24a60924e45d57218a0c5a3eda7437091"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/eu/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/eu/thunderbird-91.6.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3beab0dd08c2089dabf99d246d9a06bb0339b88945e012fadc53a9420b105eb7"; + sha256 = "3fed5e7cc72572e7a71f2916ac1750b40c0896d7786bfb76a49679d15ac07031"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fi/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fi/thunderbird-91.6.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d0006d6b5a2fdeb69171452c9eee4f7e54d18cf0a42bbccc056144af127109c8"; + sha256 = "b7e233e744afd3569748013d091f57fbb8339e1cefd328d1808cccd0abd9f7c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fr/thunderbird-91.6.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4345711b2199bd5f0cc89e34cd7a65bb22290268c872c990fb32ee49c174d58e"; + sha256 = "1066814d16f3de8e0a6b0aad4ecbc078bc4e76a5daad8173d7a0af1986fc49ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fy-NL/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fy-NL/thunderbird-91.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "7f90afe3e04e1a7db5236d12d2133c3552e0d6744262f5107522dc1b88b9d26d"; + sha256 = "eeb7f557ac32ab426c5843061c1fa394671328794f9b0d5313351768ea020fa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ga-IE/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ga-IE/thunderbird-91.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ecf987ec7a479fcd1aeec4a680fe7b785f3273914be7bc5ea34a1160024bca30"; + sha256 = "8c1adead3a4c715cd2e6ebd7d23a086a6bb5308cb8620e35aeef151c3a25ad40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gd/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gd/thunderbird-91.6.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e688777e2ca5a0964bdb295c17de71f0b3e7ce8ed3a81a027cb58d65f0b13843"; + sha256 = "23db6bd6aded7d7424c2c0b5a5c9da938b504b517297b535d0eee907c20ff921"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gl/thunderbird-91.6.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b7e37320a6f29312851d814713522c0edaf3ad10bb6096e08e60ad9d6eae3c34"; + sha256 = "10483ac92240dd7f1a4cc25dfae74291ef3546ff36b51205bcb3fa2af2e97489"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/he/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/he/thunderbird-91.6.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9e317e22ca0e8e6d809437efee263fb3e0b6418696282f8670b7f8f92ec6c56a"; + sha256 = "211c4f58cd5553da8933386c4b1a7847f61df83212228f3ec4ef807a2115f220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hr/thunderbird-91.6.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "51f6eec36a08b766bc9567ae7dbac5b015890c0792dd4a37f9654345bd34f9be"; + sha256 = "3b71a6ab9df2a45c15342f241cb63f323170f692d204e9a98f9772f6e50809f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hsb/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hsb/thunderbird-91.6.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1f91258f84978b313d2ced008ef0e760e5e425dde3116d1e6adfd7d87895a043"; + sha256 = "0603f34c825bee5e813fb63c5f1060e5de31ab89d12abe4259f5f2c56f880e65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hu/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hu/thunderbird-91.6.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d5665c6b1415493f18085c1606b12e4ff52f02ac9d932f5e14c6794685b7c68e"; + sha256 = "64db18fb3477198f696cbf8d100b45abb2cf74abc960c90143abad224fe56e48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hy-AM/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hy-AM/thunderbird-91.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "2100b04070066d8ce65d7bb3bf25d4f3dcdec4c14dce3f9c5455923de84e6c84"; + sha256 = "ec3064d387558c56e80965fc87a73c19ae530802ffff3f0cd35e7026f76655e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/id/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/id/thunderbird-91.6.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7e9e2f1d5ee6db5f72a46a5345c6d4bd4e6cfa76c2637609dab0e415b93e1975"; + sha256 = "a7635897857f1c4bc86b9208ecbfa983a80a889a24274ce2c41d1fd401163230"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/is/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/is/thunderbird-91.6.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "089acd20ab3894dc04ecec3cb85317d40ff9f86a2fef381429f06a70b92f4785"; + sha256 = "310cae89c6a62b5a9cf19a81622395b1d9d2de1670dfb9542d8465fd2bebe3a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/it/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/it/thunderbird-91.6.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "22efeb3bdf740d1b0dfe1850589403758fea11b443ad6099c630e7cab866fbe8"; + sha256 = "826223383cfd0ed931f0df19100ec24e22c5ed6eabb71ebee2663a4199368fd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ja/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ja/thunderbird-91.6.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5e950fb7dae9573d877b783eb12f36cb801f0299fe360e2538aab9a86ffb5911"; + sha256 = "a62b2d76c228d54a00dcb81931a010369ab5cb5f7e5d5601fa74076431ec39c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ka/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ka/thunderbird-91.6.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "24cb7fb080728903c118a31e56a7d1e02e554b2a03ca272ee0e8f14d58e1b1cd"; + sha256 = "2e7b571096baa8d4d68eec97f25197b7504ef0e196bb711344180f4324b260e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kab/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kab/thunderbird-91.6.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0bfd4b98c2659b7541cdaf2fe4be33f71463d6eaeb14b5722f2916abe82411d0"; + sha256 = "378de38b2393987fcbd22057c64c581365ddff6239d8055ac631df9903df4ed4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kk/thunderbird-91.6.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "62d530819b0bc304416db7e470a8856afb8d41813165a8b3ebc417957d5447fd"; + sha256 = "51e8c5d832f8deb27d962ef175cd2bf6ea66fd8c0a24b7c647d4d98d524c3bef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ko/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ko/thunderbird-91.6.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f081bbe2756b4ea78dbbe1a18377eb64ac729329a5bf2c97489dfb03ab1c2949"; + sha256 = "a63cf39f84cab3c6a6164a6c62ace5aab948ab71d8934f5869cd2290851c17ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lt/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lt/thunderbird-91.6.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "26f2cca527fee03e4b7747dceaa0ce1ee0c3f6efb2adc670ec6c1f19d2118d3b"; + sha256 = "1d44efdae4a299d57c1ab4769fccc5326e85b95cb2078332aadde3a3d0d72c7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lv/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lv/thunderbird-91.6.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "f39fb8ddd6e246643750c5f23fa1d5993437c78f4062acc4c3db22d8b1dc3b56"; + sha256 = "cc8e4b043ae003d43240df52eed2b3b3a16cc09e963c6bc768d672e6dcb59022"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ms/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ms/thunderbird-91.6.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "07835a7669f3595f20d7d41db4e799c968d30166f0db764d47b2fb1a8d8e6f0a"; + sha256 = "8b64d50a219467347cbe02e237fc1f5473a9d86d8b29fa0cfaa5c423c7265db3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nb-NO/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nb-NO/thunderbird-91.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "2dda693d9dcd5602cdde27d54871cf5b2b06afceaa0133a77632637a81a4bd69"; + sha256 = "71256fe14843fc5c3026dc17d39d9f10b0dcb5ebe0d1769740397db45164e8fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nl/thunderbird-91.6.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "05a884da304dd5c8692ced6b5d974f14e1b0007ae683f3511285b7432828b71c"; + sha256 = "6cc1efd14f8fdfde047ac8245fcbd42cc6829d4973fadad43e5113d95c2334af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nn-NO/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nn-NO/thunderbird-91.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8250f8d18feb596ed758b07933d590d7f3de016c5ce08eedb6024a4d116acb63"; + sha256 = "efcf3519eed57080c022d8ea3e45bb50cb302d6eead93b2e50d3e6d69635b1db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pa-IN/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pa-IN/thunderbird-91.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5a510109f30fed267a61d8586714e2554b74866de8b1948c80a39ad7db42e460"; + sha256 = "69e27e7a1e7534b6903f3e6a1248b8d62617dbeda0051453f78ebe68bd0e978c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pl/thunderbird-91.6.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d3fad496d1aac376fe9557ba039a916a7527a1a120e102724fd35c469adeb8eb"; + sha256 = "8903c2302e4ec1a77076cf51a770861738793d4f5ec87faa87da922f1be2d620"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-BR/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-BR/thunderbird-91.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "bfd0685dae994a75a284220358b1ebf4d0a71d151b2b674215b5d1c4566784de"; + sha256 = "558adf768654a03738f755b765a2c6c3aad514ffbe532b4e47c0d94cd9dfd262"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-PT/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-PT/thunderbird-91.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d4cded9e8e065c312573931b4e60a5a62a154763fdf859a5fc53d120209520f9"; + sha256 = "2fb3c682ee289e2bdf1263b5c32f38e31090d742b108b373befb3f093d655e30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/rm/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/rm/thunderbird-91.6.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5761e7778adc41e69351c49db232792096a3d69994f79ce556cd4dbb1a356530"; + sha256 = "9e489ce3861ee17a2ee145ed5edb1c0b2c0c3f1446f6fb64081ac623f381ef1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ro/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ro/thunderbird-91.6.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "63bd9a8c5035d8964e609159d301ca52e68fef0f136ad378a8016fd1dc7a1ea4"; + sha256 = "4bf6b617ea7d4a2ebe81a73c09e24cd1e1bb360ca501a4f139c99a84d1492005"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ru/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ru/thunderbird-91.6.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a0d3731c3a6f207e8549d3d5e2e143c0b4620eda6902e9636d8c37558a78d09e"; + sha256 = "fd88dd41fd4c93d829c6e44d2d88092652827ed08121c6ba25cd410082cf4991"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sk/thunderbird-91.6.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "22635dd9abad4690c52932afd8b9b8cdad03270ef87c18ae3061308c62932064"; + sha256 = "53b6fa462a3057e9eec72f75d698631486514839bdf30f6388f9749848846462"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sl/thunderbird-91.6.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e2c395a8483115801b34c8de7a34bea1ce219e1cd0012c7d27af4b11e11577f8"; + sha256 = "cebe056640e0589c8f4ff029aa74f1666b1a0faeb742f356b74e07b2b0998e39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sq/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sq/thunderbird-91.6.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "aeb72ddfb97fa6fad9f4295f00bd01eccc78f919c34b899925383d7877d10454"; + sha256 = "9f1bf49edf710455bcf23cd6c14618518ae4b07a75d259e2cc821d5c85c0e0aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sr/thunderbird-91.6.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ce9b6671b7d138bbad4ccb4a2dd660d8f2ba452f5f331dc8b630005e4a64ff91"; + sha256 = "f287d6abde4537dffa599c54910bda7e0f90596f931d88921d0d3248c941166a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sv-SE/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sv-SE/thunderbird-91.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "59bdd6acf2aecdddb2f31a0e6305ac5eb59d8d8c3ffd6fbaded92d97a8deff4f"; + sha256 = "02952a1f2d47394b4a8ce06af67a1058822c47660f69d606e719f215205709d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/th/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/th/thunderbird-91.6.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "62c76e4291580ec271f36737cb6dd621c6e30ddf02a070b008d312afed0cc727"; + sha256 = "8cec77f0fd16e9ab2b316ba884c26f35dbe15694e22e02ecd27d3caec68970bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/tr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/tr/thunderbird-91.6.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4c59cb186ea76ee79b123d29e3cc8a9c75e58a5f8c46e3b71a7a0b1937d99e42"; + sha256 = "aa66efd16a8e5328e20052676d0e06f3ede903a88262c4b01ff0a78ec013f9cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uk/thunderbird-91.6.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "19df95c2001aee2a6ed00df011caaa5be03062a559619971897640511848856f"; + sha256 = "23d654a7755a846b2354c392a6d86f0794f126425e64a19af7c1f047bd758cae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uz/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uz/thunderbird-91.6.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d773684ed49309e642436b40012b52980286fd07c508d8a9ee92c6210063fa13"; + sha256 = "c97b2d05e7043ba438f313569bb6165fd106b9f2351478549a6de5467f980280"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/vi/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/vi/thunderbird-91.6.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8bda4d3c6a9ceda51fcccfeadb9942c595acffb8a14823a59523468871332651"; + sha256 = "0c4341944eeb0d6724dbabda5dc68796cf40034dffed1d0af2d942af5eb242f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-CN/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-CN/thunderbird-91.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4ffa3da9d6c9f45fa90527621af47e67e1c76f09c325a1176be2f14f52ea9362"; + sha256 = "86bb80438e4e729faaf57a3b5651b936647ec6ff58c78e263011e242d7e41fbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-TW/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-TW/thunderbird-91.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e3c053b3835566481e1207cc1da3922ce4949c0215553bc2dce5a62715a7a919"; + sha256 = "733ec3383204fff674456bdda36f7088e32914fceaa62fa6a98768e9ecbef321"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/af/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/af/thunderbird-91.6.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "f131f7266ae90708a4f5a544d5b6b656488e676e79e91e998ac4dacd969effe4"; + sha256 = "3c8f1f172919ef3c5327bf337a49ed428f6581e3dc6f3ed69c7f6268cf8f4fea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ar/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ar/thunderbird-91.6.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8dbb28b438d1f72d314b32ad8b884829a9bda3bb3a8d4a677e3abcb0f7edc005"; + sha256 = "e938549a5be6c8f1dff66e330cc9e059a352ed9b539145a812838aeec2668bdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ast/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ast/thunderbird-91.6.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0c1dfbb7b8d001e28ba6fb5648af5d993b3a89e19381cb9bdee898ea7134ec64"; + sha256 = "a0d93d9f8c9ed659409f971ebecdd6134db8a4b954db9638b7a440c898adb0b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/be/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/be/thunderbird-91.6.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "dc4888c238652ff13e66ada3d21e129f3bc01f663dec38bed1f200426c5ec8af"; + sha256 = "741da67fb46ef6e73196dec3f0c71ce1024e282421c6a8e111ffb9ba2a2a5014"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/bg/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/bg/thunderbird-91.6.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "77c370a1f1e9e0683baf5a6a6abe937f198be08cf6ed3a6f29c59c3be64080ff"; + sha256 = "afb8fac75b94957f60686c170bec9af438d04c4f42d259e80c07bb446c875aff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/br/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/br/thunderbird-91.6.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "bce47698480a1c38d5b0d397c3e69c3c5ac99a0937885abbd633284614daea6a"; + sha256 = "474656d25e48718b303b2d4463465bb7a272cadcabf6360adfaa7dd23c808c2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ca/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ca/thunderbird-91.6.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bf288be4f977ebaffcd2e16c691a3223924fec7f39ec3e7368fb9b88f9c1156b"; + sha256 = "c2b4e38ea9810f10455c78de2d68a76655eb855ea8e3d55c895e6f8d5df84066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cak/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cak/thunderbird-91.6.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "fcfb6268df5aba758dcefae6e6c0469648d56663789d32175a8e52068d48aaf8"; + sha256 = "1da916a640b36c8e2f84e733dfa6b1cd4a7e90dc2367e56522ad3525d646712d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cs/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cs/thunderbird-91.6.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "529b31c7cd03b0c199a8acab13dfb684db5c2bd9fa10f96e8da748bcaa5e0a04"; + sha256 = "f0ff0220167566300fb0913f58056ff81c5b70f2835830d325c1235caa468a99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cy/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cy/thunderbird-91.6.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c4b22b81608421ff5c6ce74ea7b145a6ad09ae506ae25af9ad93ac0434ad1734"; + sha256 = "1b8e7ae9b27dab0872443a2b26733888d569765e6e72cfaea775d157273c8344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/da/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/da/thunderbird-91.6.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "cf28d1a77ac2acf26fc314628fe21e5c9ddfcbe85a76d28070d15d78a6b73360"; + sha256 = "79ae2ac91c0540e76578556c82bec7340baee79758ef0e157155aed8f1d68b3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/de/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/de/thunderbird-91.6.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a752cd04414a80ed92e42bf95b6460714b500e1d466d5663a64c9dcc7a678e66"; + sha256 = "cf5096d178152abfcc5fbe7cd109722875d8d11575b526577e713a4efd28d226"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/dsb/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/dsb/thunderbird-91.6.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "31ef88cc4cc2892fd501df71a751aa3c3ee8acc61fdb437897172de8e75de9c2"; + sha256 = "a650eda884498dd7d0e3dbd73cb1e9b020f10e690ce26d77ed654c0202f1d915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/el/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/el/thunderbird-91.6.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "5edf4e1008b3d8d19d623a8f3cf2d8fb1f7a1030de9db686bfb8c09c61e740d2"; + sha256 = "be65c035956efd25246265fa102f934fc14794457fc110d815b140165c81fed9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-CA/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-CA/thunderbird-91.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "60e91f33b0b5e75e4a18f1fac688e4c249be77874103d1a44ad2cbd1188afc6d"; + sha256 = "dc906637f397a2ad86b72d8c4636b511263255327b3a92da5adc9d3444117311"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-GB/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-GB/thunderbird-91.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b08d2650702304409b19967d5ff6883881d37577c8e3ed0d545e36e81306cc96"; + sha256 = "0f028e97594448ab058b839e3a4ab2f3aaefe79732512a4f193c53dc75c59e3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-US/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-US/thunderbird-91.6.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "347dfd3d8bf993e2fdc7c844c8b1a94925ab637acad9e07a1616f8657e8574b3"; + sha256 = "5f24ac86a2e91f4568d179529caf5254c3aff65593b3a79d25ef96d03211d0c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-AR/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-AR/thunderbird-91.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e2c23ea75312f53201e02079063c946ae76fd11acb75cafed8d643ad49e5d484"; + sha256 = "5c5a93460f61d7e8a7168c14a46ff24fdecbf67c06da0aab2b30602bd1a1ef51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-ES/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-ES/thunderbird-91.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "205d541dc22a3961b1aaaafd617743d1a25b52ee5bdf8b9add6ca56fbcd6861e"; + sha256 = "8ecf33158eda96155604583c57dccc55c7168abd8dc161e8801da0e7c7d24b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/et/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/et/thunderbird-91.6.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4967717f2b6c21d9868e4fdb812e999f3002bb197b3a111a479d97fabc70d2c2"; + sha256 = "a0e3b7c8c095dd8c116630fec01f50fca6b07d83902a7a004d2f4b52b02536e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/eu/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/eu/thunderbird-91.6.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "ea5ad491a38b4fd3b78f0741b7545ea7a9d11c3cd82f992fe7b6f38acd4f1a36"; + sha256 = "e18f1f105a7e7a88410e749ed9e6e51685cbd6d9fd44f37c8146d333ba405274"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fi/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fi/thunderbird-91.6.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "45884d2b6d7af2a2f9f4195d5ddc9eadbd34a0d6cae039193b4eba4da49e3909"; + sha256 = "984c5d69ef752ae62b08e6615ca19384ff9b2a46167d17ad01e71bec48dd7996"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fr/thunderbird-91.6.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "1d2153eb9e903a37e03596e11d2bc0a869260421ac07b3787d05a163c9c5b32d"; + sha256 = "ae2fabdf55e587f3b57849ddd518bfac0035f5c0e1eaed585713f022fb50fcab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fy-NL/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fy-NL/thunderbird-91.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6ad87450cbb8a98fbd55d7399ef73f5668c1f8e288cb6d36b426fc8c373837bd"; + sha256 = "a4abcd89e36fbdad7f2102142b0790f1223116b5a016bce6cffd59f5547b26e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ga-IE/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ga-IE/thunderbird-91.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "4b268107debcde5a45fc69c5ce4881b0bc8b9809a2cfcf877fe655339ec5890d"; + sha256 = "eff63f42237deb6ecaa60b940ec877e88827769346e14d55624ce3044fac1860"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gd/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gd/thunderbird-91.6.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3a6f0b431d5301a9cdf1499b186580bfbf468aad4e7123175a9defa04e68e6ac"; + sha256 = "4399f90f6e28be1bfd68ef3273a4b11cb3a912394033a4ba4f0f722eceeb916e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gl/thunderbird-91.6.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e79001ca8b96cc9c5cb1a9ada3362e5365b68c05b4324ff2d36e1421faee691a"; + sha256 = "be6a01476604cf120131724e0e5afc1951421baf489c231fd10115b947a56f41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/he/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/he/thunderbird-91.6.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d246a1b5a9d03e656392df6fdd4a6dda9e035551d0498519fbf53d44ec033a34"; + sha256 = "fd3548a80dc4983b264f5a2062d87bd9956c681fc191d35246bac2248c61c429"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hr/thunderbird-91.6.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f3d4604bea32362a4ee9ca41d3ef98e910ff448b32e37d0c59dc33d92366ab1f"; + sha256 = "e149a9a469ef013264ffbcf10051e1476f946f52ad4eae8f734643394f6f74c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hsb/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hsb/thunderbird-91.6.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8ca969121ab8fc69dc598415a7d5ece9fd86e51c3b90f48f9c51d01157a3a14e"; + sha256 = "77baab4a6d3ba3339cc32475fdd654034eb57e61d2c51258e38eba6c14aa2f89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hu/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hu/thunderbird-91.6.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8b76452c8aa27409237d592fa386f8fa257bf44151e77f5cbf990b1c7580689f"; + sha256 = "c796ac09b0e4033f1ab9d1e6da4b78e540f1b731bfbcda040743e409164ea2f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hy-AM/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hy-AM/thunderbird-91.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7855e8b013d16365fcbf883646ac83f8c094b3efc4ab9c6ada1eccf211c53d2e"; + sha256 = "c6023895e3e26e7b52c277640702a821bf4a562287ba7d8e632a59774a6757ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/id/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/id/thunderbird-91.6.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b41b74af5f85a56e0ffe6345f78f39190b22a867110ef043f24300f68e845324"; + sha256 = "a76f567644ef6092168e2c526839bc0901a18533f08ac525381e74f77e9fcb7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/is/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/is/thunderbird-91.6.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "963c23e640536d88fc486b654e69584587cdc39d2acff9f64372faf7fd73f8db"; + sha256 = "a023e32837355ab83583bcf504e9ff3210f3a68d30c73477ec158ef1162df4eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/it/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/it/thunderbird-91.6.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4835f22538eaf2da8913d79ae575c7401fcc7fb3b7c0d21d386906c055ed7912"; + sha256 = "459aec2da31a3159f0d81cb0876686e63d9b1e72ad36e967472d1ce98c380983"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ja/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ja/thunderbird-91.6.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "edd3a047d63172f5f42fa31b4b89a8d07c6d9eccb3d53d19f4f7ad8cc1cea539"; + sha256 = "307faf7556594072ab83121c1774005392bc556396c5234a2467ef6843a490f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ka/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ka/thunderbird-91.6.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "06b55cb6215cece0d95827eeb196bd5f1255d348a7d906a0515667a71050ef85"; + sha256 = "42cd7f10453541b23099631f402ff70103131025ef868de06fe2e82430bb7eb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kab/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kab/thunderbird-91.6.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "36de72132e0311c4428182c5795249e37042f1eb05d1c05aeff9f1e46b602656"; + sha256 = "cc62b8ce7bea99dd9e9cf660f5dcaac4b9a44746b7b4cccf84612ef844df9e7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kk/thunderbird-91.6.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "e3462a463f867b4645bc77739e275deae77bf64068a6ddd1522ac281cfbfbd3d"; + sha256 = "ee9e74534c1d7716ea80e2874007b4f9778942bcae559effc830477e614341ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ko/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ko/thunderbird-91.6.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "e90f011e920958ea853dd426f57a1e5cb0593ce117d5a9e19a90c6df69d729c9"; + sha256 = "12106fad7493ce63c189b0a7e92c9828c7b2d46d7f5cd9ecadbc90be041e6bbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lt/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lt/thunderbird-91.6.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4e3eaffa505b5f8a37b0534a754ab89c2f7b4dc65ead78ca266d4fa8cb5aa841"; + sha256 = "ead9b5e035f2fcd1213aba5e63c8898b96bf0bfaefde7709228014aadf608420"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lv/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lv/thunderbird-91.6.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0dd8c818bd60cd6e67df751933c0aeb89bf10fa64235edc639955c86a0e51168"; + sha256 = "72980d6c676a269b9d3220a171cffd67ebc1dc0759bef5ac15db76725aac86cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ms/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ms/thunderbird-91.6.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b0b9f303014a1b90a52ec39f36f2e2029562ef70fcc9b77c0f7048558f1ad7bf"; + sha256 = "dfd0cfceee31c31a300ebe37fe99690008f5a21992e7188680b319fe5b5d0207"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nb-NO/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nb-NO/thunderbird-91.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "89f787643d5d2451a0f7095f69805d4c0d0e05c62fbe0468c78b6bcc9dfc0dcd"; + sha256 = "7610a56f57d4753f6fd7a55147d7a22157453b47548fe807b5fdbc1ef166eda0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nl/thunderbird-91.6.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9ebf8a5cd8df953078dc634ac17325c8e0fdd01cce3dbb8561fb29e8b8a4e6cd"; + sha256 = "6a470f707e9838937c67e2ce7c2da216e23964bab94c4590d20cedb4b337d18d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nn-NO/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nn-NO/thunderbird-91.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ec702407e9dfd14de776a5409413b8ddf3c32cf6aa17e8a37ba349e8fa7ba1db"; + sha256 = "e393dfbd10ae6ce910ed594ca6d314d048d57e98a1a01d53be82788d6a3988d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pa-IN/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pa-IN/thunderbird-91.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f26de0a71646669f07ba23c8e181700b1569ce41049f62215c19ca746a4ca38d"; + sha256 = "ddc8558e84531478a4295fe1a3b09f95df458e1f1ecec89b0e1ee19e0dea6e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pl/thunderbird-91.6.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d497057a71cfe867f53a5dadf3b1b8fdf30db8470cbfedd416b39acef3d61163"; + sha256 = "015e25da0565942bbad23a9e0a345cbec4b24676c21286bbce3cf85938031ca2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-BR/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-BR/thunderbird-91.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "90367905fe8dd83f9c6acb093e9ba6583124171037755ef2f3a6771c94e1cb44"; + sha256 = "2966875426c08658dcc5aec7e91305e40342bb7318b8ba19482b036d6f1efc9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-PT/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-PT/thunderbird-91.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b611af59f7f88efa10aef43f8ac464b5c514412b534cff39eb2844ae1ca18077"; + sha256 = "c3ee66dff637e75aaa4a8e3d40c85176e152c19464e7afcbd40cc1e3108a1d91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/rm/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/rm/thunderbird-91.6.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5d75ac9e6c0c27b0faf436d69305f206e09867c306264a4de30cd3b1f879c1d0"; + sha256 = "c320c05190b160ad807528e9be6604ac5f79958fad9a4de32c55842a94db20fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ro/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ro/thunderbird-91.6.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "aa64e96ad2d1a361c8cd96b5b0e88cdd51eba2c3c036ac453ff9225320d08f6a"; + sha256 = "90547a8965aec3db8d4150c0e232bdf6e623df1850cb206a9cbca43432a3cd35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ru/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ru/thunderbird-91.6.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "6d293d0ee9eebd01c6e36e085333c4da15f0ce2ece73dc99015545255a435538"; + sha256 = "1dbaf198232b519711c90646c05d77b16bdad20054aaa7f313255ac15e773dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sk/thunderbird-91.6.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "37436cda08659abd49108f7e9a8ee5645d2ee1ed0086a7b4158279342d0cbdfb"; + sha256 = "8d92baafe787bdd054cf7c76a7135a6075da0bd573237f28dcb379fb6e1f7c49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sl/thunderbird-91.6.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "fc8e6fed968e6312f69545479b5b3230390d41490a2a5b6385f046a2a3709018"; + sha256 = "f6ba6c8a7c7aacd28959c85adf708ad1661b4921c82035a1c954c6f6264d101a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sq/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sq/thunderbird-91.6.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ce68e8f855d6d366b1490cc3b7e044a84fba63bcfa11453afc4b98ec665450c6"; + sha256 = "e4fe39206253ab53000e5d5265e2cf3183f8c15900f1f0e5ba23cbe141145e20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sr/thunderbird-91.6.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "128843650ddfa57493c8691e7c591685cca4b1ab6c118949ef1580318954f110"; + sha256 = "469cda2fad3873e8de320ee7a68c45c4da6cad5e6d9904242d2c489a1e5b829e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sv-SE/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sv-SE/thunderbird-91.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7180055d5184c38f3fb893538b0c270d3d125da4434debe6fffdcd3288d8ea53"; + sha256 = "0303bb0290c84ede66d657ac88795e879611c42815e5eaec98beb235d7764922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/th/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/th/thunderbird-91.6.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4b964b7517b941622f18328f73813aca740a4da1799805a0a267b510704308e7"; + sha256 = "5915739123b4c14d72f919fdb193a65e3a15ef472e563d21d7e1e872858f3364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/tr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/tr/thunderbird-91.6.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "71d551988a6ff2bd96900bf4ce72e05ac47bcb36af9a25af4e3b76d16da37d50"; + sha256 = "8cf4a385c861d5905b742a0366df783666a05e154b4e0f23e65f883c81b2bfd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uk/thunderbird-91.6.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e62b6fce0bb1175c9c6acb37ff9454509766d4953fb0d4494023143fd70650a9"; + sha256 = "7e1a14c20e1ef7aa923bdb8d09a3a513dedd653388721d8537f42354c0cf386d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uz/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uz/thunderbird-91.6.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c5c9e10e82ab793d9a82d95bcb20eb288395e32c27dcf5ca2a91fc937e479aba"; + sha256 = "8f129954fcccf19fe4e46cb66f35fa298ef396d5327f647d1e7b813345dc7ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/vi/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/vi/thunderbird-91.6.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "081895dc1684360c0859d5084ece871c7539e91b858392dbaa3ddf8ee0f38ea9"; + sha256 = "ab232199fe149938019dd3e8a242630875be9529e32050f94add2419d2690726"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-CN/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-CN/thunderbird-91.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b5fadde23bd94f3ab2fbe6b8070040d9e89a506a399d9c1348b80a8639b8220b"; + sha256 = "cb58b53ffb9eb1d05ff3ae856a80f8f504f86e8cdaa2075ff5b5bfcc27712b97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-TW/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-TW/thunderbird-91.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "4d31d6a8d4f94486e4ebec3c98d2d535fd5485b3b73dfa0a52760300608c7eac"; + sha256 = "441a2fc15f7d4efeb7f76cef1166c694cd7713b12f75aab0ceae161f3e77f934"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 033e5557589..5b0b66ca345 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.6.0"; + version = "91.6.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "a11eafe1390141ee3508eea06ba8ab135d0725513977a3b37b3b35f413a1f825dc14fef530b9ac961840804be59291c7f5cba3c93b12726605d4a7255660f749"; + sha512 = "a74d9489bbd2d62916eac8214c6c3a54dfa0c03b56ad471750724315f8bdd96b6ee1079687ac973264ba0f70bdfbf2f183f359c33f7fcda9a9e48914636b1ab2"; }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index f98b1c28ebf..4dd603dae1e 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.88"; + version = "2.89"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-B/gcuga82lZSLPKjYWAiLyvqf1FRQmHJsH2jqLkusjA="; + sha256 = "sha256-OCfgWMKFhdjdmNHnTUP2VthPxBjAVd9Z+yH/c+vF1a4="; }; - vendorSha256 = "sha256-N7zOrSMrCR/eOH+08TImI1q2AFGUuWN7xIt3CUVB9rM="; + vendorSha256 = "sha256-E6bMpWzXb5dMPXkrVSJJWXJYvkmI3cNRseMgrQNpCl4="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 3128529f0e6..0b95023ad59 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "saaohHHjX9ws74SXlpP+V9cks0ddLkz04ceY14uoVhA="; + sha256 = "A1634b3uxlILMpx/9jpCIApqAqofvD4ZPasVKL29Gtc="; }; modRoot = "./agent"; - vendorSha256 = "sha256-Xfzk6Ts6+LzGaMTcbopGG6WT541nkAnZxq/3AlX81ks="; + vendorSha256 = "sha256-LxJtLQr8djoRGznT5hL2agTgtZY6pFS8Zo0BwHDmugc="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 479b3b641cd..383c5710808 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -7,78 +7,97 @@ , gtest , openssl , gflags -, gnuradio3_8 +, gnuradio , thrift -, libpcap +, enableRawUdp ? true, libpcap , orc , pkg-config -, uhd -, log4cpp , blas, lapack , matio , pugixml , protobuf }: -gnuradio3_8.pkgs.mkDerivation rec { +gnuradio.pkgs.mkDerivation rec { pname = "gnss-sdr"; - # There's an issue with cpufeatures on 0.0.15, see: - # https://github.com/NixOS/nixpkgs/pull/142557#issuecomment-950217925 - version = "0.0.13"; + version = "0.0.16"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby"; + sha256 = "sha256-ODe4k6PDGtDX11FrbggEbN3tc4UtATaItUIpCKl4JjM="; }; + patches = [ + # Use the relative install location for volk_gnsssdr_module and + # cpu_features which is bundled in the source. NOTE: Perhaps this patch + # should be sent upstream. + ./fix_libcpu_features_install_path.patch + ]; + nativeBuildInputs = [ cmake - gnuradio3_8.unwrapped.python - gnuradio3_8.unwrapped.python.pkgs.Mako - gnuradio3_8.unwrapped.python.pkgs.six + pkg-config + gnuradio.unwrapped.python + gnuradio.unwrapped.python.pkgs.Mako + gnuradio.unwrapped.python.pkgs.six + ]; + checkInputs = [ + gtest ]; buildInputs = [ gmp armadillo - gnuradio3_8.unwrapped.boost glog - gtest - openssl gflags + openssl orc - # UHD support is optional, but gnuradio is built with it, so there's - # nothing to be gained by leaving it out. - gnuradio3_8.unwrapped.uhd - log4cpp blas lapack matio pugixml protobuf - gnuradio3_8.pkgs.osmosdr + gnuradio.unwrapped.boost + ] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [ + gnuradio.unwrapped.uhd + ] ++ (if (lib.versionAtLeast gnuradio.unwrapped.versionAttr.major "3.10") then [ + gnuradio.unwrapped.spdlog + ] else [ + gnuradio.unwrapped.log4cpp + ]) ++ lib.optionals (enableRawUdp) [ libpcap - ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ + ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ thrift - gnuradio3_8.unwrapped.python.pkgs.thrift + gnuradio.unwrapped.python.pkgs.thrift + ] ++ lib.optionals (gnuradio.hasFeature "gr-pdu" || gnuradio.hasFeature "gr-iio") [ + gnuradio.unwrapped.libiio + ] ++ lib.optionals (gnuradio.hasFeature "gr-pdu") [ + gnuradio.unwrapped.libad9361 ]; cmakeFlags = [ - "-DGFlags_ROOT_DIR=${gflags}/lib" + "-DGFlags_INCLUDE_DIRS=${gflags}/include" "-DGLOG_INCLUDE_DIR=${glog}/include" + # Should use .dylib if darwin support is requested + "-DGFlags_LIBS=${gflags}/lib/libgflags.so" + "-DGLOG_LIBRARIES=${glog}/lib/libglog.so" + # Use our dependencies glog, gflags and armadillo dependencies + "-DENABLE_OWN_GLOG=OFF" + "-DENABLE_OWN_ARMADILLO=OFF" + "-DENABLE_ORC=ON" + "-DENABLE_LOG=ON" + "-DENABLE_RAW_UDP=${if enableRawUdp then "ON" else "OFF"}" + "-DENABLE_UHD=${if (gnuradio.hasFeature "gr-uhd") then "ON" else "OFF"}" + "-DENABLE_FMCOMMS2=${if (gnuradio.hasFeature "gr-iio" && gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}" + "-DENABLE_PLUTOSDR=${if (gnuradio.hasFeature "gr-iio") then "ON" else "OFF"}" + "-DENABLE_AD9361=${if (gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}" "-DENABLE_UNIT_TESTING=OFF" # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as # armadillo is built using both, so skip checking for them. - "-DBLAS=YES" - "-DLAPACK=YES" "-DBLAS_LIBRARIES=-lblas" "-DLAPACK_LIBRARIES=-llapack" - - # Similarly, it doesn't actually use gfortran despite checking for - # its presence. - "-DGFORTRAN=YES" ]; meta = with lib; { diff --git a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch new file mode 100644 index 00000000000..cfeb0bd416b --- /dev/null +++ b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch @@ -0,0 +1,47 @@ +--- a/CMakeLists.txt 1970-01-01 08:00:01.000000000 +0800 ++++ b/CMakeLists.txt 2022-02-16 20:41:53.725290020 +0800 +@@ -1214,7 +1214,7 @@ + BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build + CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_LIBDIR=lib + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + PATCH_COMMAND "" +@@ -1247,7 +1247,7 @@ + ) + set(VOLK_GNSSSDR_BUILD_BYPRODUCTS + ${VOLK_GNSSSDR_BUILD_BYPRODUCTS} +- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + ) + endif() + ExternalProject_Add(volk_gnsssdr_module +@@ -1256,7 +1256,7 @@ + BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build + CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_LIBDIR=lib + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + PATCH_COMMAND "" +@@ -1271,7 +1271,7 @@ + BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build + CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_LIBDIR=lib + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + PATCH_COMMAND "" +@@ -1310,7 +1310,7 @@ + if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH) + if(NOT CpuFeatures_FOUND) + set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES +- INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + ) + endif() + endif() diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 63adbf04b0e..f3a56cfdb05 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -251,7 +251,11 @@ stdenv.mkDerivation rec { ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must - inherit boost volk; + inherit + boost + volk + log4cpp + ; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-qtgui") { diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 784ab7bd0fc..638064bbd07 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -275,7 +275,11 @@ stdenv.mkDerivation rec { ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must - inherit boost volk; + inherit + boost + volk + log4cpp + ; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-qtgui") { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 2865e8b70a1..eef1960ae1f 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -49,12 +49,12 @@ , versionAttr ? { major = "3.10"; minor = "1"; - patch = "0"; + patch = "1"; } }: let - sourceSha256 = "sha256-bU6z7H08G8QIToogAMI2P5tHBtVZezlBDqSbnEsqAjE="; + sourceSha256 = "sha256-vsAK+GQzcpA9Vsa6q4RFEzVpbF7/+yZkMsemKn6VhIg="; featuresInfo = { # Needed always basic = { @@ -293,9 +293,15 @@ stdenv.mkDerivation rec { ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must - inherit boost volk; + inherit + boost + volk + spdlog + ; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; + } // lib.optionalAttrs (hasFeature "gr-pdu") { + inherit libiio libad9361; } // lib.optionalAttrs (hasFeature "gr-qtgui") { inherit (libsForQt5) qwt; }; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 5fe7ddf813d..28be25920a4 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -5,7 +5,6 @@ , qt5 , gnuradio3_8Minimal , thrift -, log4cpp , mpir , fftwFloat , alsa-lib @@ -39,7 +38,7 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { qt5.wrapQtAppsHook ]; buildInputs = [ - log4cpp + gnuradio3_8Minimal.unwrapped.log4cpp mpir fftwFloat alsa-lib diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 6960eba6a57..567a587e6d5 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -7,7 +7,6 @@ , thrift # Not gnuradioPackages' , codec2 -, log4cpp , gmp , gsm , libopus @@ -48,7 +47,7 @@ gnuradio3_8.pkgs.mkDerivation rec { buildInputs = [ gnuradio3_8.unwrapped.boost codec2 - log4cpp + gnuradio3_8.unwrapped.log4cpp gmp libpulseaudio libconfig diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index b41d266dbab..5302b43bb02 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.15.3"; + version = "3.15.4"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-suWp/XplruWriGIi1q9Pe3vH91XaegOUFXH6vWueFJk="; + sha256 = "sha256-OyQcUopCqL398j5b+PAISDR5BZDQhJHezqnw8AnYWJ8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index 1e3c96ae8c6..ff2b211b34d 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -1,18 +1,25 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl, cmake }: -let version = "1.6.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "tetgen"; - inherit version; + version = "1.6.0"; src = fetchurl { url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; sha256 = "sha256-h7XmHr06Rx/E8s3XEkwrEd1mOfT+sflBpdL1EQ0Fzjk="; }; + nativeBuildInputs = [ cmake ]; + installPhase = '' - mkdir -p $out/bin + runHook preInstall + + mkdir -p $out/{bin,lib,include} cp tetgen $out/bin + cp libtet.a $out/lib + cp ../tetgen.{cxx,h} $out/include + + runHook postInstall ''; meta = { diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index fe99b045512..bdd2796addc 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -130,11 +130,12 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ] ++ optional buildIde copyDesktopItems + ++ optional (buildIde && versionAtLeast "8.10") wrapGAppsHook ++ optional (!versionAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2 ; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 806a3c34df1..22e755bd852 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.39.1"; + version = "3.39.2"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "1781ded0d0062f40a7eaf3ead8dcbef4429c6321"; - sha256 = "0xdpbfjfa1q4cnf87nl7l760ivr4agpqmy3i1f2b132sgbjzm1xx"; + rev = "402f41cdedbd46a368fb7807bebe83550d887631"; + sha256 = "0jddakr07ixspw19xblpj1882vxxaljg3fflhn4myvigwzkav334"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 60f9810dfb6..c41c8593a5c 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -7,13 +7,13 @@ assert !cudaSupport || cudatoolkit != null; let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { - version = "3.6"; + version = "3.7"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n"; + sha256 = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; }; buildInputs = [ @@ -30,7 +30,7 @@ mkDerivation rec { with a graphical and command-line interface. ''; homepage = "https://colmap.github.io/index.html"; - license = licenses.bsd2; + license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ lebastr ]; }; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 86cab93fa20..5cfd7be8e64 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20220210171524"; + version = "3.1.20220217190813"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = version; - sha256 = "sha256-Z0Btg2NklOwwv9c9lIwE6ONpfwCqZfraNWZd3qxzpGs="; + sha256 = "sha256-2Zd1Z/Tv8wAiqlaYkZRflsUVl8OAOXdufq9k4j4L7f0="; }; postPatch = '' diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 40c102fc682..f4a3da9711d 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,8 +1,8 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "6.10.0"; + version = "6.15.5"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -29,12 +29,31 @@ python3Packages.buildPythonApplication rec { wrapt ]; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "199a86c8d1fcfdb88c4271a1507b0ab371a15bc407f2dad9b0ab8c43438adff8"; + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-i8C7gPLzUzSxNH9xwpr+fUKI1SvpYFsFBlspS74LoWU="; }; - doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json + # See + # https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99 + # for the current basic test suite. Tibanna and Tes require extra + # setup. + + checkInputs = with python3Packages; [ + pandas + pytestCheckHook + requests-mock + ]; + + disabledTestPaths = [ + "tests/test_tes.py" + "tests/test_tibanna.py" + "tests/test_linting.py" + ]; + + pythonImportsCheck = [ "snakemake" ]; meta = with lib; { homepage = "https://snakemake.github.io"; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 76d2318cead..afd05c3e8f7 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.1.4"; + version = "4.2.0"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -29,6 +29,8 @@ mkDerivation rec { "CONFIG+=StableBuild" # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" + # Tries to download x86_64-only prebuilt binaries + "DEFINES+=DISABLE_AIRMAP" "../qgroundcontrol.pro" ]; @@ -62,13 +64,13 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "0lhc36jpy7a5bnysqi574nk5izglj557mf8n9lcsgvzwxlkb2rbf"; + sha256 = "sha256-TBnJQKO9cwxP9q+bIB1CaGnm9npymJ3iEAD9kPJi9JA="; fetchSubmodules = true; }; meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; - homepage = "http://qgroundcontrol.org/"; + homepage = "http://qgroundcontrol.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ lopsided98 ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 6dd9c61d660..73d35b1bd9b 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, libgit2, ...}: +{ fetchFromGitHub, libgit2, ... }: libgit2.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ @@ -8,15 +8,18 @@ libgit2.overrideAttrs (oldAttrs: { "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_GSSAPI=OFF" "-DUSE_HTTPS=OFF" - "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 + "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 "-DUSE_NTLMCLIENT=OFF" "-DUSE_SSH=OFF" "-DZERO_NSEC=ON" ]; + src = fetchFromGitHub { owner = "romkatv"; repo = "libgit2"; rev = "tag-0ad3d776aa86dd607dc86dcd7f77ad3ed7ebec61"; sha256 = "sha256-mXCmspM3fqI14DF9sAIMH5vGdMMjWkdDjdME4EiQuqY="; }; + + patches = [ ]; }) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 39b52cd7fa6..9f0126d9ac4 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "sha256-xXE0BCO1Ur5qhn0gOKOqaSGKNeXNEHD+pZCz1SoPD3A="; + sha256 = "sha256-IEo8poEYPjAbBGk+SQdJqyhwgMYjNLdibI+AktVIg1g="; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 7983251a459..51c9dd71f16 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -14,6 +14,8 @@ let rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e"; sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI="; }; + + patches = []; }); rubyEnv = bundlerEnv rec { diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5f28580c7d4..80c2679d05c 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-X7TDbThWKS6/WEBR1ZMG2WrYqjK1U3RSsdnEdvlasRo="; + sha256 = "sha256-Z/E2R6RlF6K1Z83Lc8mHIdddNqBDLeuxUCK3f5wTgzM="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-rIG57oPCTUz4HNJyuMBPlKTSh02ecF5052Q1P9wGq1s="; + sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE="; sourceRoot = "${pname}-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch b/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch deleted file mode 100644 index 0bc79624860..00000000000 --- a/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 635772c4c5ecf11a0f84e6c9fc273dce6b9a5688 Mon Sep 17 00:00:00 2001 -From: V <v@anomalous.eu> -Date: Thu, 10 Jun 2021 18:36:22 +0200 -Subject: [PATCH] Change product_version to user_agent_product - -This is its name as of CEF 91.1.0. ---- - obs-browser-plugin.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp -index 1a6a009..5eb379e 100644 ---- a/plugins/obs-browser/obs-browser-plugin.cpp -+++ b/plugins/obs-browser/obs-browser-plugin.cpp -@@ -298,7 +298,7 @@ static void BrowserInit(void) - prod_ver << std::to_string(obs_maj) << "." << std::to_string(obs_min) - << "." << std::to_string(obs_pat); - -- CefString(&settings.product_version) = prod_ver.str(); -+ CefString(&settings.user_agent_product) = prod_ver.str(); - - #ifdef USE_QT_LOOP - settings.external_message_pump = true; --- -2.31.1 - diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index f8bed236563..6d3f9b6d32d 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -34,8 +34,10 @@ , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio , libcef +, pciutils , pipewireSupport ? stdenv.isLinux , pipewire +, libdrm }: let @@ -44,22 +46,19 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "27.0.1"; + version = "27.2.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "04fzsr9yizmxy0r7z2706crvnsnybpnv5kgfn77znknxxjacfhkn"; + sha256 = "KZgwAtyxv2vXDW7vF1eArF5Mqw45NngwChc+5OnXuXg="; fetchSubmodules = true; }; patches = [ # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch - - # Lets obs-browser build against CEF 91.1.0+ - ./Change-product_version-to-user_agent_product.patch ]; nativeBuildInputs = [ @@ -89,11 +88,12 @@ mkDerivation rec { x264 libvlc mbedtls + pciutils ] ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio - ++ optional pipewireSupport pipewire; + ++ optionals pipewireSupport [ pipewire libdrm ]; # Copied from the obs-linuxbrowser postUnpack = '' @@ -143,5 +143,6 @@ mkDerivation rec { maintainers = with maintainers; [ jb55 MP2E V ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + mainProgram = "obs"; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix index 5c13d33ae46..d747268cc55 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix @@ -4,24 +4,48 @@ , fetchpatch , cmake , qtbase +, qtsvg , obs-studio , asio_1_10 , websocketpp +, nlohmann_json }: stdenv.mkDerivation rec { pname = "obs-websocket"; - version = "4.9.1"; + + # We have updated to the alpha version when OBS Studio 27.2 was + # released, because this is the only version of obs-websocket that + # builds against the new OBS Studio. + version = "5.0.0-alpha3"; src = fetchFromGitHub { owner = "Palakis"; repo = "obs-websocket"; rev = version; - sha256 = "sha256-XCiSNWTiA/u+3IbYlhIc5bCjKjLHDRVjYIG5MEoYnr0="; + sha256 = "Lr6SBj5rRTAWmn9Tnlu4Sl7SAkOCRCTP6sFWSp4xB+I="; + fetchSubmodules = true; }; + patches = [ + # This patch can be dropped when obs-websocket is updated to the + # next version. + (fetchpatch { + url = "https://github.com/obsproject/obs-websocket/commit/13c7b83c34eb67b2ee80af05071d81f10d0d2997.patch"; + sha256 = "TNap/T8+058vhfWzRRr4vmlblFk9tHMUNyG6Ob5PwiM="; + name = "obs-addref-werror-fix.patch"; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase obs-studio asio_1_10 websocketpp ]; + buildInputs = [ + qtbase + qtsvg + obs-studio + asio_1_10 + websocketpp + nlohmann_json + ]; dontWrapQtApps = true; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 4845b1b6466..e83fc4ef501 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "colima"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hZ5BqNHQAMzL69ptpbTT+fN4NdV4AFhboCL2t1sF5AQ="; + sha256 = "sha256-nov+DIaeYaRJy7Cz1hcKJUA88IKlZ4z/tn4WASZjxLI="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix deleted file mode 100644 index 17cee52a64e..00000000000 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, curl, SDL }: - -stdenv.mkDerivation rec { - pname = "tinyemu"; - version = "2018-09-23"; - src = fetchurl { - url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; - sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v"; - }; - buildInputs = [ openssl curl SDL ]; - makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; - preInstall = '' - mkdir -p "$out/bin" - ''; - meta = { - homepage = "https://bellard.org/tinyemu/"; - description = "A system emulator for the RISC-V and x86 architectures"; - longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; - license = with lib.licenses; [ mit bsd2 ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jhhuh ]; - }; -} diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 20e29938d0c..b5a524a38b4 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "9"; + version = "9.1"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "sha256-ym4fWOcZFlHkLUQEanC+thQLbPial7ZNzxfCWSlweWg="; + sha256 = "sha256-Fqk6bPAOg4muxmSP+ezpGUNw6xrMWchZACKemeA08mA="; fetchSubmodules = true; }; diff --git a/pkgs/data/icons/vimix-icon-theme/default.nix b/pkgs/data/icons/vimix-icon-theme/default.nix index 502a8023c9b..853b1d209ab 100644 --- a/pkgs/data/icons/vimix-icon-theme/default.nix +++ b/pkgs/data/icons/vimix-icon-theme/default.nix @@ -1,7 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }: +{ lib +, stdenv +, fetchFromGitHub +, gtk3 +, hicolor-icon-theme +, jdupes +, colorVariants ? [] # default: all +}: + +let + pname = "vimix-icon-theme"; + +in +lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants stdenv.mkDerivation rec { - pname = "vimix-icon-theme"; + inherit pname; version = "2021-11-09"; src = fetchFromGitHub { @@ -23,10 +36,16 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + patchShebangs install.sh - ./install.sh -a -d $out/share/icons + + ./install.sh \ + ${if colorVariants != [] then builtins.toString colorVariants else "-a"} \ + -d $out/share/icons + # replace duplicate files with symlinks - jdupes -l -r $out/share/icons + jdupes -L -r $out/share/icons + runHook postInstall ''; diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh deleted file mode 100644 index 0bb61d863ec..00000000000 --- a/pkgs/data/misc/geolite-legacy/builder.sh +++ /dev/null @@ -1,20 +0,0 @@ -source "$stdenv/setup" - -mkdir -p $out/share/GeoIP -cd $out/share/GeoIP - -# Iterate over all environment variable names beginning with "src": -for var in "${!src@}"; do - # Store the value of the variable with name $var in $src: - eval src="\$$var" - - # Copy $src to current directory, removing Nix hash from the filename: - dest="${src##*/}" - dest="${dest#*-}" - cp "$src" "$dest" -done - -gzip -dv *.gz - -ln -s GeoLiteCity.dat GeoIPCity.dat -ln -s GeoLiteCityv6.dat GeoIPCityv6.dat diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 735a6608949..ad9560da9a4 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -1,41 +1,34 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, zstd }: -let - fetchDB = src: sha256: fetchurl { - inherit sha256; - url = "https://geolite.maxmind.com/download/geoip/database/${src}"; - }; -in stdenv.mkDerivation { pname = "geolite-legacy"; - version = "2017-12-02"; + version = "2022-01-25"; + + # We use Arch Linux package as a snapshot, because upstream database is updated in-place. + geoip = fetchurl { + url = "https://archive.archlinux.org/packages/g/geoip-database/geoip-database-20220125-1-any.pkg.tar.zst"; + sha256 = "sha256-ieuLpllJTHYu28UXBGfDWbnr9Ei8pGnos+RPWDsAGcM="; + }; - srcGeoIP = fetchDB - "GeoLiteCountry/GeoIP.dat.gz" - "1nggml11wzlanmzk6wbw2kla91fj8ggd9kh9yz42lnyckdlf5ac4"; - srcGeoIPv6 = fetchDB - "GeoIPv6.dat.gz" - "0w809xgmr5zi4fgm9q3lhrnh1vl62s49n737bhq4jplm5918ki50"; - srcGeoLiteCity = fetchDB - "GeoLiteCity.dat.gz" - "0cibajsv5xdjpw1qfx22izm5azqcj0d7nvk39irgwflkim9jfjbs"; - srcGeoLiteCityv6 = fetchDB - "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" - "1ldwbzgs64irfgb3kq3jp8fmhwmwqk713dr4kkdqlglrblr9hfkc"; - srcGeoIPASNum = fetchDB - "asnum/GeoIPASNum.dat.gz" - "06qqs8qr8vxqwd80npz7n66k3bpc1vs7w43i2bb4k0di5yxnjwr9"; - srcGeoIPASNumv6 = fetchDB - "asnum/GeoIPASNumv6.dat.gz" - "1qyq4h8cja62giv6q1qqc502vsq53wzz1kx80mgvwngmycrxa21k"; + extra = fetchurl { + url = "https://archive.archlinux.org/packages/g/geoip-database-extra/geoip-database-extra-20220125-1-any.pkg.tar.zst"; + sha256 = "sha256-xrTnuJvuvtvn+uIARtbuJUlHco3Q+9BXLljt35V3ip0="; + }; + + nativeBuildInputs = [ zstd ]; + + buildCommand = '' + tar -xaf "$geoip" + tar -xaf "$extra" + mkdir -p $out/share + mv usr/share/GeoIP $out/share + ''; meta = with lib; { description = "GeoLite Legacy IP geolocation databases"; - homepage = "https://geolite.maxmind.com/download/geoip"; - license = licenses.cc-by-sa-30; + homepage = "https://mailfud.org/geoip-legacy/"; + license = licenses.cc-by-sa-40; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; - - builder = ./builder.sh; } diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 47e43758447..e8bf145e502 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.2.3"; + version = "5.2.4"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-kPxwWciNf4KQx3JG1qPQcZJeOa4B+udMyQmH8A7JcfQ="; + sha256 = "sha256-v63dFiBKtLCmRnwJ6u814lSv+tfPG+IIJtcWCnOEZjk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index a6748dfc417..b8783e4db46 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , meson , fetchurl , python3 @@ -7,12 +8,12 @@ , glib , adwaita-icon-theme , libpeas +, libxml2 , gtksourceview4 , gsettings-desktop-schemas , wrapGAppsHook , ninja , libsoup -, tepl , gnome , gspell , perl @@ -23,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; + sha256 = "epsYsViAjRiSmJFl83BsTxooKXkHmrdFinnTwkrU3rU="; }; patches = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils itstool + libxml2 meson ninja perl @@ -57,7 +59,6 @@ stdenv.mkDerivation rec { gtksourceview4 libpeas libsoup - tepl ]; postPatch = '' @@ -81,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Gedit"; description = "Official text editor of the GNOME desktop environment"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 11308bfcf5e..b7ba12be135 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.42.3"; + version = "3.42.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "b1hHoSNHmQc+lYXbhhwhOBoJ7VUNwKISXwC6X5C9Nh0="; + sha256 = "fftBs+bAWBHUSajeTfx3q5sZ+O3yCzL92FeRhmIm0lI="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 85cfa8bf314..f68977e52dd 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "41.2"; + version = "41.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gnH8azPsJBileDBN0+V9Zl8NfMcGqZqXvkGYSGGP4kg="; + sha256 = "sha256-1tsMTLcIV77PSKxQB/ErX2O51dfoDqfuV9O+USZp98k="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 4103965ce27..aa9058ad410 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "41.3"; + version = "41.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZQVjN3q2mxAQXfdxuz8hY3lVO7evQISNjDBljgEAmLw="; + sha256 = "evhzzkcs8racUbyevGG4Nt+8z9b0Jwbj7TqpCaruxGU="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 4b3ee62dcee..be858a19487 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -2,7 +2,7 @@ , stdenv , gettext , fetchurl -, webkitgtk_4_1 +, webkitgtk , pkg-config , gtk3 , glib @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib - webkitgtk_4_1 + webkitgtk sqlite libxml2 libxslt @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good ]; + # To reduce the GNOME ISO closure size. Remove when other packages + # are using webkit2gtk_4_1. + configureFlags = ["--with-webkit2gtk-4-0"]; + passthru = { updateScript = gnome.updateScript { packageName = "yelp"; diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 3a158e7ddf8..683b5c22626 100644 --- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.4.2"; + version = "0.4.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HSBpQHkwDhL+q9t3MEqWnRzBkNHRKpSb6EXK0Bx4pdM="; + sha256 = "e98HiVU0lqvdw8ljsM5zY4BcDALAJf7d68qsx4cknog="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index 83928c04827..bdaeb47ab23 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.42.2"; + version = "3.42.5"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-VWtq1jPwUHHIDpVaSYQ0FiihlfulRofFmacMyv/buMw="; + sha256 = "sha256-BpDA2V40V+VF2CB7ik+edMxrRtYSFnTQ48ec6pt8Jo4="; }; patches = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix index d7816de3042..5de935b9ec2 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { description = "Look at your windows and desktops from above."; license = licenses.gpl3Only; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; inherit (src.meta) homepage; inherit (kwindowsystem.meta) platforms; }; diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index c7bfa49ac71..81c5bed0a54 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.22.0"; + version = "0.23.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-s5gCqQ0gJViS8t/jCAFtNYfmXQ7SBarlRLKUWHHEgSg="; + sha256 = "sha256-OuTd8XhoWU598eMh1/OL2t3LHf+UAumiuAY7KocfI6c="; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix new file mode 100644 index 00000000000..12bac4c4d9d --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -0,0 +1,106 @@ +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib +, ffmpeg, python3, ruby, icu68 }: + +let + major = "17"; + update = ".0.0.1"; + build = "+1"; + repover = "${major}${update}${build}"; + gradle_ = (gradle_7.override { + java = openjdk17_headless; + }); + + makePackage = args: stdenv.mkDerivation ({ + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw="; + }; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg icu68 ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" ('' + CONF = Release + JDK_HOME = ${openjdk17_headless.home} + '' + args.gradleProperties or ""); + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + ln -s $config gradle.properties + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + gradle --no-daemon $gradleFlags sdk + + runHook postBuild + ''; + } // args); + + # Fake build to pre-download deps into fixed-output derivation. + # We run nearly full build because I see no other way to download everything that's needed. + # Anyone who knows a better way? + deps = makePackage { + pname = "openjfx-deps"; + + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + }; + +in makePackage { + pname = "openjfx-modular-sdk"; + + gradleProperties = '' + COMPILE_MEDIA = true + COMPILE_WEBKIT = false + ''; + + preBuild = '' + swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ + --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + ''; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${openjdk17_headless.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ openjdk17_headless ]; + + passthru.deps = deps; + + meta = with lib; { + homepage = "http://openjdk.java.net/projects/openjfx/"; + license = licenses.gpl2; + description = "The next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index a72ae7d52ab..e3a9aa2b486 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -52,7 +52,7 @@ let # - integration-tests versions = { - swift = "5.5.2"; + swift = "5.5.3"; yams = "4.0.2"; argumentParser = "0.4.3"; format = "swift-5.5-branch"; @@ -79,7 +79,7 @@ let swift = fetchSwiftRelease { repo = "swift"; - sha256 = "1a9ja3r6ap4cappbvlk18krlvwi0q75z21j5yx5rhbnw4ihh7lda"; + sha256 = "0ma96sfvwiv2f4qhzrvcwxi9igzd80930gnaw4r7ra4w190cnag7"; }; cmark = fetchSwiftRelease { repo = "swift-cmark"; @@ -99,7 +99,7 @@ let }; swiftpm = fetchSwiftRelease { repo = "swift-package-manager"; - sha256 = "0hdjvb2asfi6h3x9bjssxkc3bgjn3idlmyga3dl3lscfq88hjxr9"; + sha256 = "0z90mg837jzwh516pypn48r3wsjf0lqymsyigdhgr7j2sgcckrr1"; }; syntax = fetchSwiftRelease { repo = "swift-syntax"; @@ -111,7 +111,7 @@ let }; corelibsFoundation = fetchSwiftRelease { repo = "swift-corelibs-foundation"; - sha256 = "1f7qcdx8597gwqa9pwl38d31w6w4d84c5hadj4ycj99msrm2f32x"; + sha256 = "06gkdliihl1l86jx5khzwkjmjk45fq290x033rscramzcdxh7d1b"; }; corelibsLibdispatch = fetchSwiftRelease { repo = "swift-corelibs-libdispatch"; @@ -128,7 +128,7 @@ let }; llvmProject = fetchSwiftRelease { repo = "llvm-project"; - sha256 = "1gvqps5f9jh6lbhcjh1fyzp3bc0h9chbljzaspcrdi2qp878prlx"; + sha256 = "18rn5xg5hpxxsacs0ygjmjpzpc8pq85898kknzc0s0z5m55h45z8"; }; # Projects that have their own versions during each release diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index d4eb57815a8..a2cd8f44ce2 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -11,19 +11,20 @@ let in stdenv.mkDerivation rec { pname = "zig"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - hash = "sha256-Hfl1KKtGcopMrn+U9r0/qr/wReWJIgb8+IgwMoguv/0="; + hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; }; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; + buildInputs = [ libxml2 zlib diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 6e67bdd465b..c4055648c5a 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -6,7 +6,7 @@ with builtins; with lib; let { case = "8.12"; out = { version = "1.12.0"; };} { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} - { case = "8.15"; out = { version = "1.13.7"; };} + { case = "8.15"; out = { version = "1.14.1"; };} ] {}); in mkCoqDerivation { pname = "elpi"; @@ -14,12 +14,13 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.15"; out = "1.12.1"; } + { case = "8.15"; out = "1.13.0"; } { case = "8.14"; out = "1.11.2"; } { case = "8.13"; out = "1.11.1"; } { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n"; release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY="; release."1.11.2".sha256 = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4"; release."1.11.1".sha256 = "10j076vc2hdcbm15m6s7b6xdzibgfcbzlkgjnlkr2vv9k13qf8kc"; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 51314db3f9f..ca2391ebd25 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-GphF32CFxZYaoTG1k9pP+cRNs/PIKtwevTcIyjG7CpQ="; + sha256 = "sha256-ap6YCRUqtIgh36eTIk5BSjUildvYhqkC48Y4dxNMU8c="; }; executable = "bb"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 89c81e2b4a2..bd96562d9e5 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -78,6 +78,13 @@ stdenv.mkDerivation rec { # fail to detect its variant at runtime. # See: https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 ./force-cs-variant.patch + + # The entry point binary $out/bin/racket is codesigned at least once. The + # following error is triggered as a result. + # (error 'add-ad-hoc-signature "file already has a signature") + # We always remove the existing signature then call add-ad-hoc-signature to + # circumvent this error. + ./force-remove-codesign-then-add.patch ]; preConfigure = '' @@ -90,10 +97,34 @@ stdenv.mkDerivation rec { --replace /bin/rm ${coreutils}/bin/rm \ --replace /bin/true ${coreutils}/bin/true done + + # The configure script forces using `libtool -o` as AR on Darwin. But, the + # `-o` option is only available from Apple libtool. GNU ar works here. + substituteInPlace src/ChezScheme/zlib/configure \ + --replace 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"' + mkdir src/build cd src/build - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) + '' + lib.optionalString stdenv.isLinux '' + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) + '' + lib.optionalString stdenv.isDarwin '' + gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) + '' + ; + + preBuild = lib.optionalString stdenv.isDarwin '' + # Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic + # linker environment variables like this are purged. + # See: https://apple.stackexchange.com/a/212954/167199 + + # Make builders feed it to dlopen(...). Do not expose all of $libPath to + # DYLD_LIBRARY_PATH as the order of looking up symbols like + # `__cg_jpeg_resync_to_restart` will be messed up. Our libJPEG.dyllib + # expects it from our libTIFF.dylib, but instead it could not be found from + # the system `libTIFF.dylib`. DYLD_FALLBACK_LIBRARY_PATH has its own problem + # , too. + export DYLD_FALLBACK_LIBRARY_PATH="${libPath}" ''; shared = if stdenv.isDarwin then "dylib" else "shared"; @@ -119,6 +150,6 @@ stdenv.mkDerivation rec { homepage = "https://racket-lang.org/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kkallio henrytill vrthra ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch new file mode 100644 index 00000000000..c34457ceb95 --- /dev/null +++ b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch @@ -0,0 +1,11 @@ +--- old/src/mac/codesign.rkt 2022-01-08 18:25:53.000000000 -0500 ++++ new/src/mac/codesign.rkt 2022-02-15 15:49:51.000000000 -0500 +@@ -17,6 +17,5 @@ + #:args (file) + file)) + +-(if remove? +- (remove-signature file) +- (add-ad-hoc-signature file)) ++(remove-signature file) ++(add-ad-hoc-signature file) diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index ac15cd24e50..e56945ed651 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -14,7 +14,7 @@ racket.overrideAttrs (oldAttrs: rec { as well as libraries that live in collections. In particular, raco and the pkg library are still bundled. ''; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; broken = false; # Minimal build does not require working FFI }; }) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 1cb253774d4..57bf47f3abf 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; + nativeBuildInputs = [ makeWrapper ]; buildInputs = optional stdenv.isFreeBSD autoreconfHook; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] @@ -38,7 +39,15 @@ stdenv.mkDerivation rec { "--without-freetds" "--without-berkeley-db" "--without-crypto" ] ; - propagatedBuildInputs = [ makeWrapper apr expat libiconv ] + # For some reason, db version 6.9 is selected when cross-compiling. + # It's unclear as to why, it requires someone with more autotools / configure knowledge to go deeper into that. + # Always replacing the link flag with a generic link flag seems to help though, so let's do that for now. + postConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace Makefile \ + --replace "-ldb-6.9" "-ldb" + ''; + + propagatedBuildInputs = [ apr expat libiconv ] ++ optional sslSupport openssl ++ optional bdbSupport db ++ optional ldapSupport openldap diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/development/libraries/boca/default.nix index ffbc99f79f7..2c86bf981b7 100644 --- a/pkgs/development/libraries/boca/default.nix +++ b/pkgs/development/libraries/boca/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "BoCA"; - version = "1.0.5"; + version = "1.0.6a"; src = fetchFromGitHub { owner = "enzo1982"; repo = "boca"; rev = "v${version}"; - sha256 = "sha256-ooLPpwTxG7QBAGhEGhta4T06ZDWlPysocHbb/Sq7Wyo="; + sha256 = "sha256-LndlwdM5NlTv73Z1lMkHuIZkVfn48P/LssBnE4X9Sgc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 3eae15c58d0..a3de08a838b 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.12.0"; + version = "5.13.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rpbD3x7zIJCDZuu4K0wDkaBKSBh36amtza/wE3rb0HM="; + sha256 = "sha256-R22nWkI778LpCK3a5C6tvuIsEXU49wPya1fFQxdpocg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 5ef3bfa2ac4..d970f376d09 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -11,13 +11,14 @@ , graphviz , libxslt , libiconv +, removeReferencesTo }: stdenv.mkDerivation rec { pname = "exiv2"; version = "0.27.5"; - outputs = [ "out" "dev" "doc" "man" ]; + outputs = [ "out" "lib" "dev" "doc" "man" "static" ]; src = fetchFromGitHub { owner = "exiv2"; @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { gettext graphviz libxslt + removeReferencesTo ]; buildInputs = lib.optional stdenv.isDarwin libiconv; @@ -94,8 +96,15 @@ stdenv.mkDerivation rec { rm * mv .exiv2 exiv2 ) + + mkdir -p $static/lib + mv $lib/lib/*.a $static/lib/ + + remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a ''; + disallowedReferences = [ stdenv.cc.cc ]; + meta = with lib; { homepage = "https://www.exiv2.org/"; description = "A library and command-line utility to manage image metadata"; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix deleted file mode 100644 index 35ef9fba105..00000000000 --- a/pkgs/development/libraries/git2/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, python3 -, zlib, libssh2, openssl, pcre, http-parser -, libiconv, Security -}: - -stdenv.mkDerivation rec { - pname = "libgit2"; - version = "1.3.0"; - # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib - - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; - }; - - cmakeFlags = [ - "-DTHREADSAFE=ON" - "-DUSE_HTTP_PARSER=system" - ]; - - nativeBuildInputs = [ cmake python3 pkg-config ]; - - buildInputs = [ zlib libssh2 openssl pcre http-parser ] - ++ lib.optional stdenv.isDarwin Security; - - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; - - doCheck = false; # hangs. or very expensive? - - meta = { - description = "The Git linkable library"; - homepage = "https://libgit2.github.com/"; - license = lib.licenses.gpl2; - platforms = with lib.platforms; all; - }; -} diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index e575173d725..0e17e13e581 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -272,7 +272,6 @@ stdenv.mkDerivation rec { "-Ddirectfb=disabled" "-Dflite=disabled" "-Dkms=disabled" # renders to libdrm output - "-Dofa=disabled" "-Dlv2=disabled" "-Dsbc=disabled" "-Dspandsp=disabled" diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 2b6dfc8fb52..6da3fc769ea 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.0"; + version = "4.6.1"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "eC1ZUfv9WF/J7HbAnQfijmAUxy2wAftWf/8hf7luTYw="; + sha256 = "2FUI0hy7zWPVaKeGKvXs1juXjX1XmcvkBMkdI4nQ7F8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 85163daad0a..d2ac5ef214c 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -59,17 +59,17 @@ let "aarch64-linux" = { platformStr = "linuxarm64"; projectArch = "arm64"; - sha256 = "1j93qawh9h6k2ic70i10npppv5f9dch961lc1wxwsi68daq8r081"; + sha256 = "01ny1k10dklsqrrqmxqd9433413wmpk4ddsmkjp9dzv52dvpcl08"; }; "i686-linux" = { platformStr = "linux32"; projectArch = "x86"; - sha256 = "0ki4zr8ih06kirgbpxbinv4baw3qvacx208q6qy1cvpfh6ll4fwb"; + sha256 = "000j6pc336c43xczl1rs5zf8nsf17y76f1kpy14gqgpwyzl8my0w"; }; "x86_64-linux" = { platformStr = "linux64"; projectArch = "x86_64"; - sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj"; + sha256 = "1ydjckld89dkpy5zrvk7jjpz70mnlmbm8yinkfpzgcwbkcakk6k7"; }; }; @@ -77,9 +77,9 @@ let in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "90.6.7"; - gitRevision = "19ba721"; - chromiumVersion = "90.0.4430.212"; + version = "96.0.18"; + gitRevision = "fe551e4"; + chromiumVersion = "96.0.4664.110"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 8e9fe4de88a..0b5531d70c5 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -7,14 +7,11 @@ with lib; stdenv.mkDerivation rec { - name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}"; - in "libdbusmenu-${postfix}-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "16.04"; - versionMinor = "0"; + pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}"; + version = "16.04.0"; src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz"; + url = "https://launchpad.net/dbusmenu/${lib.versions.majorMinor version}/${version}/+download/libdbusmenu-${version}.tar.gz"; sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 48c20c8b7ca..8d506efef89 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.72.0"; + version = "1.75.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-/StX22pSQtfOYbBTFL7vh0Y0V038Ohyq+qoDECITD80="; + hash = "sha256-3oYQwV1Srnq8VfS+M+BwIznXRxQFXr78SwXO3Xu08ws="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Jwf95oTyGsOikVMKAg+EaDNY78VW+kECD+lhNePSKWE="; + hash = "sha256-jti1aY8a9YB8x6fz7UqTY4uDj6gkMnG1hTN/Mgc+mHs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix new file mode 100644 index 00000000000..dc12e643cb7 --- /dev/null +++ b/pkgs/development/libraries/libgit2/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, python3 +, zlib +, libssh2 +, openssl +, pcre +, http-parser +, libiconv +, Security +}: + +stdenv.mkDerivation rec { + pname = "libgit2"; + version = "1.4.0"; + # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib + + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "sha256-21t7fD/5O+HIHUDEv8MqloDmAIm9sSpJYqreCD3Co2k="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/libgit2/libgit2/commit/8bc9eda779b2e2602fc74944aba5d39198e0642f.patch"; + sha256 = "sha256-r2i4+WsrxIpSwH0g/AikBdAajBncXb1zz0uOQB0h1Jk="; + }) + ]; + + cmakeFlags = [ + "-DTHREADSAFE=ON" + "-DUSE_HTTP_PARSER=system" + "-DUSE_SSH=ON" + ]; + + nativeBuildInputs = [ cmake python3 pkg-config ]; + + buildInputs = [ zlib libssh2 openssl pcre http-parser ] + ++ lib.optional stdenv.isDarwin Security; + + propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + + doCheck = false; # hangs. or very expensive? + + meta = { + description = "Linkable library implementation of Git that you can use in your application"; + homepage = "https://libgit2.org/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index f79f82e9a78..5303dbed6ca 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.27"; + version = "8.0.28"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "sha256-WIZpj8aCpeh0CCLtm0YbxRtgz5y6304cf+vllYSyv7c="; + sha256 = "sha256-yyb+neBaO18e0ioZlCm2eR7OGEM+sEZeKnP89EWGQgs="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dev.mysql.com/downloads/connector/cpp/"; description = "C++ library for connecting to mysql servers"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index a45884f72dc..2e8a997299f 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ndpi"; - version = "4.0"; + version = "4.2"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; rev = version; - sha256 = "0snzvlracc6s7r2pgdn0jqcc7nxjxzcivsa579h90g5ibhhplv5x"; + sha256 = "sha256-ZWWuyPGl+hbrfXdtPvCBqMReuJ4FiGx+qiI7qCz6wtQ="; }; configureScript = "./autogen.sh"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nDPI is a library for deep-packet inspection based on OpenDPI. ''; homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; - license = with licenses; lgpl3; + license = with licenses; [ lgpl3Plus bsd3 ]; maintainers = with maintainers; [ takikawa ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 57335fa3d97..6a8baae5c9a 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.11.4"; + version = "1.12"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "sha256-pXadPs2Dlht3BMNYDVxWZqnVv0umDgYVcqH5YVxr+uA="; + sha256 = "sha256-FLemG9T17n6l7vgb01OmO22BK59jv5uozVHeUnILEEQ="; }; outputs = if shared then [ "out" "dev" ] else [ "out" ]; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 909903c2c34..5a747fd9106 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0yvxj7r9z890nfq5cadw7ys144c2mnvaplvx4v4ndv7238b741l8"; + sha256 = "0k3j74klvd386ijsd4j09ccxlhga54z4pgnh36s9cv3rs7ab39qm"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 40ae88bf71b..c795d783894 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -5,10 +5,13 @@ , python3 , enableModTool ? true , removeReferencesTo +, fetchpatch }: stdenv.mkDerivation rec { pname = "volk"; + # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: + # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A version = "2.5.0"; src = fetchFromGitHub { @@ -19,6 +22,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; + sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; + extraPrefix = ""; + }) + ]; + cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; postInstall = lib.optionalString (!stdenv.isDarwin) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index a46ed1adee7..4010ee68459 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Vulkan Header files and API registry"; homepage = "https://www.lunarg.com"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index e598d2c864b..077f881e722 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb -, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }: +, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "vulkan-loader"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }); nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ]; + buildInputs = [ vulkan-headers ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; - cmakeFlags = [ - "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" - "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" - ]; + cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] + ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" + ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"; outputs = [ "out" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 0894457f981..b5a16df21ad 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.34.5"; + version = "2.34.6"; outputs = [ "out" "dev" ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-aJMGQ696R6OvBfRtZueEQiQzdT2rM10ygvMZqFpWKbQ="; + sha256 = "sha256-a8j9A0qtBDKiRZzk/H7iWtZaSSTGGL+Nk7UrDBqEwfY="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 4412f568508..0770f3a48d4 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -2,11 +2,12 @@ , re, perl, ncurses , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 -, version ? "1.13.7" +, version ? "1.14.1" }: with lib; let fetched = import ../../../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; } ({ + release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r"; release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka"; release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044"; diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index 2e626695714..0f3b5377fc5 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-stdcompat"; - version = "15"; + version = "18"; src = fetchurl { url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"; - sha256 = "1xcwb529m4lg9cbnxa9m3x2nnl9nxzz1x5lxpvdfflg4zxl6yx2y"; + sha256 = "sha256:01y67rndjlzfp5zq0gbqpg9skqq2hfbvhbq9lfhhk5xidr98sfj8"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 52ecac90b10..a93137f136b 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.5"; + version = "3.19.6"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-vbiMD0En11VDJUGnEc5ww0AhQ12vkbTCm/pqF7wnywI="; + sha256 = "sha256-Y9g0A9pVjEVcITyaQsyAew6rraTPwZuevSsDD46c0DM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index f347ed5cd1b..f00a75961b9 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -8,17 +8,21 @@ , haversine , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.15"; + version = "0.16"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "v${version}"; - sha256 = "0sbzrzmny7x4bkbg6z0cjn4d10r50nxdyaq7g6lagwd8ijpkg8l3"; + hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM="; }; propagatedBuildInputs = [ @@ -34,7 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_client" ]; + pythonImportsCheck = [ + "aio_geojson_client" + ]; meta = with lib; { description = "Python module for accessing GeoJSON feeds"; diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index b42ba55bfa7..f3076160f9c 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -7,17 +7,21 @@ , pytest-asyncio , pytestCheckHook , pytz +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.13"; + version = "0.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; rev = "v${version}"; - sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA="; + hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U="; }; propagatedBuildInputs = [ @@ -32,7 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + pythonImportsCheck = [ + "aio_geojson_geonetnz_quakes" + ]; meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 2b0061875b7..f9ee74dcc50 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -3,15 +3,19 @@ , fetchPypi , aiohttp , asyncio-throttle +, pythonOlder }: buildPythonPackage rec { pname = "aiohue"; - version = "4.0.1"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wPqEubd+vUpdj7tM0CTPkW5kV4qlF19T+djlGrtA5h8="; + hash = "sha256-/NcCo4Jvq1JeXD1UTrzNpPNDNmEt7GOrbCl79V00+eM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 8e7d1b20309..3038f8720e7 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "25.0.0"; + version = "26.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; + sha256 = "sha256-nGot8UIeL0DNuw5+v7XmLjrNiJMfpsk1z2K2Tdo4Q+s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index e889fff9688..42203a43da4 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , nose +, pythonOlder }: let @@ -19,11 +20,14 @@ let in buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.24"; + version = "0.3.30"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YsiMkTPRSKR4511csJOv9/Jf1b3TVUM7N2lInejdNrQ="; + hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs="; }; # Nose is required during build process, so can not use `checkInputs`. diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 6f0370f044c..e8e9962f9b4 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "833e01e9eaff4c01aa6e049bbc1e6acb9eca6ee513d7b35b5bf135d49705ad33"; + sha256 = "sha256-/pexD2ihx7VMDlS+rahOGPTvto3UDJBvuHSPURR0PsY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index b56ebbf50a7..109487b88b9 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.2.1"; + version = "1.3.1"; disabled = !isPy3k; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579"; + sha256 = "sha256-Mc05Zlbzo3g04H0wTNuE2ZBrwhcmJqPZL+V30IvPQQ8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 8cf820edbfe..c88f6712f79 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -1,22 +1,43 @@ -{ lib, - fetchPypi, - requests, - buildPythonPackage +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { pname = "braintree"; - version = "4.13.1"; + version = "4.14.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "4f6addf89f5cd6123243ddc89db325e50fceec825845901dad553fde115bd938"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = "braintree_python"; + rev = version; + hash = "sha256-qeqQX+qyy78sLe+46CA4D6VAxNHUVahS4LMYdGDzc2k="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ + "braintree" + ]; - # pypi release does not include tests - doCheck = false; + disabledTestPaths = [ + # Don't test integrations + "tests/integration" + ]; meta = with lib; { description = "Python library for integration with Braintree"; diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix index 0f171e26439..d75df29421d 100644 --- a/pkgs/development/python-modules/concurrent-log-handler/default.nix +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "concurrent-log-handler"; - version = "0.9.19"; + version = "0.9.20"; src = fetchPypi { inherit pname version; - hash = "sha256-sS95q+0/lBIcJc6cJM21fYiSguxv9h9VNasgaNw31Ak="; + hash = "sha256-n6KtYUdKE3tWQnAr0z8hgVWYqsuh51E5s3zrLO3aj58="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index e85bdd7868c..518d2066853 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "databases"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - hash = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; + hash = "sha256-NOXK1UCQzqvJRfzsgIfpihuD9oF52sMD+BxqUHWF8Rk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index d519aa76c8b..5655e18bae1 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "diceware"; - version = "0.9.6"; + version = "0.10"; src = fetchPypi { inherit pname version; - sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby"; + sha256 = "sha256-srTMm1n1aNLvUb/fn34a+UHSX7j1wl8XAZHburzpZWk="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 457e9d3e530..a51ec5303cd 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -1,18 +1,27 @@ -{ lib, fetchPypi, buildPythonPackage, six }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.0"; + version = "1.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl"; + hash = "sha256-ZgCqMx8X7uODNhH3GJmkOnZhLKdVoVdpzyBJLEsaoBY="; }; - propagatedBuildInputs = [ six ]; + pythonImportsCheck = [ + "dict2xml" + ]; meta = with lib; { - description = "Super simple library to convert a Python dictionary into an xml string"; + description = "Library to convert a Python dictionary into an XML string"; homepage = "https://github.com/delfick/python-dict2xml"; license = licenses.mit; maintainers = with maintainers; [ johnazoidberg ]; diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 37cd3629db4..180624ea816 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.2.1"; + version = "4.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X3onSr8PN3D24lMtKG2Y/RiKbD1qSq2n0YVO8Y5H5K4="; + sha256 = "sha256-KswYue892Mlpa8wnPf9bt8MEJGtjGaMjlDt0TXGoEdE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index 2e5fc5da9e8..09365ff5858 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "georss-client"; - version = "0.14"; + version = "0.15"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; rev = "v${version}"; - sha256 = "sha256-rviXXNmDLEVNYOCkqvLT9EXSuVpI5wMlCXnlpUUl1P0="; + sha256 = "sha256-D1ggfEDU+vlFmi1USwdHj1due0PrCQCpKF4zaarHCFs="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_client" ]; + pythonImportsCheck = [ + "georss_client" + ]; meta = with lib; { description = "Python library for accessing GeoRSS feeds"; diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index e87c766c0ca..ae923138d29 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.4"; + version = "0.5"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "v${version}"; - sha256 = "sha256-g7lZC5ZiJV8dNZJceLROqyBRZSuqaivGFhaQrKe4B7g="; + hash = "sha256-i3VdxntFwieCmB4ihHRSCV5YKDyYytl3XnU/G1LwLhg="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_ign_sismologia_client" ]; + pythonImportsCheck = [ + "georss_ign_sismologia_client" + ]; meta = with lib; { description = "Python library for accessing the IGN Sismologia GeoRSS feed"; diff --git a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix index dc253dafe1e..512db4d8dee 100644 --- a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix +++ b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-ingv-centro-nazionale-terremoti-client"; - version = "0.5"; + version = "0.6"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ingv-centro-nazionale-terremoti-client"; rev = "v${version}"; - sha256 = "1pd0qsr0n8f1169p2nz8s0zrbrxh0rdzaxdb3jmdymzp4xz28wb0"; + sha256 = "sha256-zqjo70NzpUt5zNEar0P1sl/gMb+ZcS+7GX7QGuFjMYY="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_ingv_centro_nazionale_terremoti_client" ]; + pythonImportsCheck = [ + "georss_ingv_centro_nazionale_terremoti_client" + ]; meta = with lib; { description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed"; diff --git a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix index 089a72ef811..344c74b057f 100644 --- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix +++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-nrcan-earthquakes-client"; - version = "0.3"; + version = "0.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-nrcan-earthquakes-client"; rev = "v${version}"; - sha256 = "1brn6ycsw3d3znbqi2w2cxjw8hyfb44p2lra18rx2gyvgnkxg19l"; + hash = "sha256-FFm37+dCkdoZXgvAjYhcHOYFf0oQ37bxJb7vzbWDTro="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_nrcan_earthquakes_client" ]; + pythonImportsCheck = [ + "georss_nrcan_earthquakes_client" + ]; meta = with lib; { description = "Python library for accessing Natural Resources Canada Earthquakes feed"; diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index 954e4a6237f..e7ecd23b3c6 100644 --- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "georss-qld-bushfire-alert-client"; version = "0.5"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; rev = "v${version}"; - sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; + hash = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_qld_bushfire_alert_client" ]; + pythonImportsCheck = [ + "georss_qld_bushfire_alert_client" + ]; meta = with lib; { description = "Python library for accessing Queensland Bushfire Alert feed"; diff --git a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix index 5428dfcbc53..9328ac17aa5 100644 --- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix +++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "georss-tfs-incidents-client"; version = "0.3"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-tfs-incidents-client"; rev = "v${version}"; - sha256 = "11nvwrjzax4yy6aj971yym05yyizwfafy4ccsyy1qpwbs6dwbw7m"; + hash = "sha256-9fDFm9GLXxy814wR75TjP3pfQPU+nCSV8Z509WXm24Y="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_tfs_incidents_client" ]; + pythonImportsCheck = [ + "georss_tfs_incidents_client" + ]; meta = with lib; { description = "Python library for accessing Tasmania Fire Service Incidents feed"; diff --git a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix index ec6a5cd5f2e..ff6c3a13ea7 100644 --- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix +++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "georss-wa-dfes-client"; version = "0.3"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-wa-dfes-client"; rev = "v${version}"; - sha256 = "01fk67kc6ww88yzsans8g81i6j7s0276gma5fk76la1c8vj2ifs7"; + hash = "sha256-R7so5EYsKGrOdEXVZ44A+kgTA3pIW6W/R4hzw+Yx0wU="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_wa_dfes_client" ]; + pythonImportsCheck = [ + "georss_wa_dfes_client" + ]; meta = with lib; { description = "Python library for accessing WA Department of Fire and Emergency Services (DFES) feed"; diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/development/python-modules/gigalixir/default.nix index 99a878700d7..e1ca84e2186 100644 --- a/pkgs/development/python-modules/gigalixir/default.nix +++ b/pkgs/development/python-modules/gigalixir/default.nix @@ -1,9 +1,9 @@ -{ buildPythonApplication +{ lib +, buildPythonApplication , click , fetchPypi , git , httpretty -, lib , qrcode , pygments , pyopenssl @@ -11,42 +11,53 @@ , requests , rollbar , stripe +, pythonOlder , sure }: buildPythonApplication rec { pname = "gigalixir"; version = "1.2.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; + hash = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" \ - --replace "cryptography==" "cryptography>=" - ''; - propagatedBuildInputs = [ click - requests - stripe - rollbar pygments - qrcode pyopenssl + qrcode + requests + rollbar + stripe ]; checkInputs = [ + git httpretty - sure pytestCheckHook - git + sure + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" \ + --replace "cryptography==" "cryptography>=" + ''; + + disabledTests = [ + # Test requires network access + "test_rollback_without_version" ]; - pythonImportsCheck = [ "gigalixir" ]; + pythonImportsCheck = [ + "gigalixir" + ]; meta = with lib; { description = "Gigalixir Command-Line Interface"; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 96a10e1a222..5e5af855b86 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.32.0"; + version = "2.33.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-84Y6xCk/CkWF5ERh2CuR+SOXIe8z/JV11AG02n3BJ70="; + sha256 = "sha256-4VIlDMUmpwWE+AIAZs7L3y+i35hEF7a76/+Wqtwy498="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index bf1c37c4a3c..c99d5d0a8bf 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.4"; + version = "2.10.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YQ7VahPxoAM87RNCkFOUmMrLdKs0uHJ4e0dFgA4twpY="; + sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index c8edb677c64..06c4d9e2369 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "4a72a65586178daaacf6bbc4b718db0765b99a719fce88a95c2be4f82689b7c1"; + sha256 = "sha256-qvhZU7T2fHA2uRyXJjRxqeEAFwShH+TpGwICczgX7Sk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 38d5d13c2c4..2c1e308af66 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.34.0"; + version = "0.34.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-XgVZwCXdUae1BA3WUm+mJ+zmnqLpp13ht+FRJ3udmQk="; + sha256 = "sha256-S2zbm0S6LhQSRW6wFdbvqZdXHqIqLRSkqxVTQdIRGT4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 89d86ee4eb4..18a5f0cd82a 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.7"; + version = "1.14.8"; src = fetchPypi { inherit pname version; - sha256 = "8d8d171227e9c9eaadd4b037b3ddaa01055a33bacbdbeb57a5efbd273986665f"; + sha256 = "sha256-bDZVmaLLFnk7tifJtcVDCYK7WRyd6IhQAv+RtTm2ETM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 3600e173f94..e45e6a85487 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -56,6 +56,12 @@ buildPythonPackage rec { "httpx_socks" ]; + disabledTests = [ + # Tests don't work in the sandbox + "test_proxy" + "test_secure_proxy" + ]; + meta = with lib; { description = "Proxy (HTTP, SOCKS) transports for httpx"; homepage = "https://github.com/romis2012/httpx-socks"; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index b91835954b1..61b944b4883 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -14,6 +14,7 @@ , numpy , pandas , parsy +, poetry-core , pyarrow , pytest , pytest-mock @@ -49,7 +50,7 @@ in buildPythonPackage rec { pname = "ibis-framework"; version = "2.1.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -60,6 +61,8 @@ buildPythonPackage rec { sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200="; }; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ atpublic cached-property @@ -77,7 +80,7 @@ buildPythonPackage rec { sqlalchemy tables toolz - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.8" && lib.versionOlder version "3.0.0") [ importlib-metadata ]; @@ -90,8 +93,13 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace "atpublic>=2.3,<3" "atpublic>=2.3" + substituteInPlace pyproject.toml \ + --replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"' + ''; + + preBuild = '' + # setup.py exists only for developer convenience and is automatically generated + rm setup.py ''; disabledTests = [ @@ -135,7 +143,7 @@ buildPythonPackage rec { done wait - + '' + lib.optionalString (lib.versionOlder version "3.0.0") '' export PYTEST_BACKENDS="${backendsString}" ''; diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index 28fed3bcb78..81fd7c8a693 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "47e00e3f4e8477996e7dc420b6fa8ba53f8ced17de65320fedb5b15997b76589"; + sha256 = "sha256-CTALLRxnhxJBDL1HyVGY6xtYD2bzEaVUzNa551js4O4="; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index b1438f29a01..12cf40a6764 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -16,14 +16,16 @@ let in buildPythonPackage rec { pname = "iso4217"; - version = "1.7"; + version = "1.8"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "dahlia"; repo = pname; rev = version; - hash = "sha256-Ih2l6bGM7i5TUkzJPkgx8EOOL4a3/qE28SUZS6M4sQc="; + hash = "sha256-L0vx6Aan6D1lusgBh/pcT373ZTxbtWpQnFKB2V0dxlA="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index c78d5c7baee..23146a4f5a7 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.11"; + version = "4.1.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PmPl2P72K9VYby+Kkt4LOGXYPt7nhu43LEmuv4ha1yA="; + hash = "sha256-AqpT2Mqo5bjmKsu6WzVw/+AUOaSwlDfmXO0ufB6uc8A="; }; # Module has no tests diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index deb47b0b666..ec998b2f4d1 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.83"; + version = "1.2.84"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-QOTRmr7x4vB8shyxSNt6HX9+JnQ9vODGSR9aVQu+WSM="; + sha256 = "sha256-0ItNYdbGnIzgIh23Qtg9zQ5lm7zhY3qz+5s4MCfXN0E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix new file mode 100644 index 00000000000..5e9a86acc6b --- /dev/null +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httpx +, pythonOlder +, zeep +}: + +buildPythonPackage rec { + pname = "onvif-zeep-async"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM="; + }; + + propagatedBuildInputs = [ + httpx + zeep + ]; + + pythonImportsCheck = [ + "onvif" + ]; + + # Tests are not shipped + doCheck = false; + + meta = with lib; { + description = "ONVIF Client Implementation in Python"; + homepage = "https://github.com/hunterjm/python-onvif-zeep-async"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index fee9af14715..d5b9b7cf88e 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -1,37 +1,39 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, poetry-core -, databases -, pydantic -, sqlalchemy -, asyncpg -, psycopg2 , aiomysql +, aiopg , aiosqlite +, asyncpg +, buildPythonPackage , cryptography -, orjson -, typing-extensions +, databases +, fastapi +, fetchFromGitHub , importlib-metadata -, aiopg , mysqlclient +, orjson +, poetry-core +, psycopg2 +, pydantic , pymysql -, pytestCheckHook , pytest-asyncio -, fastapi +, pytestCheckHook +, pythonOlder +, sqlalchemy +, typing-extensions }: buildPythonPackage rec { pname = "ormar"; - version = "0.10.23"; + version = "0.10.24"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "collerek"; repo = pname; rev = version; - sha256 = "sha256-ILJvJyd56lqlKq7+mUz26LvusYb5AOOfoA7OgNq2fT0="; + hash = "sha256-zKugeGDcYDI4VKspJPWeZCBubTqMxxfOVQCuF4pC49E="; }; nativeBuildInputs = [ @@ -39,16 +41,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - databases - pydantic - sqlalchemy - asyncpg - psycopg2 aiomysql aiosqlite + asyncpg cryptography - + databases orjson + psycopg2 + pydantic + sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions importlib-metadata @@ -56,24 +57,35 @@ buildPythonPackage rec { checkInputs = [ aiomysql - aiosqlite aiopg + aiosqlite asyncpg - - psycopg2 + fastapi mysqlclient + psycopg2 pymysql - - pytestCheckHook pytest-asyncio - fastapi + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'SQLAlchemy = ">=1.3.18,<=1.4.29"' 'SQLAlchemy = ">=1.3.18"' \ + --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.5.5"' 'databases = ">=0.5.5"' + ''; + + disabledTests = [ + # TypeError: Object of type bytes is not JSON serializable + "test_bulk_operations_with_json" ]; - pythonImportsCheck = [ "ormar" ]; + pythonImportsCheck = [ + "ormar" + ]; meta = with lib; { homepage = "https://github.com/collerek/ormar"; - description = "A simple async ORM with fastapi in mind and pydantic validation."; + description = "Async ORM with fastapi in mind and pydantic validation"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; }; diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix new file mode 100644 index 00000000000..6f359d3bc9a --- /dev/null +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, poetry +, rich +, setuptools +}: + +buildPythonPackage rec { + version = "0.2.0"; + pname = "pipenv-poetry-migrate"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "yhino"; + repo = "pipenv-poetry-migrate"; + rev = "v${version}"; + hash = "sha256-2/e6uGwpUvzxXlz+51gUriE054bgNeJNyLDCIyiGflM="; + }; + + propagatedBuildInputs = [ + poetry + rich + setuptools + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace 'rich = "^9.6.1"' 'rich = ">9"' + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "This is simple migration script, migrate pipenv to poetry"; + homepage = "https://github.com/yhino/pipenv-poetry-migrate"; + license = licenses.asl20; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 333542bdbcc..03e3c255d3e 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.16.4"; + version = "0.16.5"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "sha256-G1PpVqq66uBAigrFxJVvcIKdyL3zTKxcosgkZTjy3Is="; + sha256 = "sha256-qvzocaqWIkhSdVm4x/pUIVtNBC0D5FRFEkonH7F6Oaw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 320e6d51c7a..57282010eb7 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.13.0"; + version = "0.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A="; + hash = "sha256-44G1H6bOtqVkplaX/sHxEzErlunclLh97OPO0m6n9eM="; }; propagatedBuildInputs = [ @@ -33,6 +33,9 @@ buildPythonPackage rec { disabledTests = [ # Test require network access "test_cloudformation_actions" + "test_auxiliar_cast" + "test_valid_es_domain_from_aws_documentation_examples_resource_can_be_built" + "test_valid_opensearch_domain_from_aws_documentation_examples_resource_can_be_built" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index bf878fd5acb..581238c90ac 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -3,15 +3,19 @@ , buildPythonPackage , fetchPypi , aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.14"; + version = "0.1.15"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x0mkC2k65VrDhv7UavgDUuRWIQoAJMDtA7jNXNUJuVg="; + sha256 = "sha256-zxD2sjKWB/bmxwpVFgkKTngMhr4bVuW+qkSt+pbxqPY="; }; propagatedBuildInputs = [ @@ -21,7 +25,10 @@ buildPythonPackage rec { # Tests require credentials doCheck = false; - pythonImportsCheck = [ "pyeconet" ]; + + pythonImportsCheck = [ + "pyeconet" + ]; meta = with lib; { description = "Python interface to the EcoNet API"; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 6f8a9fa6968..b8b405a8ecf 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - preCheck = '' + disabledTestPaths = [ # disable tests that require networking - rm test/test_repository.py - rm test/test_credentials.py - rm test/test_submodule.py - ''; + "test/test_repository.py" + "test/test_credentials.py" + "test/test_submodule.py" + ]; # Tests require certificates # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047 @@ -44,11 +44,10 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068 doCheck = false; - disabled = !isPy3k; - meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; homepage = "https://pypi.python.org/pypi/pygit2"; license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix index 3b6dd18665b..51d5b8bce5e 100644 --- a/pkgs/development/python-modules/pyhumps/default.nix +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -28,11 +29,14 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/nficano/humps/pull/240 - substituteInPlace pyproject.toml \ - --replace 'version = "3.0.2"' 'version = "${version}"' - ''; + patches = [ + # Fix naming, https://github.com/nficano/humps/pull/246 + (fetchpatch { + name = "fix-naming.patch"; + url = "https://github.com/nficano/humps/commit/118f6bce785d170b10dd3afee467d26dcc8b425d.patch"; + sha256 = "sha256-oQxkLsihnHZlHiZEupwG9Dr1Ss1w+KjDsBtbEVDced4="; + }) + ]; pythonImportsCheck = [ "humps" diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index fbf1fbce793..81beedbfdce 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -1,36 +1,36 @@ { lib -, buildPythonPackage -, fetchFromGitHub , aiofiles , aiohttp , async_generator +, buildPythonPackage +, fetchFromGitHub , pypubsub , pyserial , pyserial-asyncio -, pyyaml -, pytestCheckHook -, pythonOlder -, pytest-cov , pytest-asyncio , pytest-timeout +, pytestCheckHook +, pythonOlder +, pyyaml }: buildPythonPackage rec { pname = "pyinsteon"; version = "1.0.15"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-bR+2885JdGoVHBIZQG8iF0OXsECew7m5N9vopKtGp3I="; + hash = "sha256-bR+2885JdGoVHBIZQG8iF0OXsECew7m5N9vopKtGp3I="; }; propagatedBuildInputs = [ aiofiles aiohttp - async_generator pypubsub pyserial pyserial-asyncio @@ -38,13 +38,15 @@ buildPythonPackage rec { ]; checkInputs = [ + async_generator pytest-asyncio - pytest-cov pytest-timeout pytestCheckHook ]; - pythonImportsCheck = [ "pyinsteon" ]; + pythonImportsCheck = [ + "pyinsteon" + ]; meta = with lib; { description = "Python library to support Insteon home automation projects"; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix new file mode 100644 index 00000000000..00380f341fc --- /dev/null +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -0,0 +1,58 @@ +{ lib +, aiohttp +, attrs +, backoff +, boto3 +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pyhumps +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, warrant-lite +}: + +buildPythonPackage rec { + pname = "pyoverkiz"; + version = "1.3.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "iMicknl"; + repo = "python-overkiz-api"; + rev = "v${version}"; + hash = "sha256-KxZYluXa15RojAyNe5hA8Yf/Q9/mVl+b0TrDGRE6iuM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + aiohttp + backoff + pyhumps + boto3 + warrant-lite + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyoverkiz" + ]; + + meta = with lib; { + description = "Module to interact with the Somfy TaHoma API or other OverKiz APIs"; + homepage = "https://github.com/iMicknl/python-overkiz-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index ae297389bb1..724be70163a 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.13"; + version = "0.7.14"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "sha256-Gbz+3Hq4yStlTI7UxB4NBZigUzZjSJFFcwdzWtbGnio="; + sha256 = "sha256-v8eCCbSnAmJUmHSNS+lz8JRhDFrqyxgAkgcZ2bzfOTg="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix index ecc396d1b0f..d645a068d29 100644 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysimplegui"; - version = "4.56.0"; + version = "4.57.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - sha256 = "1a13a19282f92626cc6a823cbe9f4aa08aa558870f03441a1c4e8b6cef27c9d5"; + sha256 = "sha256-+Dcrv+esnthI74AFLK47sS2qI4sPvihuQlL54Zo32RM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 8e436b4eb7e..6425869243e 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-keycloak"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; rev = version; - sha256 = "sha256-YWDj/dLN72XMxDXpSPQvkxHF5xJ15xWJjw3vtfmxlwo="; + sha256 = "sha256-XCOfzzUs0K5/peprgpEXY2pX6wYOF7hg9ec1XPEYHCI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 21f29efb28f..a2da2e4f4a7 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonApplication , fetchPypi +, installShellFiles , pbr +, openstackdocstheme , oslo-config , oslo-log , oslo-serialization @@ -9,6 +11,8 @@ , prettytable , requests , simplejson +, sphinx +, sphinxcontrib-programoutput , Babel , osc-lib , python-keystoneclient @@ -25,6 +29,13 @@ buildPythonApplication rec { sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo="; }; + nativeBuildInputs = [ + installShellFiles + openstackdocstheme + sphinx + sphinxcontrib-programoutput + ]; + propagatedBuildInputs = [ pbr oslo-config @@ -40,6 +51,12 @@ buildPythonApplication rec { debtcollector ]; + postInstall = '' + export PATH=$out/bin:$PATH + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man + installManPage doc/build/man/python-manilaclient.1 + ''; + # Checks moved to 'passthru.tests' to workaround infinite recursion doCheck = false; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index e11f5ff1eb5..49dc1589ad7 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; homepage = "https://github.com/romis2012/python-socks"; license = licenses.asl20; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix index ba17dd81166..715bf164a4b 100644 --- a/pkgs/development/python-modules/python-songpal/default.nix +++ b/pkgs/development/python-modules/python-songpal/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , poetry-core , aiohttp , async-upnp-client @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.13"; + version = "0.14"; format = "pyproject"; @@ -23,24 +22,9 @@ buildPythonPackage rec { owner = "rytilahti"; repo = "python-songpal"; rev = version; - sha256 = "124w6vfn992845k09bjv352havk8pg590b135m37h1x1m7fmbpwa"; + hash = "sha256-yuCtz1B5bj3mWz4eP2GXzoaHuIQ47tIWn19jkZN54lw="; }; - patches = [ - # https://github.com/rytilahti/python-songpal/pull/90 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/rytilahti/python-songpal/commit/56b634790d94b2f9788d5af3d5cedff47f1e42c2.patch"; - sha256 = "0yc0mrb91ywk77nd4mxvyc0p2kjz2w1p395755a32ls30zw2bs27"; - }) - ]; - - postPatch = '' - # https://github.com/rytilahti/python-songpal/issues/91 - substituteInPlace pyproject.toml \ - --replace 'click = "^7"' 'click = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 91dabf40e93..e82aa3a2e8e 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.5.8"; + version = "0.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8VDneIfZ2o96fOdSRxDbbGg6rEsqdNTyfT7amnEYvBI="; + sha256 = "sha256-MBnO6k1nHKvLImLqGFiikIC03ThylwXb7Xehy5HjS0s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index e62581057d0..61baf3724e1 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.14.2"; + version = "0.14.3"; src = fetchPypi { inherit pname version; - sha256 = "713f117413bbd616a1a7da8f07db9adcd835ce73d8585fb469ea5b5785f92e4d"; + sha256 = "sha256-LQNJpUAIHdJGyBQeRWmfP4Y/LVOswISr0H0+OHox5cc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix index bc02e81e2ba..25b1773472f 100644 --- a/pkgs/development/python-modules/seatconnect/default.nix +++ b/pkgs/development/python-modules/seatconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "seatconnect"; - version = "1.1.5"; + version = "1.1.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "farfar"; repo = pname; rev = version; - hash = "sha256-NA/UiapJ/SyUmrj9hd2xGV5WWy1KhxwQtqGLV73TfHk="; + hash = "sha256-8ZqqNDLygHgtUzTgdb34+4BHuStXJXnl9fBfo0WSNZw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix index 6e498ebeaea..fc241ce278a 100644 --- a/pkgs/development/python-modules/simplefix/default.nix +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simplefix"; - version = "1.0.14"; + version = "1.0.15"; src = fetchFromGitHub { repo = "simplefix"; owner = "da4089"; rev = "v${version}"; - sha256 = "1qccb63w6swq7brp0zinkkngpazmb25r21adry5cq6nniqs5g5zx"; + sha256 = "sha256-GQHMotxNRuRv6zXhrD02T+aFgfYe3RnvUGADsBeSPbA="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 3c88cc9e7fa..196d3641eeb 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.14.1"; + version = "3.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-KhEfD8k7qQMfY2ErqApn1K1lhIJgBiVBjjWKL2DjNdg="; + sha256 = "sha256-ndJdf8BGYfJsLVWqp00YD4vndS3n24UBm06ibcVRMpY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix new file mode 100644 index 00000000000..676f72c3f14 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, sphinxcontrib-serializinghtml +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-programoutput"; + version = "0.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-MA7puMrug1XSXMdLTRx+/RLmCNKtFl4xQdMeb7wVK38="; + }; + + buildInputs = [ + sphinx + ]; + + # fails to import sphinxcontrib.serializinghtml + doCheck = false; + + pythonImportsCheck = [ "sphinxcontrib.programoutput" ]; + + meta = with lib; { + description = "Sphinx extension to include program output"; + homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; + license = licenses.bsd2; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index c808fe6acd2..5b1ff139ff9 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,20 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pythonOlder +}: buildPythonPackage rec { pname = "stripe"; - version = "2.65.0"; + version = "2.66.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2e55d4d7262085de9cef2228f14581925c35350ba58a332352b1ec9e19a7b7a6"; + hash = "sha256-d8YDIjD3cUsaG0WQdPCMYNYMIpucO+rDcnGQY+PRQJw="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Tests require network connectivity and there's no easy way to disable them doCheck = false; - pythonImportsCheck = [ "stripe" ]; + pythonImportsCheck = [ + "stripe" + ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/wsdiscovery/default.nix b/pkgs/development/python-modules/wsdiscovery/default.nix new file mode 100644 index 00000000000..8ba79744949 --- /dev/null +++ b/pkgs/development/python-modules/wsdiscovery/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, mock +, netifaces +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "wsdiscovery"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "andreikop"; + repo = "python-ws-discovery"; + rev = version; + hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk="; + }; + + propagatedBuildInputs = [ + click + netifaces + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "wsdiscovery" + ]; + + meta = with lib; { + description = "WS-Discovery implementation for Python"; + homepage = "https://github.com/andreikop/python-ws-discovery"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix index e9a8ae0323d..1a8d561d5de 100644 --- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -3,17 +3,21 @@ , buildPythonPackage , fetchFromGitHub , requests +, pythonOlder }: buildPythonPackage rec { pname = "yalesmartalarmclient"; - version = "0.3.7"; + version = "0.3.8"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "domwillcode"; repo = "yale-smart-alarm-client"; rev = "v${version}"; - sha256 = "sha256-LcHXw4rZhQ942EhiGrRTf3MpT7G5OFSX8QbpxVjvTTo="; + sha256 = "sha256-CWL1uvmUGLaa2Ho0Ka4wTWstebhe1nQr9R821mweE60="; }; propagatedBuildInputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "yalesmartalarmclient" ]; + pythonImportsCheck = [ + "yalesmartalarmclient" + ]; meta = with lib; { description = "Python module to interface with Yale Smart Alarm Systems"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 6c9ff9f8789..9d19aaa184a 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.845"; + version = "2.0.866"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-vF09H2fnMYWxUnadOCfLfAdcWNSVASLvHYLJIhD+Y/4="; + hash = "sha256-ASaRZO5/4IGT6GPQTMmwGao4Q+yuyiLO9eGV3Dy8mLQ="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0b1b3dfb8ef..36c85285704 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.171.0"; + version = "0.172.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-g/i2ZeIzitL35x3QoL+Rng3M0AiYgsBQ8TQY35Jmboc="; + sha256 = "sha256-N3mP1dhul7Ljn278CJmge4IrVllQJsc73A3/7mTSU70="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index edad1f0dd9e..3752fa8e251 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "oclgrind"; - version = "19.10"; + version = "21.10"; src = fetchFromGitHub { owner = "jrprice"; repo = "oclgrind"; rev = "v${version}"; - sha256 = "12v5z5x3ls26p3y3yc4mqmh12cazc0nlrwvmfbn6cyg4af9dp0zn"; + sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 64ab4a315de..da73737530e 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.41.0"; + version = "6.42.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-kXyUukqLFIdaBpO+oimyrzmGm6bNwoQaRDIoMtZq45k="; + sha256 = "sha256-rVqHMhiuFLVTz/J9TGnA/42m9GaGORsf+CrUUqsdUfs="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://pmd.github.io/"; changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; platforms = platforms.unix; - license = with licenses; [ bsdOriginal asl20 lgpl3Plus ]; + license = with licenses; [ bsdOriginal asl20 ]; }; } diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a55a5f09b7d..f37d6a6ef82 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; postFixup = lib.optionalString stdenv.isDarwin '' - for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib; do + for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib $out/lib/libr_anal.${version}.dylib; do install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $file done ''; diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 5ea43e5555b..4c33ef57a47 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.6"; + version = "4.3.0"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-69cKAyMwORG4A91OARmY4uQKgBZIx9N/zc7TZ086CK0="; + sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix new file mode 100644 index 00000000000..8fe1dbaa4be --- /dev/null +++ b/pkgs/development/tools/bingo/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, testVersion, bingo }: + +buildGoModule rec { + pname = "bingo"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "bwplotka"; + repo = "bingo"; + rev = "v${version}"; + sha256 = "sha256-4D8YaA/AH1gIp5iwD7WEAdBl73sqwHpfOe7bnxVcRcw="; + }; + + vendorSha256 = "sha256-xrz9FpwZd+FboVVTWSqGHRguGwrwE9cSFEEtulzbfDQ="; + + patches = [ + # Do not execute `go` command when invoking `bingo version`. + ./version_go.patch + ]; + + postPatch = '' + rm get_e2e_test.go get_e2e_utils_test.go + ''; + + CGO_ENABLED = 0; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testVersion { + package = bingo; + command = "bingo version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Like `go get` but for Go tools! CI Automating versioning of Go binaries in a nested, isolated Go modules."; + homepage = "https://github.com/bwplotka/bingo"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + }; +} diff --git a/pkgs/development/tools/bingo/version_go.patch b/pkgs/development/tools/bingo/version_go.patch new file mode 100644 index 00000000000..2898326a054 --- /dev/null +++ b/pkgs/development/tools/bingo/version_go.patch @@ -0,0 +1,17 @@ +diff --git a/main.go b/main.go +index 5600f7e..662ed1b 100644 +--- a/main.go ++++ b/main.go +@@ -201,10 +201,8 @@ func main() { + return pkgs.PrintTab(target, os.Stdout) + } + case "version": +- cmdFunc = func(ctx context.Context, r *runner.Runner) error { +- _, err := fmt.Fprintln(os.Stdout, version.Version) +- return err +- } ++ _, _ = fmt.Fprintln(os.Stdout, version.Version) ++ return + default: + exitOnUsageError(flags.Usage, "No such command", flags.Arg(0)) + } diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 67c132bd9e0..60d8d8f58b8 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,15 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.0.0-rc12"; + version = "1.0.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UqyWQdlCDTSjW348f87W7g2kwB5nzIOviSE5/1T1soY="; + sha256 = "sha256-jJaob2eaozMFRsXwW6ulgM5De3UmpLZddTHwq6PnaeE="; }; - vendorSha256 = "sha256-qBgGZTok3G0Pgku76uiV9bZperhiSNoWSrzxrHe4QXw="; + + vendorSha256 = "sha256-wPnrkfv6pJB6tkZo2oeMbWHbF9njGh1ZEWu8tkHDhGo="; patches = [ # Skip a test that requires networking to be available to work. @@ -27,12 +28,15 @@ buildGoModule rec { ./skip_test_requiring_dotgit.patch ]; - nativeBuildInputs = [ protobuf installShellFiles ]; - # Required for TestGitCloner - checkInputs = [ git ]; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" ]; + checkInputs = [ + git # Required for TestGitCloner + protobuf # Required for buftesting.GetProtocFilePaths + ]; + preCheck = '' # The tests need access to some of the built utilities export PATH="$PATH:$GOPATH/bin" @@ -55,9 +59,9 @@ buildGoModule rec { # Completions installShellCompletion --cmd buf \ - --bash <($GOPATH/bin/buf bash-completion) \ - --fish <($GOPATH/bin/buf fish-completion) \ - --zsh <($GOPATH/bin/buf zsh-completion) + --bash <($GOPATH/bin/buf completion bash) \ + --fish <($GOPATH/bin/buf completion fish) \ + --zsh <($GOPATH/bin/buf completion zsh) # Man Pages mkdir man && $GOPATH/bin/buf manpages man diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index e8da9733ae9..78376b639c4 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -3,7 +3,7 @@ rec { gen = - { version, nativeVersion, sha256, defaultJava ? jdk8 }: + { version, nativeVersion, sha256, defaultJava ? jdk8, supportedPlatforms ? null }: { lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava , javaToolchains ? [ ], ncurses5, ncurses6 }: @@ -87,7 +87,7 @@ rec { changelog = "https://docs.gradle.org/${version}/release-notes.html"; downloadPage = "https://gradle.org/next-steps/?version=${version}"; license = licenses.asl20; - platforms = platforms.unix; + platforms = if (supportedPlatforms != null) then supportedPlatforms else platforms.unix; maintainers = with maintainers; [ lorenzleutgeb liff ]; }; }; @@ -100,6 +100,9 @@ rec { nativeVersion = "0.22-milestone-23"; sha256 = "0d56bgd2m64pzmycjk29hwdlhbpn1kkm7fjik1sibn6vslw71hlc"; defaultJava = jdk17; + # Gradle 7 ships some binaries that are only available for some platforms + # See https://github.com/gradle/native-platform#supported-platforms + supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ]; }; gradle_6 = gen { @@ -107,6 +110,9 @@ rec { nativeVersion = "0.22-milestone-20"; sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb"; defaultJava = jdk11; + # Gradle 6 ships some binaries that are only available for some platforms + # See https://github.com/gradle/native-platform#supported-platforms + supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ]; }; # NOTE: No GitHub Release for the following versions. `update.sh` will not work. diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index ec3f4de5e11..ea6f866a48b 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-Dl1ZTYzwZ3tl5k9uPnnKHObmTP6Xsw0P1LdPqCfd/d0="; + sha256 = "sha256-gBO+H26YGmOtP3CUHZjynAaOb0h+MJbJnWqxOZdif6w="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 717a6d7c695..7c95565487d 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-kWGj0THunXXv3fz9oRLPx314bBU8mdHElmz0v7ALNpE="; + hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 58f7de000be..679c9a6cc9c 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.21"; + version = "0.14.22"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-O+S8oj9gthrJ+OXSP5b/RRczLuRVFsA3u26ii2bcagk="; + sha256 = "sha256-1/SVcXp5mcfJ8X0Ev+48S5w1kn7RrFqsFSBqjo3mxcI="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 715c237f494..f0e125245ef 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.13"; + version = "3.14.14"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-apX4MFzeR7+5gWauw5HXPK0c7N4uTSqkE2vqnYB5LJs="; + sha256 = "sha256-1ie/pkg0pv8bJphQ8PXceRd2WALYaVxBAW1O/s4kKHA="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-4Ak+mh9ege38iO1QyxvGkYvRyU11QjphfLrit1qfu58="; + vendorSha256 = "sha256-vWqj2fRtaDextDstIb5GrdRn4nxQpCfjegYiVbPILuM="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 122b4e0831e..6334c00fc0b 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.44.0"; + version = "1.44.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-2hEru7fnc8v7F/RrOB3jFdfLPYLpm0OupzJP6iORs+U="; + sha256 = "sha256-RMZZLvCJcTMzHOzUfT6aEC21T5dCwu1YOUuQ9PLS3fc="; }; - vendorSha256 = "sha256-DLvhkTYCaXfNfehEgCNKSKlKaGHo623wBnEhNeTJbmQ="; + vendorSha256 = "sha256-X2hZ4BQgYHI1mx/Ywky0oo7IMtrppu+rLq2LRLPH3fY="; doCheck = false; diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index ab206a090bb..a7562429db5 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cIrlhhk5Lt0Qt7q7rKw8EXrJqZWZEjrEUyHOvHiT6bs="; + sha256 = "sha256-Xhe5WNHQ+Oa1m/6VwC3zCwWzXRc1spSfPp4jySsOcuU="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 21ab6ddf188..73fdb3dff8f 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.43.2"; + version = "0.44.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-HXTkYwN6U8xyxgFnj69nLSpbDCqWUWeSuqlZbquRD6o="; + sha256 = "1l2pmvqw8rjl2xmsdp31j8015clshab6p81i3i05h40rjjz57mvr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix index 25ab4ceab5f..ed1b80787c4 100644 --- a/pkgs/development/tools/mask/default.nix +++ b/pkgs/development/tools/mask/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "jakedeichert"; repo = pname; rev = "v${version}"; - sha256 = "0gsfs837nzh71df6p6klcsgxp471c8hq14xqd62q5bsv7jg9dygc"; + sha256 = "sha256-qRN9M/DxkxcF1/dmYqmf3qB8yHzuaN3LRENy1ehgg0c="; }; - cargoSha256 = "1h4sasqdl3rli0v6lizdci0vvr2fvbyhllddxwv8vx8r7w9ry963"; + cargoSha256 = "sha256-7ts63n9aGtaK8INBh11TShOQCVpV+82VADmNbKURv+g="; # tests require mask to be installed doCheck = false; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 0163b616f14..a52a2a141c3 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,15 +2,19 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ekwucff12FIjaZ8qDvonhTdz7+DRpPLMGz2yqaCy+Bc="; + sha256 = "sha256-PsTQuEbo1ReWwZV4D14mEGsU99j49kleiL/6Xyk+g9s="; }; + ldflags = [ + "-X github.com/equinix/metal-cli/cmd.Version=${version}" + ]; + vendorSha256 = "sha256-F8d5i9jvjY11Pv6w0ZXI3jr0Wix++B/w9oRTuJGpQfE="; doCheck = false; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix new file mode 100644 index 00000000000..59ea9c43512 --- /dev/null +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, ocaml, findlib, darwin }: + +if lib.versionOlder ocaml.version "4.08" +then throw "dune 3 is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + pname = "dune"; + version = "3.0.2"; + + src = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/${version}/fiber-${version}.tbz"; + sha256 = "sha256-o108qIeWMOX0VU/wWdc5bg/UDCT2CCcw/Xx3nFiDbes="; + }; + + nativeBuildInputs = [ ocaml findlib ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + strictDeps = true; + + buildFlags = "release"; + + dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; + + installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + + meta = { + homepage = "https://dune.build/"; + description = "A composable build system"; + changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; + maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; + license = lib.licenses.mit; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 74341c0a7b4..4acf2264fc9 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -1,23 +1,36 @@ -{ lib, stdenv, fetchurl, python2 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, python3 +}: + stdenv.mkDerivation rec { pname = "omniorb"; - - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - sha256 = "0vvsvi5nx4k7kk4qh1pkf3f5fpz7wv4rsdna4hayihbnvz81rh18"; + hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0="; }; - buildInputs = [ python2 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ python3 ]; + enableParallelBuilding = true; hardeningDisable = [ "format" ]; meta = with lib; { - description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant"; + description = "A robust high performance CORBA ORB for C++ and Python"; + longDescription = '' + omniORB is a robust high performance CORBA ORB for C++ and Python. + It is freely available under the terms of the GNU Lesser General Public License + (for the libraries),and GNU General Public License (for the tools). + omniORB is largely CORBA 2.6 compliant. + ''; homepage = "http://omniorb.sourceforge.net/"; - license = licenses.gpl2Plus; + license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ smironov ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix new file mode 100644 index 00000000000..4978c4a3c3e --- /dev/null +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1, AppKit }: + +rustPlatform.buildRustPackage rec { + pname = "probe-rs-cli"; + version = "0.12.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-XYrB/aKuFCe0FNe6N9vqDdr408tAiN6YvT5BL6lCxmU="; + }; + + cargoSha256 = "sha256-aXSJMSGNl2fzob1j/qiPHHZLisYQeU1gUO5cYbzSHYA="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + description = "CLI tool for on-chip debugging and flashing of ARM chips"; + homepage = "https://probe.rs/"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ xgroleau ]; + }; +} diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index 3ec4163ac44..c1c5bbee0ac 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.32"; + version = "1.0.40"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4VKTp4q2CoIWQTiSgs254deafuowiTpuLVJ79nmqAaA="; + sha256 = "sha256-/b9ZmwTw9DbdO0KI7rfT0YW0Xo2cxfwhk1TEfTe3ySU="; }; - vendorSha256 = "sha256-4xuWehRrmVdS2F6r00LZLKq/oHlWqCTQ/jYUKeIJ6DI="; + vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 5ec2ff7ac45..213a8da8ce0 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-SXwIwBlajzcXJaB90aesPk6BTRUNLRXtx4FPuM7pcyU="; + sha256 = "sha256-L3dHkF7yKnwXpXxCEswwA0TxVfjTzc89l0rpT7EYpIU="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 7d88df2feb0..aa58b37773e 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 5d185dd153e..7db111a50f2 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nry6P4nwcCmvJ4kdzeGEkaP1fm2LgnAwrINTBFK23tY="; + sha256 = "sha256-bgfG1cPhauU85FG/ZX1n2KqfydMeh92q347UsREkOGo="; }; - cargoSha256 = "sha256-i5wOGPOe1lDZknrVzZGxC8dUgTGiZJSzLqkxSRt0mQ8="; + cargoSha256 = "sha256-njZTD6O67v787Z1tJ7G0QzxJLhqU2sfpOVw6r4woE9s="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 99b51854e7d..4ec62ed4d29 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "Lua Language Server coded by Lua "; homepage = "https://github.com/sumneko/lua-language-server"; license = licenses.mit; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "lua-language-server"; }; diff --git a/pkgs/development/tools/uniffi-bindgen/Cargo.lock b/pkgs/development/tools/uniffi-bindgen/Cargo.lock new file mode 100644 index 00000000000..4de3b80928a --- /dev/null +++ b/pkgs/development/tools/uniffi-bindgen/Cargo.lock @@ -0,0 +1,837 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "askama" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" +dependencies = [ + "askama_derive", + "askama_escape", + "askama_shared", +] + +[[package]] +name = "askama_derive" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" +dependencies = [ + "askama_shared", + "proc-macro2", + "syn", +] + +[[package]] +name = "askama_escape" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1bb320f97e6edf9f756bf015900038e43c7700e059688e5724a928c8f3b8d5" + +[[package]] +name = "askama_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" +dependencies = [ + "askama_escape", + "nom 6.2.1", + "proc-macro2", + "quote", + "serde", + "syn", + "toml", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitvec" +version = "0.19.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] +name = "callbacks" +version = "0.17.0" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "camino" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "semver-parser", + "serde", + "serde_json", +] + +[[package]] +name = "cdylib-dependency" +version = "0.17.0" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "coverall" +version = "0.17.0" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "crate_one" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "crate_two" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "crate_one", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "custom-types" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "uniffi", + "uniffi_build", + "uniffi_macros", + "url", +] + +[[package]] +name = "ext-types-guid" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "ext-types-lib" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "custom-types", + "ext-types-guid", + "uniffi", + "uniffi-one", + "uniffi_build", + "uniffi_macros", + "url", +] + +[[package]] +name = "external_types_lib" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "crate_one", + "crate_two", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "ffi-crate" +version = "0.17.0" +dependencies = [ + "cdylib-dependency", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "i1015-fully-qualified-types" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "i356-enum-without-int-helpers" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "kotlin-experimental-unsigned-types" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags", + "cfg-if", + "ryu", + "static_assertions", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "6.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "omit_argument_labels" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "once_cell" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" + +[[package]] +name = "paste" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + +[[package]] +name = "proc-macro2" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", + "serde", +] + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "syn" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinyvec" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "trybuild" +version = "1.0.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099a24e67e2b4083a6d0beb5a98e274c3160edfb879d71cd2cd14da93786a93b" +dependencies = [ + "glob", + "once_cell", + "serde", + "serde_json", + "termcolor", + "toml", +] + +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + +[[package]] +name = "unicode-bidi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "uniffi" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "cargo_metadata", + "lazy_static", + "log", + "paste", + "static_assertions", + "trybuild", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi-example-arithmetic" +version = "0.17.0" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-callbacks" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-geometry" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-rondpoint" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-sprites" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-todolist" +version = "0.17.0" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-time" +version = "0.17.0" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-one" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi_bindgen" +version = "0.17.0" +dependencies = [ + "anyhow", + "askama", + "cargo_metadata", + "clap", + "heck", + "paste", + "serde", + "toml", + "weedle", +] + +[[package]] +name = "uniffi_build" +version = "0.17.0" +dependencies = [ + "anyhow", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi_macros" +version = "0.17.0" +dependencies = [ + "glob", + "proc-macro2", + "quote", + "syn", + "uniffi_build", +] + +[[package]] +name = "uniffi_uitests" +version = "0.17.0" +dependencies = [ + "trybuild", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "weedle" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" +dependencies = [ + "nom 5.1.2", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix new file mode 100644 index 00000000000..59ecd71a411 --- /dev/null +++ b/pkgs/development/tools/uniffi-bindgen/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, ktlint +, yapf +, rubocop +, rustfmt +, makeWrapper +}: + +rustPlatform.buildRustPackage rec { + pname = "uniffi-bindgen"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "uniffi-rs"; + rev = "v${version}"; + hash = "sha256-EGyJrW0U/dnKT7OWgd8LehCyvj6mxud3QWbBVyhoK4Y="; + }; + + cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; + cargoHash = "sha256-Fw+yCAI32NdFKJGPuNU6t0FiEfohoVD3VQfInNJuooI="; + + cargoBuildFlags = [ "-p uniffi_bindgen" ]; + cargoTestFlags = [ "-p uniffi_bindgen" ]; + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + postFixup = '' + wrapProgram "$out/bin/uniffi-bindgen" \ + --suffix PATH : ${lib.strings.makeBinPath [ rustfmt ktlint yapf rubocop ] } + ''; + + meta = with lib; { + description = "Toolkit for building cross-platform software components in Rust"; + homepage = "https://mozilla.github.io/uniffi-rs/"; + license = licenses.mpl20; + maintainers = with maintainers; [ vtuan10 ]; + }; +} diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index a58a0e95a38..e80bb0f14cd 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-6f9UF0UgwKG3Mdgy85pW2KVjC8nbnMTwQJqIWxA3Jp4="; + sha256 = "sha256-3l0ezObZK/QEmpBlqSm3R3e4pFM7KUnsxDrzvEYExnk="; }; vendorSha256 = null; diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix index 94a5c3de37a..1c9ed7c2e10 100644 --- a/pkgs/development/web/bloomrpc/default.nix +++ b/pkgs/development/web/bloomrpc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, gsettings-desktop-schemas, gtk3, appimageTools }: let pname = "bloomrpc"; @@ -13,9 +13,15 @@ let appimageContents = appimageTools.extractType2 { inherit pname src version; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname src version; + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + multiPkgs = null; # no 32bit needed extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index df343f30785..a87892c5f14 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.26.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "sha256-bZWyAZrAYG45fqmEQYXsk8YLKurpppaahOkALAQXGhY="; + sha256 = "sha256-OmvKd35jR003qQnA/NBI4MjGRw044bYUYa59RKbz+lI="; }; # the integration tests will try to clone a remote repos @@ -35,6 +35,7 @@ crystal.buildCrystalPackage rec { meta = with lib; { description = "A Crystal library for creating and running tasks. Also generates Lucky projects"; + homepage = "https://luckyframework.org/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock index f0808622bcf..854a755b0df 100644 --- a/pkgs/development/web/lucky-cli/shard.lock +++ b/pkgs/development/web/lucky-cli/shard.lock @@ -2,13 +2,13 @@ version: 2.0 shards: ameba: git: https://github.com/crystal-ameba/ameba.git - version: 0.14.2 + version: 0.14.3 - future: - git: https://github.com/crystal-community/future.cr.git - version: 0.1.0 + lucky_task: + git: https://github.com/luckyframework/lucky_task.git + version: 0.1.1 teeplate: git: https://github.com/luckyframework/teeplate.git - version: 0.8.2 + version: 0.8.5 diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix index b4f100518b3..78c0b4b1338 100644 --- a/pkgs/development/web/lucky-cli/shards.nix +++ b/pkgs/development/web/lucky-cli/shards.nix @@ -2,19 +2,19 @@ ameba = { owner = "crystal-ameba"; repo = "ameba"; - rev = "v0.14.2"; - sha256 = "1l1q1icpzg1zvhfj8948w36j7ikaj7w816677zi29vi6y2d1dmf2"; + rev = "v0.14.3"; + sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1"; }; - future = { - owner = "crystal-community"; - repo = "future.cr"; - rev = "v0.1.0"; - sha256 = "1p88mfn1ab5hz4r81vjfm1vn9rww0lbbii8lyzfx9pkxanh9rp98"; + lucky_task = { + owner = "luckyframework"; + repo = "lucky_task"; + rev = "v0.1.1"; + sha256 = "0w0rnf22pvj3lp5z8c4sshzwhqgwpbjpm7nry9mf0iz3fa0v48f7"; }; teeplate = { owner = "luckyframework"; repo = "teeplate"; - rev = "v0.8.2"; - sha256 = "1v7njslcpir52nnyd30mfnxvqmb7ycqnlq80qnx6myw20iy9dcww"; + rev = "v0.8.5"; + sha256 = "1kr05qrp674rph1324wry57gzvgvcvlz0w27brlvdgd3gi4s8sdj"; }; } diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index aacc15d19b9..46ae45b2202 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,5 +1,25 @@ -{ fetchFromGitHub, lib, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, libsecret, qtmultimedia, qttools, yajl, libzip, hunspell -, boost, libGLU, lua, cmake, which, pkg-config, }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, git +, pkg-config +, qttools +, which +, wrapQtAppsHook +, boost +, hunspell +, libGLU +, libsForQt5 +, libsecret +, libzip +, lua +, pcre +, pugixml +, qtbase +, qtmultimedia +, yajl +}: let luaEnv = lua.withPackages(ps: with ps; [ @@ -8,25 +28,46 @@ let in stdenv.mkDerivation rec { pname = "mudlet"; - version = "4.12.0"; + version = "4.15.1"; src = fetchFromGitHub { owner = "Mudlet"; repo = "Mudlet"; rev = "Mudlet-${version}"; fetchSubmodules = true; - sha256 = "023plm5mwm15xikmdh1mq3gx1n7y4a0r0kw9fvk3rvm9brm78hzp"; + hash = "sha256-GnTQc0Jh4YaQnfy7fYsTCACczlzWCQ+auKYoU9ET83M="; }; - nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook git qttools which ]; + nativeBuildInputs = [ + cmake + git + pkg-config + qttools + which + wrapQtAppsHook + ]; + buildInputs = [ - pcre pugixml qtbase libsForQt5.qtkeychain qtmultimedia luaEnv libsecret libzip libGLU yajl boost hunspell + boost + hunspell + libGLU + libsForQt5.qtkeychain + libsecret + libzip + luaEnv + pcre + pugixml + qtbase + qtmultimedia + yajl ]; WITH_FONTS = "NO"; WITH_UPDATER = "NO"; installPhase = '' + runHook preInstall + mkdir -pv $out/lib cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog.so $out/lib mkdir -pv $out/bin @@ -41,15 +82,19 @@ stdenv.mkDerivation rec { cp -r ../mudlet.png $out/share/pixmaps/ makeQtWrapper $out/mudlet $out/bin/mudlet \ + --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH : "$NIX_LUA_PATH" \ --prefix LD_LIBRARY_PATH : "${libsForQt5.qtkeychain}/lib/" \ --run "cd $out"; + + runHook postInstall ''; meta = with lib; { description = "Crossplatform mud client"; - homepage = "https://mudlet.org"; + homepage = "https://www.mudlet.org/"; maintainers = [ maintainers.wyvie maintainers.pstn ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 35564704f68..5ddbabe042e 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.118.0"; + version = "2022.205.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-/BzoLiQLiBcWqThzDOVb4Y7s6WhcKnCRRhAzUi5Jstk="; + sha256 = "sha256-CzXgj3990qWOwIjhbU8vO29nDO/7HrGDtsc67VIenPI="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 7bf9a89e50f..6ff9f6dfaf8 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -111,8 +111,10 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.2"; sha256 = "0db6d1b076nfqfn5mhy63l3gkfn5kr29hwcrx81ldr7y062r1b9y"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) @@ -153,14 +155,16 @@ (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.2"; sha256 = "0blwfs1cacxq0vs6fy7zjnsny8qdsr5jlxix3icmphyqgz0g4g39"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.2"; sha256 = "18q6gjayqrwk6n1kf359z94z8zyb3yz4hr1dpgglk51sq6wi2z84"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.1210.0"; sha256 = "0dn6fc31yllr5nizylvkfl2b603b5m9694nsn5mmkh8w43h0rkbq"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.118.0"; sha256 = "1c81r8s9zivj9hany0yqsza1y3nhh24zbkwwnjm0m6z4mls04l1y"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.204.0"; sha256 = "1dwg45k1qhxj4mhxw49djmab800yi7z7qnvl8ipicli4lg9k5lvf"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.1221.0"; sha256 = "1ffxp4nsgbqw1f6nypirmc0a3h203qikbmxm2x8w3kgcfga5dx3k"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.115.0"; sha256 = "0w2hnci93644ayfpgpsyxsifz38yklvn42fkgd860i3mn04lyl2z"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.204.0"; sha256 = "1v4kfphjbkcxswx11c7xh93jwpsyvnskc0zia91d5bp5d11y3z32"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.486-alpha"; sha256 = "0hp6wfjgpwdgy1ag2bpjkyalw92k6qg9pc5mriij6a5vhxzadhk3"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.501-alpha"; sha256 = "03ixv0nhszsyyf0bvyd25nkyn3c3cndzbxnva19lagvf0l9gnvjg"; }) (fetchNuGet { pname = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) (fetchNuGet { pname = "Realm"; version = "10.8.0"; sha256 = "1ixpms8x9z5ia9yiqvhmgdlcrjvqrhbqnr8b9z6mlxwcms1z2f45"; }) (fetchNuGet { pname = "Realm.Fody"; version = "10.8.0"; sha256 = "0hj3cqan96y01k5qgs0knkqzg3rlr2794az68xqffd2vqphvqvqq"; }) @@ -298,6 +302,7 @@ (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0-rc.1.21451.13"; sha256 = "0v5bc80p35jj5b5xdgsn5r1v4w68gqz0sahi214rprrrlr3sl206"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index 213f2c8e4f4..e0bd6909fb9 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -3,14 +3,14 @@ }: mkDerivation rec { - version = "19.1"; + version = "20.0"; pname = "pentobi"; src = fetchFromGitHub { owner = "enz"; repo = "pentobi"; rev = "v${version}"; - sha256 = "sha256-opJPMvaE8fDoGaBNHySqr/LRU/UPP6292G+nYyBBL08="; + sha256 = "sha256-DQM3IJ0pRkX4OsrjZGROg50LfKb621UnpvtqSjxchz8="; }; nativeBuildInputs = [ cmake docbook_xsl qttools ]; @@ -31,7 +31,7 @@ mkDerivation rec { meta = with lib; { description = "A computer opponent for the board game Blokus"; homepage = "https://pentobi.sourceforge.io"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 82879d0a9d2..b70ef8c3dab 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,37 +1,68 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, curl, libsigcxx, SDL2 -, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU, libGL -, glew +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, assimp +, curl +, freetype +#, glew +, libGL +, libGLU +, libpng +, libsigcxx +, libvorbis +, lua5_2 +, mesa +, SDL2 +, SDL2_image }: stdenv.mkDerivation rec { pname = "pioneer"; - version = "20210723"; + version = "20220203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "sha256-w+ECVv96MoS69815+X0PqguDiGDhHoTnAnnYtLpMScI="; + hash = "sha256-HNVg8Lq6k6gQDmgOdpnBwJ57WSEnn5XwtqzmkDU1WGI="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'string(TIMESTAMP PROJECT_VERSION "%Y%m%d")' 'set(PROJECT_VERSION ${version})' + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng - assimp libGLU libGL glew + assimp + curl + freetype + libGL + libGLU + libpng + libsigcxx + libvorbis + lua5_2 + mesa + SDL2 + SDL2_image ]; - preConfigure = '' - export PIONEER_DATA_DIR="$out/share/pioneer/data"; - ''; + cmakeFlags = [ + "-DPIONEER_DATA_DIR:PATH=${placeholder "out"}/share/pioneer/data" + "-DUSE_SYSTEM_LIBLUA:BOOL=YES" + ]; - makeFlags = [ "build-data" ]; + makeFlags = [ "all" "build-data" ]; meta = with lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = "https://pioneerspacesim.net"; license = with licenses; [ - gpl3 cc-by-sa-30 + gpl3Only cc-by-sa-30 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 1ff9f9d36d1..905d51438b6 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.4"; + version = "3.6.5"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-WUEpYxzNcH9kJRn4nROoaeXTe1+D4/0VRqTwc7ac1hc="; + sha256 = "sha256-wnaT0+r599/RboeUfpCZTNd/M2kaCsckI9F+7r7leEE="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/vassal $out/doc cp CHANGES LICENSE README.md $out @@ -21,6 +23,8 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/vassal \ --add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \ VASSAL.launch.ModuleManager" + + runHook postInstall ''; # Don't move doc to share/, VASSAL expects it to be in the root @@ -28,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free, open-source boardgame engine"; - homepage = "http://www.vassalengine.org/"; + homepage = "https://vassalengine.org/"; license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.unix; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 72a2f8a71bc..395fb6711d4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -195,6 +195,30 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; + asyncrun-vim = buildVimPluginFrom2Nix { + pname = "asyncrun.vim"; + version = "2022-02-03"; + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "asyncrun.vim"; + rev = "fc6d524b9d81850c15b9b374a1b4a1374e243ec3"; + sha256 = "/144rx2txz+VnPI8y4w1z9DY5nBEmp64arApRGiHQXU="; + }; + meta.homepage = "https://github.com/skywind3000/asyncrun.vim"; + }; + + asynctasks-vim = buildVimPluginFrom2Nix { + pname = "asynctasks.vim"; + version = "2022-01-12"; + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "asynctasks.vim"; + rev = "dfecf57c79ded5ead2911e32caff46d8cede8c5c"; + sha256 = "cw61N5K6GHwdT011oeFV+jzFw9tk4xahPcTnx5jwqPA="; + }; + meta.homepage = "https://github.com/skywind3000/asynctasks.vim"; + }; + ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; version = "2020-09-04"; @@ -735,6 +759,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; + cmp-nvim-ultisnips = buildVimPluginFrom2Nix { + pname = "cmp-nvim-ultisnips"; + version = "2022-01-31"; + src = fetchFromGitHub { + owner = "quangnguyen30192"; + repo = "cmp-nvim-ultisnips"; + rev = "0e8f501facdcc5bfdb5664ee185e040464a79625"; + sha256 = "tQ3xkJ34q5+ioi6lQY7F/ZjGngzmv4FDkpNeU5sRqK0="; + }; + meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips"; + }; + cmp-omni = buildVimPluginFrom2Nix { pname = "cmp-omni"; version = "2022-01-08"; @@ -6423,6 +6459,18 @@ final: prev: meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-asynctasks-nvim = buildVimPluginFrom2Nix { + pname = "telescope-asynctasks.nvim"; + version = "2021-10-22"; + src = fetchFromGitHub { + owner = "GustavoKatel"; + repo = "telescope-asynctasks.nvim"; + rev = "80bd6570e5423d14ad1e6fd56a199955ac1b895f"; + sha256 = "Ow7iSmosMs/hGEfnKKorZhS4tKVKal+pkZ52LIFsEu4="; + }; + meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim"; + }; + telescope-cheat-nvim = buildVimPluginFrom2Nix { pname = "telescope-cheat.nvim"; version = "2021-12-05"; @@ -6604,6 +6652,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; + telescope-ultisnips-nvim = buildVimPluginFrom2Nix { + pname = "telescope-ultisnips.nvim"; + version = "2021-09-27"; + src = fetchFromGitHub { + owner = "fhill2"; + repo = "telescope-ultisnips.nvim"; + rev = "f48b6d4f53b31507d3fd514905c6940409e8ada8"; + sha256 = "h2PfstopgjCMFYVOnzEX7gkkIHCamcJPJux5B+qYYww="; + }; + meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim"; + }; + tender-vim = buildVimPluginFrom2Nix { pname = "tender.vim"; version = "2021-05-24"; @@ -11686,6 +11746,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + winshift-nvim = buildVimPluginFrom2Nix { + pname = "winshift.vim"; + version = "2021-11-15"; + src = fetchFromGitHub { + owner = "sindrets"; + repo = "winshift.vim"; + rev = "aaa04b97640165eb0877bfc04943f4282887470b"; + sha256 = "g5v/qd1FNg7mMZif7Liga3BAnZV7Mi7hkqnCUEFk52U="; + }; + meta.homepage = "https://github.com/sindrets/winshift.nvim"; + }; + wmgraphviz-vim = buildVimPluginFrom2Nix { pname = "wmgraphviz.vim"; version = "2018-04-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 547c59ee2cb..098530dcf31 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -169,6 +169,7 @@ FelikZ/ctrlp-py-matcher feline-nvim/feline.nvim fenetikm/falcon fhill2/floating.nvim +fhill2/telescope-ultisnips.nvim fiatjaf/neuron.vim filipdutescu/renamer.nvim fisadev/vim-isort @@ -223,6 +224,7 @@ guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp guns/xterm-color-table.vim +GustavoKatel/telescope-asynctasks.nvim gyim/vim-boxdraw haringsrob/nvim_context_vt hashivim/vim-packer @@ -654,6 +656,7 @@ pwntester/octo.nvim python-mode/python-mode qnighy/lalrpop.vim qpkorr/vim-bufkill +quangnguyen30192/cmp-nvim-ultisnips Quramy/tsuquyomi racer-rust/vim-racer radenling/vim-dispatch-neovim @@ -756,10 +759,13 @@ simnalamburt/vim-mundo simrat39/rust-tools.nvim simrat39/symbols-outline.nvim sindrets/diffview.nvim +sindrets/winshift.nvim SirVer/ultisnips sjl/gundo.vim sjl/splice.vim sk1418/last256 +skywind3000/asyncrun.vim +skywind3000/asynctasks.vim slashmili/alchemist.vim smiteshp/nvim-gps sodapopcan/vim-twiggy diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 3db0f9d9526..3e5bf42dd95 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1417,6 +1417,23 @@ let }; }; + ms-pyright.pyright = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pyright"; + publisher = "ms-pyright"; + version = "1.1.222"; + sha256 = "sha256-QMX/SawDEnG1xVrug8mvN7EvRrRDkJffcXBUFpQi1XE="; + }; + meta = with lib; { + description = "VS Code static type checking for Python"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright"; + homepage = "https://github.com/Microsoft/pyright#readme"; + changelog = "https://marketplace.visualstudio.com/items/ms-pyright.pyright/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + ms-python.python = callPackage ./python { extractNuGet = callPackage ./python/extract-nuget.nix { }; }; diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch new file mode 100644 index 00000000000..abbb3b8fb0e --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch @@ -0,0 +1,146 @@ +diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +index c23afce4..12ac12f4 100644 +--- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj ++++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +@@ -365,13 +365,6 @@ + /* End PBXBuildFile section */ + + /* Begin PBXContainerItemProxy section */ +- 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = 2FEA0CFF2490381A00EEF3AD; +- remoteInfo = "MoltenVKSPIRVToMSLConverter-tvOS"; +- }; + 2FEA0D1B249040CA00EEF3AD /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +@@ -400,20 +393,6 @@ + remoteGlobalIDString = A93903C71C57E9ED00FE90DC; + remoteInfo = "MVKSPIRVToMSLConverter-macOS"; + }; +- A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = A93903B81C57E9D700FE90DC; +- remoteInfo = "MVKSPIRVToMSLConverter-iOS"; +- }; +- A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = A9092A8C1A81717B00051823; +- remoteInfo = MoltenVKShaderConverter; +- }; + /* End PBXContainerItemProxy section */ + + /* Begin PBXFileReference section */ +@@ -1019,7 +998,6 @@ + buildRules = ( + ); + dependencies = ( +- 2F21D82F24983488009BEA5F /* PBXTargetDependency */, + ); + name = "MoltenVK-tvOS"; + productName = MoltenVK; +@@ -1039,7 +1017,6 @@ + buildRules = ( + ); + dependencies = ( +- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */, + ); + name = "MoltenVK-iOS"; + productName = MoltenVK; +@@ -1059,7 +1036,6 @@ + buildRules = ( + ); + dependencies = ( +- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */, + ); + name = "MoltenVK-macOS"; + productName = MoltenVK; +@@ -1476,24 +1452,6 @@ + }; + /* End PBXSourcesBuildPhase section */ + +-/* Begin PBXTargetDependency section */ +- 2F21D82F24983488009BEA5F /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = "MoltenVKSPIRVToMSLConverter-tvOS"; +- targetProxy = 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */; +- }; +- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = "MVKSPIRVToMSLConverter-iOS"; +- targetProxy = A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */; +- }; +- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = MoltenVKShaderConverter; +- targetProxy = A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */; +- }; +-/* End PBXTargetDependency section */ +- + /* Begin XCBuildConfiguration section */ + 2FEA0AB824902F9F00EEF3AD /* Debug */ = { + isa = XCBuildConfiguration; +@@ -1586,11 +1544,12 @@ + GCC_WARN_UNUSED_VARIABLE = YES; + GENERATE_MASTER_OBJECT_FILE = YES; + HEADER_SEARCH_PATHS = ( +- "\"$(SRCROOT)/include\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"", +- "\"$(SRCROOT)/../External/cereal/include\"", +- "\"${BUILT_PRODUCTS_DIR}\"", ++ "@@sourceRoot@@/outputs/include", ++ "@@sourceRoot@@/outputs/include/simd_workaround", ++ "@@sourceRoot@@/MoltenVKShaderConverter", ++ "@@cereal@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@vulkan-headers@@/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; +@@ -1600,6 +1559,10 @@ + MVK_SKIP_DYLIB = ""; + "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; + "MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; + PRODUCT_NAME = MoltenVK; + SKIP_INSTALL = YES; +@@ -1658,11 +1621,12 @@ + GCC_WARN_UNUSED_VARIABLE = YES; + GENERATE_MASTER_OBJECT_FILE = YES; + HEADER_SEARCH_PATHS = ( +- "\"$(SRCROOT)/include\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"", +- "\"$(SRCROOT)/../External/cereal/include\"", +- "\"${BUILT_PRODUCTS_DIR}\"", ++ "@@sourceRoot@@/outputs/include", ++ "@@sourceRoot@@/outputs/include/simd_workaround", ++ "@@sourceRoot@@/MoltenVKShaderConverter", ++ "@@cereal@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@vulkan-headers@@/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; +@@ -1672,6 +1636,10 @@ + MVK_SKIP_DYLIB = ""; + "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; + "MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; + PRODUCT_NAME = MoltenVK; + SKIP_INSTALL = YES; diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch new file mode 100644 index 00000000000..7a7ec7afa2e --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch @@ -0,0 +1,180 @@ +diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +index c7842b63..d55f73ed 100644 +--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj ++++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +@@ -3,7 +3,7 @@ + archiveVersion = 1; + classes = { + }; +- objectVersion = 52; ++ objectVersion = 48; + objects = { + + /* Begin PBXBuildFile section */ +@@ -33,9 +33,6 @@ + A920A8AC251B75B70076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; + A920A8AD251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; + A920A8AE251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; +- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; +- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; +- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; + A925B71B1C78DEB2006E7ECD /* libMoltenVKShaderConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; }; + A928C9191D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; }; + A928C91A1D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; }; +@@ -55,12 +52,6 @@ + A97CC7411C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A97CC73E1C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp */; }; + A98149681FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; }; + A98149691FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; }; +- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; +- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; +- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; + A9A14E332244388700C080F3 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A14E322244388700C080F3 /* Metal.framework */; }; + A9B51BDD225E98BB00AC74D2 /* MVKOSExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B51BDB225E98BB00AC74D2 /* MVKOSExtensions.mm */; }; + A9F042B21FB4D060009FCCB8 /* MVKCommonEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F042AA1FB4D060009FCCB8 /* MVKCommonEnvironment.h */; }; +@@ -115,9 +106,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -134,9 +122,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -144,9 +129,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -313,7 +295,7 @@ + A925B71D1C78DEBF006E7ECD /* PBXTargetDependency */, + ); + name = MoltenVKShaderConverter; +- productName = MetalGLShaderConverterTool; ++ productName = MoltenVKShaderConverter; + productReference = A964BD5F1C57EFBD00D930D8 /* MoltenVKShaderConverter */; + productType = "com.apple.product-type.tool"; + }; +@@ -349,7 +331,7 @@ + dependencies = ( + ); + name = "MoltenVKShaderConverter-macOS"; +- productName = "MetalGLShaderConverter-macOS"; ++ productName = MoltenVKShaderConverter; + productReference = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; + productType = "com.apple.product-type.library.static"; + }; +@@ -536,6 +518,17 @@ + OTHER_LDFLAGS = ( + "-ObjC", + "-w", ++ "-lMachineIndependent", ++ "-lGenericCodeGen", ++ "-lOGLCompiler", ++ "-lglslang", ++ "-lOSDependent", ++ "-lSPIRV", ++ "-lSPIRV-Tools", ++ "-lSPIRV-Tools-opt", ++ "-lspirv-cross-msl", ++ "-lspirv-cross-core", ++ "-lspirv-cross-glsl", + ); + SDKROOT = macosx; + }; +@@ -548,6 +541,17 @@ + OTHER_LDFLAGS = ( + "-ObjC", + "-w", ++ "-lMachineIndependent", ++ "-lGenericCodeGen", ++ "-lOGLCompiler", ++ "-lglslang", ++ "-lOSDependent", ++ "-lSPIRV", ++ "-lSPIRV-Tools", ++ "-lSPIRV-Tools-opt", ++ "-lspirv-cross-msl", ++ "-lspirv-cross-core", ++ "-lspirv-cross-glsl", + ); + SDKROOT = macosx; + }; +@@ -624,15 +628,24 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( +- "$(inherited)", +- "\"$(SRCROOT)\"", +- "\"$(SRCROOT)/SPIRV-Cross\"", +- "\"$(SRCROOT)/glslang\"", +- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"", ++ "@@sourceRoot@@/Common", ++ "@@glslang@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@spirv-tools@@/include", ++ "@@spirv-headers@@/include/spirv/unified1/", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ++ LIBRARY_SEARCH_PATHS = ( ++ "@@glslang@@/lib", ++ "@@spirv-cross@@/lib", ++ "@@spirv-tools@@/lib", ++ ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRODUCT_NAME = MoltenVKShaderConverter; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; +@@ -683,15 +696,24 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( +- "$(inherited)", +- "\"$(SRCROOT)\"", +- "\"$(SRCROOT)/SPIRV-Cross\"", +- "\"$(SRCROOT)/glslang\"", +- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"", ++ "@@sourceRoot@@/Common", ++ "@@glslang@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@spirv-tools@@/include", ++ "@@spirv-headers@@/include/spirv/unified1/", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ++ LIBRARY_SEARCH_PATHS = ( ++ "@@glslang@@/lib", ++ "@@spirv-cross@@/lib", ++ "@@spirv-tools@@/lib", ++ ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRODUCT_NAME = MoltenVKShaderConverter; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; diff --git a/pkgs/os-specific/darwin/moltenvk/createDylib.patch b/pkgs/os-specific/darwin/moltenvk/createDylib.patch new file mode 100644 index 00000000000..b4a990cd989 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/createDylib.patch @@ -0,0 +1,13 @@ +diff --git a/Scripts/create_dylib.sh b/Scripts/create_dylib.sh +index 5ba75f67..a0405067 100755 +--- a/Scripts/create_dylib.sh ++++ b/Scripts/create_dylib.sh +@@ -57,6 +57,8 @@ ${MVK_SAN} \ + -framework Metal ${MVK_IOSURFACE_FWK} -framework ${MVK_UX_FWK} -framework QuartzCore -framework CoreGraphics ${MVK_IOKIT_FWK} -framework Foundation \ + --library-directory ${MVK_USR_LIB_DIR} \ + -o "${MVK_BUILT_PROD_DIR}/dynamic/${MVK_DYLIB_NAME}" \ ++-L@@sourceRoot@@/outputs/lib -L@@glslang@@/lib -L@@spirv-tools@@/lib -L@@spirv-cross@@/lib \ ++-lobjc -lMoltenVKShaderConverter -lGenericCodeGen -lMachineIndependent -lOGLCompiler -lOSDependent -lSPIRV -lSPIRV-Tools -lSPIRV-Tools-opt -lspirv-cross-core -lspirv-cross-glsl -lspirv-cross-msl -lspirv-cross-reflect \ + -force_load "${MVK_BUILT_PROD_DIR}/lib${PRODUCT_NAME}.a" + + if test "$CONFIGURATION" = Debug; then diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix new file mode 100644 index 00000000000..243bc657c9b --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -0,0 +1,200 @@ +{ lib +, stdenv +, stdenvNoCC +, fetchurl +, fetchFromGitHub +, cctools +, sigtool +, cereal +, glslang +, spirv-cross +, spirv-headers +, spirv-tools +, vulkan-headers +, AppKit +, Foundation +, Metal +, QuartzCore +}: + +# Even though the derivation is currently impure, it is written to build successfully using +# `xcbuild`. Once the SDK on x86_64-darwin is updated, it should be possible to switch from being +# an impure derivation. +# +# The `sandboxProfile` was copied from the iTerm2 derivation. In order to build you at least need +# the `sandbox` option set to `relaxed` or `false`. Xcode should be available in the default +# location. +let + libcxx.dev = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr"; +in +stdenvNoCC.mkDerivation rec { + pname = "MoltenVK"; + version = "1.1.7"; + + buildInputs = [ + AppKit + Foundation + Metal + QuartzCore + ]; + + outputs = [ "out" "bin" ]; + + # MoltenVK requires specific versions of its dependencies. + # Pin them here except for cereal, which is four years old and has several CVEs. + passthru = { + glslang = (glslang.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "2742e959347ae2fac58acd0d022c92a0ff1f24bf"; + hash = "sha256-Q0sk4bPj/skPat1n4GJyuXAlZqpfEn4Td8Bm2IBNUqE="; + }; + })).override { + inherit (passthru) spirv-headers spirv-tools; + }; + spirv-cross = spirv-cross.overrideAttrs (old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DSPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross" + ]; + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Cross"; + rev = "131278458ea8eebe6a6e9c476fbcf71278726e1a"; + hash = "sha256-LrRYDFGv3Zxfy4qRNLwM2OOa8jbcq0ttPxDamCH21xU="; + }; + }); + spirv-headers = spirv-headers.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "spirv-headers"; + rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"; + hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0"; + }; + }); + spirv-tools = (spirv-tools.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "spirv-tools"; + rev = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"; + hash = "sha256-DSqZlwfNTbN4fyIrVBKltm5U2U4GthW3L+Ksw4lSVG8="; + }; + meta = old.meta // { + platforms = old.meta.platforms ++ lib.platforms.darwin; + }; + })).override { + inherit (passthru) spirv-headers; + }; + vulkan-headers = vulkan-headers.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Headers"; + rev = "1dace16d8044758d32736eb59802d171970e9448"; + hash = "sha256-C6YgxWcinI3QumcWmoJaiTAf0u6jSDc8sCIarn2t04k"; + }; + meta = old.meta // { + platforms = old.meta.platforms ++ lib.platforms.darwin; + }; + }); + }; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "MoltenVK"; + rev = "v${version}"; + hash = "sha256-I9QcjyE09qclWPCLAVfKEaifP89q1ftLh9cXWy9m7kw="; + }; + + patches = [ + # Specify the libraries to link directly since XCFrameworks are not being used. + ./createDylib.patch + # Move `mvkGitRevDerived.h` to a stable location + ./gitRevHeaderStability.patch + # Fix the Xcode projects to play nicely with `xcbuild`. + ./MoltenVKShaderConverter.xcodeproj.patch + ./MoltenVK.xcodeproj.patch + ]; + + postPatch = '' + substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@libcxx@@ "${libcxx.dev}" \ + --replace @@glslang@@ "${passthru.glslang}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" \ + --replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \ + --replace @@spirv-headers@@ "${passthru.glslang.spirv-headers}" + substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@libcxx@@ "${libcxx.dev}" \ + --replace @@cereal@@ "${cereal}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" \ + --replace @@vulkan-headers@@ "${passthru.vulkan-headers}" + substituteInPlace Scripts/create_dylib.sh \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@glslang@@ "${passthru.glslang}" \ + --replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" + substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ + --replace @@sourceRoot@@ $(pwd) \ + --replace '$(git rev-parse HEAD)' ${src.rev} + ''; + + dontConfigure = true; + + buildPhase = '' + # Build each project on its own because `xcbuild` fails to build `MoltenVKPackaging.xcodeproj`. + derived_data_path=$(pwd)/DerivedData + pushd MoltenVKShaderConverter + /usr/bin/xcodebuild build \ + -jobs $NIX_BUILD_CORES \ + -derivedDataPath "$derived_data_path" \ + -configuration Release \ + -project MoltenVKShaderConverter.xcodeproj \ + -scheme MoltenVKShaderConverter \ + -arch ${stdenv.targetPlatform.darwinArch} + popd + mkdir -p outputs/bin outputs/lib + declare -A outputs=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib ) + for output in "''${!outputs[@]}"; do + cp DerivedData/Build/Products/Release/$output "outputs/''${outputs[$output]}/$output" + done + + pushd MoltenVK + /usr/bin/xcodebuild build \ + -jobs $NIX_BUILD_CORES \ + -derivedDataPath "$derived_data_path" \ + -configuration Release \ + -project MoltenVK.xcodeproj \ + -scheme MoltenVK-macOS \ + -arch ${stdenv.targetPlatform.darwinArch} + popd + cp DerivedData/Build/Products/Release/dynamic/libMoltenVK.dylib outputs/lib/libMoltenVK.dylib + ''; + + installPhase = '' + mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" + cp outputs/bin/MoltenVKShaderConverter "$bin/bin/" + cp outputs/lib/libMoltenVK.dylib "$out/lib/" + ${cctools}/bin/install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib" + # FIXME: https://github.com/NixOS/nixpkgs/issues/148189 + /usr/bin/codesign -s - -f "$out/lib/libMoltenVK.dylib" + install -m644 MoltenVK/icd/MoltenVK_icd.json "$out/share/vulkan/icd.d/MoltenVK_icd.json" + substituteInPlace $out/share/vulkan/icd.d/MoltenVK_icd.json \ + --replace ./libMoltenVK.dylib "$out/share/vulkan/icd.d/MoltenVK_icd.json" + ''; + + sandboxProfile = '' + (allow file-read* file-write* process-exec mach-lookup) + ; block homebrew dependencies + (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) + ''; + + meta = { + description = "A Vulkan Portability implementation built on top of Apple’s Metal API"; + homepage = "https://github.com/KhronosGroup/MoltenVK"; + changelog = "https://github.com/KhronosGroup/MoltenVK/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.asl20; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch b/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch new file mode 100644 index 00000000000..e28b9ee70b6 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch @@ -0,0 +1,14 @@ +diff --git a/Scripts/gen_moltenvk_rev_hdr.sh b/Scripts/gen_moltenvk_rev_hdr.sh +index c49ea4e6..9b7d13d1 100755 +--- a/Scripts/gen_moltenvk_rev_hdr.sh ++++ b/Scripts/gen_moltenvk_rev_hdr.sh +@@ -2,7 +2,7 @@ + + # Record the MoltenVK GIT revision as a derived header file suitable for including in a build + MVK_GIT_REV=$(git rev-parse HEAD) +-MVK_HDR_FILE="${BUILT_PRODUCTS_DIR}/mvkGitRevDerived.h" ++MVK_HDR_FILE="@@sourceRoot@@/outputs/include/mvkGitRevDerived.h" ++mkdir -p $(dirname ${MVK_HDR_FILE}) + echo "// Auto-generated by MoltenVK" > "${MVK_HDR_FILE}" + echo "static const char* mvkRevString = \"${MVK_GIT_REV}\";" >> "${MVK_HDR_FILE}" +- diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix new file mode 100644 index 00000000000..be44db38fe1 --- /dev/null +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, SkyLight }: + +let + inherit (stdenv.hostPlatform) system; + target = { + "aarch64-darwin" = "arm"; + "x86_64-darwin" = "x86"; + }.${system} or (throw "Unsupported system: ${system}"); +in + +stdenv.mkDerivation rec { + pname = "sketchybar"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "FelixKratz"; + repo = "SketchyBar"; + rev = "v${version}"; + sha256 = "1370xjl8sas5nghxgjxmc1zgskf28g40pv7nxgh37scjwdrkrrvb"; + }; + + buildInputs = [ Carbon Cocoa SkyLight ]; + + postPatch = '' + sed -i -e '/^#include <malloc\/_malloc.h>/d' src/*.[ch] src/*/*.[ch] + ''; + + makeFlags = [ + target + ]; + + installPhase = '' + mkdir -p $out/bin + cp ./bin/sketchybar_${target} $out/bin/sketchybar + ''; + + meta = with lib; { + description = "A highly customizable macOS status bar replacement"; + homepage = "https://github.com/FelixKratz/SketchyBar"; + platforms = platforms.darwin; + maintainers = [ maintainers.azuwis ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 8e95c44f95c..5c1cf272e0e 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -304,10 +304,10 @@ let meta = apparmor-meta "kernel patches"; }; - # Generate generic AppArmor rules in a file, - # from the closure of given rootPaths. - # To be included in an AppArmor profile like so: - # include "$(apparmorRulesFromClosure {} [pkgs.hello]}" + # Generate generic AppArmor rules in a file, from the closure of given + # rootPaths. To be included in an AppArmor profile like so: + # + # include "${apparmorRulesFromClosure { } [ pkgs.hello ]}" apparmorRulesFromClosure = { # The store path of the derivation is given in $path additionalRules ? [] diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index caeaed455f7..d6e4b059088 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -7,7 +7,7 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.23.0"; + version = "0.24.0"; disabled = !stdenv.isLinux; @@ -15,7 +15,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256-iLVUwJTDQ8Bn38sgHOcIR8TYxIB+gIlfTgr9+gPU0gE="; + sha256 = "sha256-5Nq6LmphiyiiIyru/P2rCCmA25cwJIWn08oK1+eM3cQ="; }; format = "other"; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 64934724c25..636803f2909 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.15.19"; + version = "5.15.24"; release = "1"; suffix = "xanmod${release}-tt"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-4DChsTFWm/9X0iV9yhWZqOz7dxfNbok7cFLKAYKs+Dw="; + sha256 = "sha256-O3OadPMBl74IK92w7IPGfiePeo/Ox+bIVr4XmOmPYTg="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 81e86fe77ef..8e6b9fa0663 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -12,20 +12,15 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-/MLPflnfooe7Wjy8M3CTowAi5oYpscruSkDsaVzhmYQ="; + sha256 = "sha256-NFVJ8JquWVzu+QoaaOMzhnu6/IqdP1FPhtJFidXA4L4="; }; - patches = [(fetchpatch { - url = "https://github.com/libbpf/libbpf/pull/41.diff"; - sha256 = "sha256-pg5WARqh6z0nkTHMBhftxwdV2SyswC2lfaCXCpez0VA="; - })]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; @@ -38,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' # install linux's libbpf-compatible linux/btf.h - install -Dm444 include/uapi/linux/btf.h -t $out/include/linux + install -Dm444 include/uapi/linux/*.h -t $out/include/linux ''; # FIXME: Multi-output requires some fixes to the way the pkg-config file is diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 3f58b0a536b..14526501785 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "510.47.03"; - sha256_64bit = "8qQh2ug2MY08DZZFnMs68n6Q5QyVsPqkKIr3Ynnl1pA="; - settingsSha256 = "lQRh8dG4NW2vLe4R6xx42BzAu3R6iLyrk3GOGKLfufQ="; - persistencedSha256 = "I8pIdBhbX9rfyhjQHGD5zjCwLF2zl2jc1Id+CTbSHKc="; + version = "510.54"; + sha256_64bit = "TCDezK4/40et/Q5piaMG+QJP2t+DGtwejmCFVnUzUWE="; + settingsSha256 = "ZWz5UN6Pa69NlmerKu30G+X8WfGlAwnVerDrO7TRO6w="; + persistencedSha256 = "MgWrBjKXJeRqF+ouT72tTiLPtn+lsS/Cp3oS61AWV8Q="; } else legacy_390; diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix b/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix new file mode 100644 index 00000000000..d04c8ddb939 --- /dev/null +++ b/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenvNoCC }: + +stdenvNoCC.mkDerivation rec { + name = "usb-blaster-udev-rules"; + + udevRules = ./usb-blaster.rules; + dontUnpack = true; + + installPhase = '' + install -Dm 644 "${udevRules}" "$out/lib/udev/rules.d/51-usbblaster.rules" + ''; + + meta = with lib; { + description = "udev rules that give NixOS permission to communicate with usb blasters"; + longDescription = '' + udev rules that give NixOS permission to communicate with usb blasters. + To use it under NixOS, add + + services.udev.packages = [ pkgs.usb-blaster-udev-rules ]; + + to the system configuration. + ''; + license = licenses.free; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules b/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules new file mode 100644 index 00000000000..0add604ee81 --- /dev/null +++ b/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules @@ -0,0 +1,8 @@ +# USB-Blaster +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", TAG+="uaccess" +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6002", TAG+="uaccess" +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6003", TAG+="uaccess" + +# USB-Blaster II +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6010", TAG+="uaccess" +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6810", TAG+="uaccess" diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix index 80b5fbda817..b6ccbd1de70 100644 --- a/pkgs/servers/gemini/gmid/default.nix +++ b/pkgs/servers/gemini/gmid/default.nix @@ -1,25 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, libressl, libevent }: +{ lib, stdenv, fetchFromGitHub, bison, which, libressl, libevent }: stdenv.mkDerivation rec { pname = "gmid"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-CwJPaZefRDyn2fliOd9FnOLXq70HFu2RsUZhzWQdE3E"; + hash = "sha256-XNif164C5b5sVsZW7sy0id4qM/mJzg3RhoHbwJuJqDk="; }; - nativeBuildInputs = [ bison ]; + nativeBuildInputs = [ bison which ]; buildInputs = [ libressl libevent ]; - configurePhase = '' - runHook preConfigure - ./configure PREFIX=$out - runHook postConfigure - ''; + configureFlags = [ + "PREFIX=${placeholder "out"}" + ]; meta = with lib; { description = "Simple and secure Gemini server"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5f607c63f1b..9da182daf3b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.2.6"; + version = "2022.2.8"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -613,7 +613,7 @@ "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ pi1wire pyownet ]; "onkyo" = ps: with ps; [ onkyo-eiscp ]; - "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async + "onvif" = ps: with ps; [ wsdiscovery ha-ffmpeg onvif-zeep-async ]; "open_meteo" = ps: with ps; [ open-meteo ]; "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; @@ -636,7 +636,7 @@ "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; - "overkiz" = ps: with ps; [ ]; # missing inputs: pyoverkiz + "overkiz" = ps: with ps; [ pyoverkiz ]; "ovo_energy" = ps: with ps; [ ovoenergy ]; "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; @@ -1388,6 +1388,7 @@ "oncue" "ondilo_ico" "onewire" + "onvif" "open_meteo" "openalpr_cloud" "openalpr_local" @@ -1398,6 +1399,7 @@ "openuv" "openweathermap" "opnsense" + "overkiz" "ovo_energy" "owntracks" "ozw" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b000431fd1c..7116aedcdf4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -138,7 +138,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.2.6"; + hassVersion = "2022.2.8"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -156,7 +156,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-UUiYp1YP+ak/2MncnGB0kE9+l2zQAyGjfD5srb5ArSI="; + hash = "sha256-BzBlAKI1u8DqsfmivCVaK3fhYzgEmqlVkRMI17VRu0w="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index a56ef8c835e..92f6d1f15ac 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8="; + sha256 = "lBAnMrU292URrZIxPvPIAO50GAFvvZHfUjKMYxZwGb8="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-bvbZ7Tnd6s6zr9trN4egR/9KV5cU09mQI+U1UxyYzlE="; + vendorSha256 = "KiNABUZ92gYprTdNAKKMjygr0BzQGVYVPRPMxvYi1VQ="; doCheck = false; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 990ef950e6b..814626fec12 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.41.5"; + version = "0.42.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "sha256-DH1xy1cTVDNNXyOIaayGHzOi4g0ZukNFFbZjufY+XLk="; + hash = "sha256-PmcVVAS/5mDhmOSoFvkZeYkbvFD/KOcgVYuScwD4Olg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -14,13 +14,15 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' + runHook preInstall makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src" + runHook postInstall ''; meta = with lib; { description = "The easy, open source way for everyone in your company to ask questions and learn from data"; homepage = "https://metabase.com"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ schneefux thoughtpolice mmahut ]; }; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ca59c494399..fdb6ea0efa9 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.3.6"; + version = "8.4.1"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-XYgSXgZJKsVYMtlvMq84OuQBbrbFJUh6m/lKCbOlzus="; + sha256 = "sha256-RVEgqFEwvXTHE8Kvc1q+0o+V3mEHtURQR/7x3Qcmtpg="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-8gR95+xCJD3e25WxbmtXBMsS7HdbB+vwrcZ9sApSxFk="; + sha256 = "sha256-RTupkQ9LlppJeyfmgGMztMW2m+sJXkJuDAdtpcyRGe0="; }; - vendorSha256 = "sha256:0bj9a45jciaayqlrakdndzjdw4x600xw48wwy1id4n50h2mkrbp8"; + vendorSha256 = "sha256-RugV5cHlpR739CA1C/7FkXasvkv18m7pPsK6mxfSkC0="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 226294e5f42..695480a05c9 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -1,21 +1,23 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -with lib; - -buildGoPackage rec { +buildGoModule rec { pname = "nats-server"; - version = "2.7.0"; - - goPackagePath = "github.com/nats-io/${pname}"; + version = "2.7.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao="; + sha256 = "0w4hjz1x6zwcxhnd1y3874agyn8nsdra4fky6kc2rrfikjcw003y"; }; - meta = { + vendorSha256 = "1gvvjwx1g8mhcqi3ssb3k5ylkz0afpmnf6h2zfny9rc4dk2cp2dy"; + + doCheck = false; + + passthru.tests.nats = nixosTests.nats; + + meta = with lib; { description = "High-Performance server for NATS"; license = licenses.asl20; maintainers = with maintainers; [ swdunlop derekcollison ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a530a58e900..735bfdeafb1 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,18 +46,18 @@ in { ''; nextcloud21 = generic { - version = "21.0.8"; - sha256 = "00c37wp6fsnpm40bbhk6r6xycacfa5zk7arzc3i4xmhm89cyvm6z"; + version = "21.0.9"; + sha256 = "sha256-p6bvgTXmmjGN3TRQpG88f3YPksh0QzWG9j9KnEjcrqE="; }; nextcloud22 = generic { - version = "22.2.4"; - sha256 = "0vnf2j1hz0d7lxby73r2mq2rjm72nq55xajzm8sipj6wlbys15zl"; + version = "22.2.5"; + sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8="; }; nextcloud23 = generic { - version = "23.0.1"; - sha256 = "047pnkp49rf0a9gl03dwkkdgzmdsf88m79mzq04bwmgkb3a3qxay"; + version = "23.0.2"; + sha256 = "sha256-ngJGLTjqq2RX/KgHe9Rv54w6qtRC6RpuEuMvp9UbxO4="; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/nosql/eventstore/create-deps.sh b/pkgs/servers/nosql/eventstore/create-deps.sh index 8001fea4d26..afeee592de3 100755 --- a/pkgs/servers/nosql/eventstore/create-deps.sh +++ b/pkgs/servers/nosql/eventstore/create-deps.sh @@ -8,7 +8,7 @@ set -euo pipefail # this script is inspired: # - pkgs/servers/nosql/eventstore/create-deps.sh # - pkgs/development/dotnet-modules/python-language-server/create_deps.sh -# - pkgs/misc/emulators/ryujinx/updater.sh +# - pkgs/applications/emulators/ryujinx/updater.sh cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index 1e63b44450e..a99349d8c0d 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-BLtoT6UHsur+jFp4KBlE10/Z/V6RDy0k16H10IC98WQ="; - arm64-linux_hash = "sha256-s8EV/VqiUXWRTNxacx4sy6r+TIAqkqhESAYYa9s0uAQ="; - x64-osx_hash = "sha256-woXFYmX+499NTtWmmGBpZ12PxTUazJ8klA6IPQIDjLE="; + x64-linux_hash = "sha256-O/dfLZst7RFnqDZj8UX6ejL2EBjGnCBY3e8JB3peRgY="; + arm64-linux_hash = "sha256-DkCOK1A7L1gMqY/XPIJFFz7qvUvxA6aJa24Hrh3dT/U="; + x64-osx_hash = "sha256-4N0/FTVhxUooauhh+7u527aViSBILiCb+a4cI17QTAg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.3.3"; + version = "4.10.2"; sourceRoot = "."; diff --git a/pkgs/servers/ombi/update.sh b/pkgs/servers/ombi/update.sh index a549a9f1731..9b49180b6f1 100755 --- a/pkgs/servers/ombi/update.sh +++ b/pkgs/servers/ombi/update.sh @@ -15,7 +15,7 @@ updateHash() url="https://github.com/Ombi-app/Ombi/releases/download/v$version/$os-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" + sriHash="$(nix hash to-sri --type sha256 $hash)" sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" } @@ -25,7 +25,7 @@ updateVersion() sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" } -currentVersion=$(cd $dirname && nix eval --raw '(with import ../../.. {}; ombi.version)') +currentVersion=$(cd $dirname && nix eval --raw -f ../../.. ombi.version) latestTag=$(curl https://api.github.com/repos/Ombi-App/Ombi/releases/latest | jq -r ".tag_name") latestVersion="$(expr $latestTag : 'v\(.*\)')" diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fb07bc39154..dfaf64380a9 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -5,16 +5,17 @@ , curl, libiconv, ncurses, openssl, pcre, pcre2 , libkrb5, libaio, liburing, systemd , CoreServices, cctools, perl -, jemalloc, less +, jemalloc, less, libedit # Server components , bzip2, lz4, lzo, snappy, xz, zlib, zstd , cracklib, judy, libevent, libxml2 , linux-pam, numactl, pmdk +, fmt_8 , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: -let # in mariadb # spans the whole file +let libExt = stdenv.hostPlatform.extensions.sharedLibrary; @@ -42,7 +43,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds ] ++ (packageSettings.extraBuildInputs or []) ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ] ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ] ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]); @@ -173,7 +174,8 @@ in stdenv.mkDerivation (common // { ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv - ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]; + ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] + ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; patches = common.patches; @@ -235,17 +237,27 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.22"; - sha256 = "000ca1hdnj2jg051cjgdd2ralgwgh2p8nwb1x6b85202xdpc7ga4"; + version = "10.4.24"; + sha256 = "0ipqilri8isn0mfvwg8imwf36zm3jsw0wf2yx905c2bznd8mb5zy"; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.13"; - sha256 = "0n0w1pyypv6wsknaqyykj3lc9zv6smji4q5jcf90w4rid330iw0n"; + version = "10.5.15"; + sha256 = "0nfvyxb157qsbl0d1i5gfzr2hb1nm0iv58f7qcbk5kkhz0vyv049"; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.5"; - sha256 = "13qaqb2h6kysfdi3h1l9zbb2qlpjgxb1n8mxnj5jm96r50209gp0"; + version = "10.6.7"; + sha256 = "1idjnkjfkjvyr6r899xbiwq9wwbs84cm85mbc725yxjshqghzvkm"; + }; + mariadb_107 = mariadbPackage { + # Supported until 2023-02 + version = "10.7.3"; + sha256 = "1m2wa67vvdm61ap8spl18b9vqkmsnq4rfd0248l17jf9zwcnja6s"; + }; + mariadb_108 = mariadbPackage { + # Supported until 2023-05 + version = "10.8.2"; + sha256 = "0v4mms3mihylnqlc0ifvwzykah6lkdd39lmxbv5vnhbsh7wggq0l"; }; } diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 5a79dcd7d2c..d124664dd7b 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.10"; + version = "26.4.11"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "sha256-v3fKadoHCAKHZGPjuh/uLnmAaaPESrax73GEI/mH39g="; + sha256 = "sha256-zAS/YCUNSgkjehUXJpa+FyPC6zHnx3Nmlx0m7hbuZo0="; fetchSubmodules = true; }; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index dbb800a2760..d0dfa5d00f5 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.2.0"; + version = "3.2.1"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-ernhVMaUfAz/uPoS1wgGrdmqBg5itshqLiBvnUtQfP0="; + sha256 = "sha256-+6to3ebKOTSyS6CMirDP8llPV/k96rQaFcgq4btpiT4="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch new file mode 100644 index 00000000000..c8840db42e7 --- /dev/null +++ b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch @@ -0,0 +1,10 @@ +--- a/plugins/GeoIp2/config/config.php ++++ b/plugins/GeoIp2/config/config.php +@@ -1,5 +1,5 @@ + <?php + + return [ +- 'path.geoip2' => DI\string('{path.root}/misc/'), ++ 'path.geoip2' => PIWIK_USER_PATH . '/misc/', + ]; +\ Pas de fin de ligne à la fin du fichier diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index ad8dc85f70f..aa371223cf0 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -32,14 +32,19 @@ let nativeBuildInputs = [ makeWrapper ]; - # make-localhost-default-database-server.patch: - # This changes the default value of the database server field - # from 127.0.0.1 to localhost. - # unix socket authentication only works with localhost, - # but password-based SQL authentication works with both. - # TODO: is upstream interested in this? - # -> discussion at https://github.com/matomo-org/matomo/issues/12646 - patches = [ ./make-localhost-default-database-host.patch ]; + patches = [ + # This changes the default value of the database server field + # from 127.0.0.1 to localhost. + # unix socket authentication only works with localhost, + # but password-based SQL authentication works with both. + # TODO: is upstream interested in this? + # -> discussion at https://github.com/matomo-org/matomo/issues/12646 + ./make-localhost-default-database-host.patch + + # This changes the default config for path.geoip2 so that it doesn't point + # to the nix store. + ./change-path-geoip2.patch + ]; # this bootstrap.php adds support for getting PIWIK_USER_PATH # from an environment variable. Point it to a mutable location @@ -73,6 +78,7 @@ let "misc/composer/build-xhprof.sh" "misc/composer/clean-xhprof.sh" "misc/cron/archive.sh" + "plugins/GeoIp2/config/config.php" "plugins/Installation/FormDatabaseSetup.php" "vendor/pear/archive_tar/sync-php4" "vendor/szymach/c-pchart/coverage.sh" diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 330722898ce..656b9ee6006 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -43,11 +43,11 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-v0Abn0oYcl1I4H9GLN1pV9hk9tTE+Wlv2gPTtEE6t6k="; + hash = "sha256-CIHVpxZ2qC7Ct5Kmc6dxEzxH9s+63/sI07f9SbCh4a4="; }; patches = [ diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 73af7f93545..5b929a0b79c 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.107"; + version = "3.0.108"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-B9tqebSaOoHIOc/eZa1eh+B0T7LJOtVwYy7QwNt9k90="; + sha256 = "sha256-hbT7pG4IRIzFzbaUVnCpSb5h13h2158cbGf2qn8c268="; }; vendorSha256 = "sha256-c7LsCNcxdHwDBEknXJt9AyrmFcem8YtUYy06vNDBdDY="; diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 40c2f05a9bd..a218f25f04e 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.7"; + version = "0.10.8"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-oqG9E1sSmpV2S7ywLCBRFs9d3Tbv5uxrbRh5DwpktkA="; + sha256 = "sha256-vqzHZ7DW4ev5soFMcafgL/81k6vCsm6Ds5yto/VheX8="; }; - vendorSha256 = "sha256-+2KgRGQIkTHbVzFIv0FVLWuDegk7pZ/H+u07A1PjM/4="; + vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/admin/synapse-admin/default.nix b/pkgs/tools/admin/synapse-admin/default.nix index 4248e62adeb..52b2183222e 100644 --- a/pkgs/tools/admin/synapse-admin/default.nix +++ b/pkgs/tools/admin/synapse-admin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "synapse-admin"; - version = "0.8.3"; + version = "0.8.4"; src = fetchzip { url = "https://github.com/Awesome-Technologies/synapse-admin/releases/download/${version}/synapse-admin-${version}.tar.gz"; - hash = "sha256-LAdMxzUffnykiDHvQYu9uNxK4428Q9CxQY2q02AcUco="; + hash = "sha256-hRjguUQUK7tB4VWVKRid4sRTIF/ulm9RmNA6RNUfaak="; }; installPhase = '' diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix new file mode 100644 index 00000000000..9b8fc94d2ed --- /dev/null +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "mpd-discord-rpc"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "JakeStanger"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FkdndkXj48JLKRwZ9lLVQrGU7QvBZvYC9Y2iYS0RiCY="; + }; + + cargoSha256 = "sha256-w6Usc86yn7mq/wxljSpko/JPnLHmkyeILKa31YsQrFg="; + + meta = with lib; { + description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; + homepage = "https://github.com/JakeStanger/mpd-discord-rpc"; + license = licenses.mit; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 1b151ece3d9..e55823e59ae 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs }: +{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs, bash }: let zshCompletion = fetchurl { @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "tarsnap"; - version = "1.0.39"; + version = "1.0.40"; src = fetchurl { url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; - sha256 = "10i0whbmb345l2ggnf4vs66qjcyf6hmlr8f4nqqcfq0h5a5j24sn"; + sha256 = "1mbzq81l4my5wdhyxyma04sblr43m8p7ryycbpi6n78w1hwfbjmw"; }; preConfigure = '' @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile.in \ --replace "command -p mv" "mv" + substituteInPlace configure \ + --replace "command -p getconf PATH" "echo $PATH" ''; postInstall = '' diff --git a/pkgs/tools/misc/clickclack/default.nix b/pkgs/tools/misc/clickclack/default.nix index 0bcea9a2e8e..c7e1cbee79a 100644 --- a/pkgs/tools/misc/clickclack/default.nix +++ b/pkgs/tools/misc/clickclack/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clickclack"; - version = "0.2"; + version = "0.2.2"; src = fetchFromSourcehut { owner = "~proycon"; repo = "clickclack"; rev = version; - sha256 = "sha256-hldtHSRdw6yP9lUFna5yvJ3mOTbQbbQNnGM7fMQmmtM="; + hash = "sha256-ABVfJRSzbQ6jIpON2g2wS52QsyNQVfW6+AhTvjkkf6s="; }; buildInputs = [ diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index f36e5217aea..dfb61ca29ad 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20220116.0"; + version = "20220209.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eItt7AP96juIaP57yGzW/Fb8NAGsns/4nGWQIMv7Xn8="; + sha256 = "sha256-FkFu3SvsowcsOFXvqWmpY3KEypXSb6KcpC/nJbQpDBA="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index f790527c925..444e0e122ef 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,21 +16,16 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.1.4"; + version = "2022.2.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Pv4Rh92d+Jb3ZKPgKVyrgVHr6PGTcIYybdFavbnjuPA="; + sha256 = "sha256-Pt57wI1cYTqT65zGOk1/GyvK0BqITxCzWIyXSNZ9D/0="; }; - patches = [ - # fix missing write permissions on src files before modifing them - ./fix-src-permissions.patch - ]; - postPatch = '' # remove all version pinning (E.g tornado==5.1.1 -> tornado) sed -i -e "s/==[0-9.]*//" requirements.txt diff --git a/pkgs/tools/misc/esphome/fix-src-permissions.patch b/pkgs/tools/misc/esphome/fix-src-permissions.patch deleted file mode 100644 index 5e92350105d..00000000000 --- a/pkgs/tools/misc/esphome/fix-src-permissions.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f72c5035944065941daaa236b60664657c777726 Mon Sep 17 00:00:00 2001 -From: Martin Weinelt <hexa@darmstadt.ccc.de> -Date: Wed, 23 Jun 2021 04:50:35 +0200 -Subject: [PATCH] Set u+w for copied src files before trying to overwrite them -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We store esphome in the nix store, which results in its file permissions -being 0444. Esphome, when compiling a firmware image, will copy these -files from the nix store to a working directory. When updating between -versions it will notice these files changed and try to copy the new -version over, which would break, because the user had no write -permissions on the files. - -❯ esphome compile 01e4ac.yml -INFO Reading configuration 01e4ac.yml... -INFO Detected timezone 'CET' with UTC offset 1 and daylight saving time from 27 March 02:00:00 to 30 October 03:00:00 -INFO Generating C++ source... -ERROR Error copying file /nix/store/lmzrgl1arqfd98jcss4rsmmy6dbffddn-esphome-1.19.2/lib/python3.8/site-packages/esphome/components/api/api_connection.cpp to 01e4ac/src/esphome/components/api/api_connection.cpp: [Errno 13] Permission denied: '01e4ac/src/esphome/components/api/api_connection.cpp' - -To fix this we modify chmod to 0644 just before esphome tries a copy -operation, which will fix permissions on existing working directories -just in time. ---- - esphome/helpers.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/esphome/helpers.py b/esphome/helpers.py -index ad7b8272..c456f4ff 100644 ---- a/esphome/helpers.py -+++ b/esphome/helpers.py -@@ -228,6 +228,10 @@ def copy_file_if_changed(src: os.PathLike, dst: os.PathLike) -> None: - if file_compare(src, dst): - return - mkdir_p(os.path.dirname(dst)) -+ try: -+ os.chmod(dst, 0o644) -+ except OSError: -+ pass - try: - shutil.copy(src, dst) - except OSError as err: --- -2.31.1 - diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix index 8ead57a07eb..6db1675fe02 100644 --- a/pkgs/tools/misc/rates/default.nix +++ b/pkgs/tools/misc/rates/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rates"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "lunush"; repo = pname; rev = version; - sha256 = "077qxs4kwfprsai07dninkhmj3ihnghdxan98iv8gmsl3pijbgwh"; + sha256 = "sha256-ivJ6rD4+EYeMg6nOWzf3lp521+7NTBq5vCn7648q0T8="; }; - cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w"; + cargoSha256 = "sha256-dsWAxYFB096SZN5tfzEMokdQ8qw1aR/6Hmjtkdw1L8E="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 0f3dd4e24f6..412995b710f 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -10,15 +10,15 @@ let in buildGoModule rec { pname = "datadog-agent"; - version = "7.33.0"; + version = "7.33.1"; src = fetchFromGitHub { inherit owner repo; rev = version; - sha256 = "sha256-8QwXJrhuONdmM0oneGip4BhYkfuaNoYQn+MjlIpCk98="; + sha256 = "sha256-H8apgLdm90/gVsqcCSc3gymgUUP2AWcNPgV9394UUeQ="; }; - vendorSha256 = "sha256-3caBX+Z1SbX0u5yfh/218HH2jEvKV1IM6fd3HkYHTGk="; + vendorSha256 = "sha256-qIm9ZIQTNmKUtTMBsGzH0t4MrIAvksea9t7p5cC6ykk="; subPackages = [ "cmd/agent" diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 70f1da0dc23..108cd769a73 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-oXynemPs41C4m0GAT1m5Jz5lqMNQWn4j7VcMwH6rg4E="; + sha256 = "sha256-dxOR+rgTaSgauVBz5PgSn8MPmsdQTEGH7h5bXFIT7wM="; }; - cargoSha256 = "sha256-Akn2G13OuHLURYJYqypZvIfwcO3Dv/tm6XyxGMAFr1w="; + cargoSha256 = "sha256-w8+wn8jnsEZAkMEZRWMaytskhG+noMPjk4+U+SdghMQ="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index 163341d0646..84327c8f5ee 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pGkTCOQ2OR/9c5+L9UgESJjSMmz9FjfJw9NB8Nr6gRQ="; + sha256 = "sha256-Po0HCAK9h1GWSfKzV+1j3ddikCNIULbywx501GvRT/Q="; }; - vendorSha256 = "sha256-hvY64cmfvEeHniscD1WDyaeFpWeBJwsDNwr76e9F6ow="; + vendorSha256 = "sha256-GSNNOWhWpXRJEIzLoBci25sp9pu0W1mS18G8eFOsfhw="; # Tests use network doCheck = false; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 30495b91846..15711e8d43b 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config -, openssl, ppp -, systemd ? null }: +, openssl +, ppp +, systemd +, withSystemd ? stdenv.isLinux +, withPpp ? stdenv.isLinux +}: -let - withSystemd = stdenv.isLinux && !(systemd == null); - -in stdenv.mkDerivation rec { pname = "openfortivpn"; version = "1.17.1"; @@ -26,15 +26,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - openssl ppp + openssl ] - ++ lib.optional withSystemd systemd; + ++ lib.optional withSystemd systemd + ++ lib.optional withPpp ppp; configureFlags = [ "--sysconfdir=/etc" - "--with-pppd=${ppp}/bin/pppd" ] - ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; + ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd"; enableParallelBuilding = true; diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index 9135e8e1416..6eaa9f9c43c 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -1,20 +1,22 @@ { lib , rustPlatform , fetchFromGitHub +, testVersion +, alejandra }: rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - hash = "sha256-jj66PRqXASDNzdidkdfF2ezWM45Pw9Z+G4YNe8HRPhU="; + sha256 = "sha256-bM+z3s7oG0+8P7TVmyw7NW3eavN109zgsw9exUSQCaQ="; }; - cargoSha256 = "sha256-701lWa/2u10vCSRplL1ebYz29DxjpHY0SqjSWme1X1U="; + cargoSha256 = "sha256-GxQxyUyrDKTf+7cye0Ob/le06GnAI+FMGCUB5dts+k0="; meta = with lib; { description = "The Uncompromising Nix Code Formatter"; @@ -22,4 +24,8 @@ rustPlatform.buildRustPackage rec { license = licenses.unlicense; maintainers = with maintainers; [ _0x4A6F kamadorueda ]; }; + + passthru.tests = { + version = testVersion { package = alejandra; }; + }; } diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index b88275731b3..0c791bbf80f 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-Sh+nAeFd163nr8h3jBJbfDiMt+8+6bi/B1OOVVGMTXo="; + sha256 = "sha256-KWLZdFpRwtdP17x71IU2MGFwd1SNnTRcgTUoW1p5Px4="; }; - cargoSha256 = "sha256-QPp/vO4ZBvxbBtXbvU1ZRLPXOmzMCaJ1/mtuTpL6UYw="; + cargoSha256 = "sha256-CTaEWANx3s7YCm8pqGWuvGqR362YtVjmbnc9V3kC8pI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ffbe598b929..f7bb530480c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -58,8 +58,8 @@ in lib.makeExtensible (self: { }; nix_2_6 = common { - version = "2.6.0"; - sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; + version = "2.6.1"; + sha256 = "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0="; }; stable = self.nix_2_6; diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 1544194983d..8959d6627de 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -3,7 +3,27 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + + # pycfmodel is pinned, https://github.com/Skyscanner/cfripper/issues/204 + pycfmodel = super.pycfmodel.overridePythonAttrs (oldAttrs: rec { + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "Skyscanner"; + repo = "pycfmodel"; + rev = version; + hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A="; + }; + }); + }; + }; +in +with py.pkgs; + +buildPythonApplication rec { pname = "cfripper"; version = "1.3.3"; @@ -14,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-y3h/atfFl/wDmr+YBdsWrCez4PQBEcl3xNDyTwXZIp4="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with py.pkgs; [ boto3 cfn-flip click @@ -25,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + checkInputs = with py.pkgs; [ moto pytestCheckHook ]; diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 5b4f0a5da14..9ba91d18653 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "v${version}"; - sha256 = "sha256-92J9yRTSk2EP3lXCWH1+Ha+dx3dTNur6LIDMKbGmseI="; + sha256 = "sha256-+ZLnQtN5MnWnOpLHkaZMhhsFWgGhnhalkXLakJf1wKU="; }; - vendorSha256 = "sha256-692PcWFYNInWcZm9NQHLQmRHGFV9XUSFoCqHo7fcGEU="; + vendorSha256 = "sha256-RtYAggUWQ8b2qf5ly7BSRc+8npbLiWdM4h0Krdp4Py4="; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 49dc002133d..30206fab0eb 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -1,14 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "grype"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jn28IusHgHHFFrvqZLIvbqCFMhMQ5K/gqC4hVQLffY0="; + sha256 = "sha256-RXEeJZeC6hA6DetZnUNWFtNZEy4HJpxviL8pySBLfts="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,9 +26,12 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-05/xFjgiqbXy7Y2LTGHcXtvusGgfZ/TwLQHaO8rIjvc="; - nativeBuildInputs = [ installShellFiles ]; + vendorSha256 = "sha256-2T2fw1nOycP1LxUuMSmz1ke2bg4yox/tIAveXCNJG9Y="; + + nativeBuildInputs = [ + installShellFiles + ]; ldflags = [ "-s" diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 5cccc1dd5f5..beaa06fd836 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1bipphrzfz4dfzaqn1q60qazs7ylcx0b34gyl4q6d6jivsrhi8a4"; + sha256 = "sha256-GKjumkeo7aAYaECa6NoXCiXU2kqekBX3wCysRz8seW4="; }; - cargoSha256 = "0r254k85hqf2v8kdhwld8k7b350qjvkwfw2v22ikk2b41b2g4gbw"; + cargoSha256 = "sha256-rJ110kd18V2VGj0AHix3/vI09FG2kJ+TTOYKIthIrjQ="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ python3 ]; diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index b49ce7305de..d93f0135c20 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-30P/YggrPEVpsh2qo751aW6RtrpIVe1XQWyYZm8P4yA="; + sha256 = "sha256-sfAmyx9MgzCVA1Da7hl6/sKxhS9ptaNLeSB8wmJIKDs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index d982d73f541..663cc38291c 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,22 +4,22 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "sha256-15p4hm4Cvs/yLaQIcxctVdMKRWPjIIFwBcbru6QcjXo="; + sha256 = "sha256-y8klkb0hyITxLhcNWF7RYRVwF8rclDKzQF/MJs6y//Y="; }; - vendorSha256 = "sha256-XCCO4Vamzj5pJFmu1A8mpTLlVAtocrn20myYJVWtBrY="; + vendorSha256 = "sha256-0PPdnE3ND/YNIk50XkgBROpe5OhFiFre5Lwsml02DQU="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ packageToBuild ]; - ldflags = [ "-s" "-w" "-X github.com/sigstore/rekor/${packageToBuild}/app.GitVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/sigstore/rekor/pkg/api.GitVersion=v${version}" ]; postInstall = '' installShellCompletion --cmd ${pname} \ diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index e3518799504..eaa2bc659a5 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ PCSC IOKit CoreFoundation AppKit ]; postInstall = '' + install -D 70-solo2.rules $out/lib/udev/rules.d/70-solo2.rules installShellCompletion target/*/release/solo2.{bash,fish,zsh} ''; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 8a797e8ab13..79f829ffdfb 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -16,14 +16,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.33.0"; + version = "1.33.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-/1rLcfWbrg8gq5AnoSD5cBusc0WGJBc+i/sLyLwM/eY="; + sha256 = "sha256-4rx8EHtOSd/lHcSHZCtiXkjJjL7B175cVGvFOZ9Bzi8="; fetchSubmodules = true; }; diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index c0b9c43436f..41ddcfac50a 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "0.3.12"; + version = "1.0.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1j3u9r5TjdewAyzuCwCkXl/A2yI9L/AS5QGRpz30N7U="; + sha256 = "sha256-tllwFUC+Si3PsYPmiO86D3PNdInuIxxhZW5dAuU4K14="; }; - cargoSha256 = "sha256-Z+LnWXvVfZa8Mtr9LrieqCBGxaQE1vj1joSttYM5Xhs="; + cargoSha256 = "sha256-j9CwldmxjWYVuiWfAHIV0kr5k/p1BFWHzZiVrv8m7uI="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 67a7b03f180..4ed12b5b134 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.15.0"; + version = "2.15.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-HWekPMrQYTizyiRu9QSztZfZXsDmybXYarj6alGWJag="; + sha256 = "sha256-akJgIS+jf2n9NC4A+/gNQR62BaJ6T9vvdxJggOTRHn8="; }; vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE="; diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index 6994cc25b38..7407c3dc68a 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.30"; + version = "0.3.44"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-NaCG0oG9j1yoXOsfnQXFd+PdZfJTOdvYndFIftIAnxE="; + sha256 = "sha256-ShL/j0vyKfbNcq/cAgEUCln6T7UE/qmPZOMw129210o="; }; - vendorSha256 = "sha256-YClNdtnakJJOEytTbopTXeZy218N4vHP3tQLavLgPbg="; + vendorSha256 = "sha256-mXYnmDppVqhjlkGVkvp1YaEwBEkHBUddxLof389huMQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 932009fd70c..4bcf252e06c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -216,6 +216,8 @@ with pkgs; beyond-identity = callPackage ../tools/security/beyond-identity {}; + bingo = callPackage ../development/tools/bingo {}; + breakpad = callPackage ../development/misc/breakpad { }; buf = callPackage ../development/tools/buf { }; @@ -253,11 +255,11 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - cen64 = callPackage ../misc/emulators/cen64 { }; + cen64 = callPackage ../applications/emulators/cen64 { }; btdu = callPackage ../tools/misc/btdu { }; - uxn = callPackage ../misc/emulators/uxn { }; + uxn = callPackage ../applications/emulators/uxn { }; cereal = callPackage ../development/libraries/cereal { }; @@ -345,6 +347,10 @@ with pkgs; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; + probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + probe-run = callPackage ../development/tools/rust/probe-run { inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; @@ -375,7 +381,7 @@ with pkgs; protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; - proton-caller = callPackage ../misc/emulators/proton-caller { }; + proton-caller = callPackage ../applications/emulators/proton-caller { }; ptags = callPackage ../development/tools/misc/ptags { }; @@ -1227,7 +1233,7 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; logseq = callPackage ../applications/misc/logseq { - electron = electron_16; + electron = electron_15; }; natls = callPackage ../tools/misc/natls { }; @@ -2311,7 +2317,7 @@ with pkgs; boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/virtualization/bochs { + bochs = callPackage ../applications/emulators/bochs { wxGTK = wxGTK30; }; @@ -2367,9 +2373,9 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - py65 = python3Packages.callPackage ../misc/emulators/py65 { }; + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - simh = callPackage ../misc/emulators/simh { }; + simh = callPackage ../applications/emulators/simh { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -2494,19 +2500,19 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; - cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; + cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; - craftos-pc = callPackage ../misc/emulators/craftos-pc { }; + craftos-pc = callPackage ../applications/emulators/craftos-pc { }; - gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; - image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; cbor-diag = callPackage ../development/tools/cbor-diag { }; @@ -2874,9 +2880,9 @@ with pkgs; djv = callPackage ../applications/graphics/djv { }; - dlx = callPackage ../misc/emulators/dlx { }; + dlx = callPackage ../applications/emulators/dlx { }; - dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; + dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; @@ -2915,7 +2921,7 @@ with pkgs; duf = callPackage ../tools/misc/duf { }; inherit (ocaml-ng.ocamlPackages_4_10) dune_1; - inherit (ocamlPackages) dune_2 dune-release; + inherit (ocamlPackages) dune_2 dune_3 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -3500,6 +3506,8 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; + mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { }; + mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { }; @@ -3671,7 +3679,7 @@ with pkgs; ropgadget = with python3Packages; toPythonApplication ropgadget; - ryujinx = callPackage ../misc/emulators/ryujinx { }; + ryujinx = callPackage ../applications/emulators/ryujinx { }; scour = with python3Packages; toPythonApplication scour; @@ -3693,7 +3701,7 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - simplenes = callPackage ../misc/emulators/simplenes { }; + simplenes = callPackage ../applications/emulators/simplenes { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -4159,7 +4167,7 @@ with pkgs; citrix_workspace_21_12_0 ; - citra = libsForQt5.callPackage ../misc/emulators/citra { }; + citra = libsForQt5.callPackage ../applications/emulators/citra { }; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -4229,6 +4237,8 @@ with pkgs; unifdef = callPackage ../development/tools/misc/unifdef { }; + uniffi-bindgen = callPackage ../development/tools/uniffi-bindgen { }; + unify = with python3Packages; toPythonApplication unify; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; @@ -4787,11 +4797,11 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphin-emu = callPackage ../misc/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { + dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; + dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; - dolphin-emu-primehack = qt5.callPackage ../misc/emulators/dolphin-emu/primehack.nix { + dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -5169,7 +5179,7 @@ with pkgs; epstool = callPackage ../tools/graphics/epstool { }; - epsxe = callPackage ../misc/emulators/epsxe { }; + epsxe = callPackage ../applications/emulators/epsxe { }; escrotum = callPackage ../tools/graphics/escrotum { }; @@ -5389,7 +5399,7 @@ with pkgs; fio = callPackage ../tools/system/fio { }; - firebird-emu = libsForQt5.callPackage ../misc/emulators/firebird-emu { }; + firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; flamerobin = callPackage ../applications/misc/flamerobin { }; @@ -7361,7 +7371,7 @@ with pkgs; nodejs = nodejs-14_x; }; - np2kai = callPackage ../misc/emulators/np2kai { }; + np2kai = callPackage ../applications/emulators/np2kai { }; openipmi = callPackage ../tools/system/openipmi { }; @@ -7792,11 +7802,11 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../misc/emulators/mednafen { }; + mednafen = callPackage ../applications/emulators/mednafen { }; - mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; + mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe { }; + mednaffe = callPackage ../applications/emulators/mednaffe { }; megacli = callPackage ../tools/misc/megacli { }; @@ -7812,7 +7822,7 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; microdnf = callPackage ../tools/package-management/microdnf { }; @@ -8032,7 +8042,7 @@ with pkgs; nerdfonts = callPackage ../data/fonts/nerdfonts { }; - nestopia = callPackage ../misc/emulators/nestopia { }; + nestopia = callPackage ../applications/emulators/nestopia { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -9272,7 +9282,7 @@ with pkgs; repseek = callPackage ../applications/science/biology/repseek { }; - reicast = callPackage ../misc/emulators/reicast { }; + reicast = callPackage ../applications/emulators/reicast { }; reredirect = callPackage ../tools/misc/reredirect { }; @@ -9387,6 +9397,10 @@ with pkgs; rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {}; + rnote = callPackage ../applications/graphics/rnote { + inherit (gst_all_1) gstreamer; + }; + rnp = callPackage ../tools/security/rnp { }; rnv = callPackage ../tools/text/xml/rnv { }; @@ -9458,7 +9472,7 @@ with pkgs; rubocop = rubyPackages.rubocop; - ruffle = callPackage ../misc/emulators/ruffle { }; + ruffle = callPackage ../applications/emulators/ruffle { }; runningx = callPackage ../tools/X11/runningx { }; @@ -9753,6 +9767,10 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair {}; + sketchybar = callPackage ../os-specific/darwin/sketchybar { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa SkyLight; + }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; sks = callPackage ../servers/sks { }; @@ -10310,7 +10328,7 @@ with pkgs; tiledb = callPackage ../development/libraries/tiledb { }; - tilem = callPackage ../misc/emulators/tilem { }; + tilem = callPackage ../applications/emulators/tilem { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -10334,9 +10352,9 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; + tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyemu = callPackage ../applications/emulators/tinyemu { }; tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; @@ -12535,8 +12553,8 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15; - openjfx = openjfx15; + inherit (javaPackages) openjfx11 openjfx15 openjfx17; + openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; @@ -12633,7 +12651,20 @@ with pkgs; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - libgit2 = libgit2_0_27; + libgit2 = libgit2.overrideAttrs (_: rec { + version = "0.27.10"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; + }; + patches = []; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; + }); }; julia_15 = callPackage ../development/compilers/julia/1.5.nix { @@ -14092,7 +14123,7 @@ with pkgs; mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; - resim = callPackage ../misc/emulators/resim {}; + resim = callPackage ../applications/emulators/resim {}; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; @@ -15701,7 +15732,9 @@ with pkgs; ttyd = callPackage ../servers/ttyd { }; - turbogit = callPackage ../development/tools/turbogit { }; + turbogit = callPackage ../development/tools/turbogit { + libgit2 = libgit2_1_3_0; + }; tweak = callPackage ../applications/editors/tweak { }; @@ -15896,11 +15929,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - aprutil = callPackage ../development/libraries/apr-util { - db = if stdenv.isFreeBSD then db4 else db; - # XXX: only the db_185 interface was available through - # apr with db58 on freebsd (nov 2015), for unknown reasons - }; + aprutil = callPackage ../development/libraries/apr-util { }; aravis = callPackage ../development/libraries/aravis { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; @@ -16381,7 +16410,7 @@ with pkgs; duckdb = callPackage ../development/libraries/duckdb {}; - duckstation = libsForQt5.callPackage ../misc/emulators/duckstation {}; + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; @@ -16716,32 +16745,19 @@ with pkgs; icon-lang = callPackage ../development/interpreters/icon-lang { }; - libgit2 = callPackage ../development/libraries/git2 { + libgit2 = callPackage ../development/libraries/libgit2 { inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_27 = libgit2.overrideAttrs (_: rec { - version = "0.27.10"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; - }; - meta.knownVulnerabilities = [ - "CVE-2020-12278" - "CVE-2020-12279" - ]; - }); - - libgit2_1_1 = libgit2.overrideAttrs (_: rec { - version = "1.1.1"; - src = fetchFromGitHub { + libgit2_1_3_0 = libgit2.overrideAttrs (_: rec { + version = "1.3.0"; + src = pkgs.fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc="; + sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; }; + patches = []; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -18333,7 +18349,7 @@ with pkgs; hdf5 = hdf5_1_10; }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; libmkv = callPackage ../development/libraries/libmkv { }; @@ -20398,7 +20414,7 @@ with pkgs; vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; - vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; + vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; @@ -21534,6 +21550,8 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 + mariadb_107 + mariadb_108 ; mariadb = mariadb_106; @@ -24055,7 +24073,7 @@ with pkgs; poppler_data = callPackage ../data/misc/poppler-data { }; - qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../applications/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -24162,7 +24180,7 @@ with pkgs; fonts = [ "Terminus" ]; }; - termtekst = callPackage ../misc/emulators/termtekst { }; + termtekst = callPackage ../applications/emulators/termtekst { }; tex-gyre = callPackages ../data/fonts/tex-gyre { }; @@ -25129,7 +25147,7 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - dynamips = callPackage ../applications/virtualization/dynamips { }; + dynamips = callPackage ../applications/emulators/dynamips { }; exploitdb = callPackage ../tools/security/exploitdb { }; @@ -25707,9 +25725,7 @@ with pkgs; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-bin"; - desktopName = "Firefox"; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { @@ -25719,7 +25735,6 @@ with pkgs; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -25731,7 +25746,6 @@ with pkgs; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { - applicationName = "firefox"; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; @@ -26173,7 +26187,7 @@ with pkgs; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; - hercules = callPackage ../applications/virtualization/hercules { }; + hercules = callPackage ../applications/emulators/hercules { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -26713,7 +26727,7 @@ with pkgs; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; + kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; kepubify = callPackage ../tools/misc/kepubify { }; @@ -26885,7 +26899,7 @@ with pkgs; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; - lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lambda-delta = callPackage ../applications/emulators/lambda-delta { }; lame = callPackage ../development/libraries/lame { }; @@ -27018,7 +27032,7 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; - libdsk = callPackage ../misc/emulators/libdsk { }; + libdsk = callPackage ../applications/emulators/libdsk { }; liblinphone = callPackage ../development/libraries/liblinphone { }; @@ -27203,7 +27217,7 @@ with pkgs; melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; - melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { }; + melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; @@ -27849,7 +27863,7 @@ with pkgs; obconf = callPackage ../tools/X11/obconf { }; - oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; + oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {}; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); @@ -28000,9 +28014,9 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - pcsxr = callPackage ../misc/emulators/pcsxr { }; + pcsxr = callPackage ../applications/emulators/pcsxr { }; - pcsx2 = callPackage ../misc/emulators/pcsx2 { + pcsx2 = callPackage ../applications/emulators/pcsx2 { wxGTK = wxGTK30-gtk3; }; @@ -28532,7 +28546,7 @@ with pkgs; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -28573,7 +28587,7 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; - sameboy = callPackage ../misc/emulators/sameboy { }; + sameboy = callPackage ../applications/emulators/sameboy { }; sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; @@ -28703,7 +28717,7 @@ with pkgs; curses = ncurses; }; - stella = callPackage ../misc/emulators/stella { }; + stella = callPackage ../applications/emulators/stella { }; linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; @@ -29821,7 +29835,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = - callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { }; + callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; xca = libsForQt5.callPackage ../applications/misc/xca { }; @@ -31660,6 +31674,8 @@ with pkgs; plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; + plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {}; + plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { }; inherit (callPackages ../applications/misc/redshift { @@ -32267,7 +32283,7 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - caprice32 = callPackage ../misc/emulators/caprice32 { }; + caprice32 = callPackage ../applications/emulators/caprice32 { }; cubicle = callPackage ../applications/science/logic/cubicle { ocamlPackages = ocaml-ng.ocamlPackages_4_05; @@ -32780,11 +32796,11 @@ with pkgs; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - ares = callPackage ../misc/emulators/ares { }; + ares = callPackage ../applications/emulators/ares { }; - atari800 = callPackage ../misc/emulators/atari800 { }; + atari800 = callPackage ../applications/emulators/atari800 { }; - ataripp = callPackage ../misc/emulators/atari++ { }; + ataripp = callPackage ../applications/emulators/atari++ { }; atlantis = callPackage ../applications/networking/cluster/atlantis { }; @@ -32798,7 +32814,7 @@ with pkgs; swt = swt_jdk8; }; - attract-mode = callPackage ../misc/emulators/attract-mode { }; + attract-mode = callPackage ../applications/emulators/attract-mode { }; autotiling = python3Packages.callPackage ../misc/autotiling { }; @@ -32820,7 +32836,7 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; - ccemux = callPackage ../misc/emulators/ccemux { }; + ccemux = callPackage ../applications/emulators/ccemux { }; click = callPackage ../applications/networking/cluster/click { }; @@ -32898,13 +32914,13 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darcnes = callPackage ../misc/emulators/darcnes { }; + darcnes = callPackage ../applications/emulators/darcnes { }; darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../misc/emulators/desmume { }; + desmume = callPackage ../applications/emulators/desmume { }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -32920,11 +32936,11 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; - dosbox = callPackage ../misc/emulators/dosbox { }; + dosbox = callPackage ../applications/emulators/dosbox { }; - dosbox-staging = callPackage ../misc/emulators/dosbox-staging { }; + dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - emu2 = callPackage ../misc/emulators/emu2 { }; + emu2 = callPackage ../applications/emulators/emu2 { }; apt = callPackage ../tools/package-management/apt { }; @@ -32936,7 +32952,7 @@ with pkgs; ecdsatool = callPackage ../tools/security/ecdsatool { }; - emulationstation = callPackage ../misc/emulators/emulationstation { }; + emulationstation = callPackage ../applications/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -32946,7 +32962,7 @@ with pkgs; glee = callPackage ../tools/graphics/glee { }; - fakenes = callPackage ../misc/emulators/fakenes { }; + fakenes = callPackage ../applications/emulators/fakenes { }; faust = res.faust2; @@ -32980,7 +32996,7 @@ with pkgs; faustStk = callPackage ../applications/audio/faustStk { }; - fceux = libsForQt5.callPackage ../misc/emulators/fceux { }; + fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; @@ -32996,7 +33012,7 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; + fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; @@ -33005,7 +33021,7 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; + gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { }; @@ -33031,9 +33047,9 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gxemul = callPackage ../misc/emulators/gxemul { }; + gxemul = callPackage ../applications/emulators/gxemul { }; - hatari = callPackage ../misc/emulators/hatari { }; + hatari = callPackage ../applications/emulators/hatari { }; hck = callPackage ../tools/text/hck { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -33144,7 +33160,7 @@ with pkgs; loop = callPackage ../tools/misc/loop { }; - maiko = callPackage ../misc/emulators/maiko { inherit (xorg) libX11; }; + maiko = callPackage ../applications/emulators/maiko { inherit (xorg) libX11; }; mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; @@ -33152,7 +33168,7 @@ with pkgs; mamba = callPackage ../applications/audio/mamba { }; - mame = libsForQt514.callPackage ../misc/emulators/mame { + mame = libsForQt514.callPackage ../applications/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -33172,7 +33188,7 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + mupen64plus = callPackage ../applications/emulators/mupen64plus { }; muse = libsForQt5.callPackage ../applications/audio/muse { }; @@ -33509,7 +33525,7 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pcem = callPackage ../misc/emulators/pcem { }; + pcem = callPackage ../applications/emulators/pcem { }; pgmanage = callPackage ../applications/misc/pgmanage { }; @@ -33539,13 +33555,13 @@ with pkgs; pounce = callPackage ../servers/pounce { }; - ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; + ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; protocol = python3Packages.callPackage ../applications/networking/protocol { }; - punes = libsForQt5.callPackage ../misc/emulators/punes { }; + punes = libsForQt5.callPackage ../applications/emulators/punes { }; pykms = callPackage ../tools/networking/pykms { }; @@ -33555,11 +33571,11 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; - uae = callPackage ../misc/emulators/uae { }; + uae = callPackage ../applications/emulators/uae { }; - fsuae = callPackage ../misc/emulators/fs-uae { }; + fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { }; + fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; @@ -33585,12 +33601,12 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; - retroarchBare = callPackage ../misc/emulators/retroarch { + retroarchBare = callPackage ../applications/emulators/retroarch { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; }; - wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { + wrapRetroArch = { retroarch }: callPackage ../applications/emulators/retroarch/wrapper.nix { inherit retroarch; }; @@ -33603,11 +33619,11 @@ with pkgs; (builtins.attrValues libretro); }; - libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { + libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { retroarch = retroarchBare; }); - retrofe = callPackage ../misc/emulators/retrofe { }; + retrofe = callPackage ../applications/emulators/retrofe { }; rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; @@ -33916,11 +33932,11 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { }; + vbam = callPackage ../applications/emulators/vbam { }; vgmstream = callPackage ../applications/audio/vgmstream { }; - vice = callPackage ../misc/emulators/vice { }; + vice = callPackage ../applications/emulators/vice { }; viddy = callPackage ../tools/misc/viddy { }; @@ -34020,7 +34036,7 @@ with pkgs; wineRelease = "wayland"; }); - winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { inherit (gnome) zenity; }; @@ -34110,7 +34126,7 @@ with pkgs; yabai = callPackage ../os-specific/darwin/yabai { }; - yabause = libsForQt5.callPackage ../misc/emulators/yabause { + yabause = libsForQt5.callPackage ../applications/emulators/yabause { freeglut = null; openal = null; }; @@ -34133,11 +34149,11 @@ with pkgs; yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu-mainline = import ../misc/emulators/yuzu { + yuzu-mainline = import ../applications/emulators/yuzu { branch = "mainline"; inherit libsForQt5 fetchFromGitHub; }; - yuzu-ea = import ../misc/emulators/yuzu { + yuzu-ea = import ../applications/emulators/yuzu { branch = "early-access"; inherit libsForQt5 fetchFromGitHub; }; @@ -34160,34 +34176,34 @@ with pkgs; zoneminder = callPackage ../servers/zoneminder { }; - zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; + zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; xcp = callPackage ../tools/misc/xcp { }; - xcpc = callPackage ../misc/emulators/xcpc { }; + xcpc = callPackage ../applications/emulators/xcpc { }; zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; - openmsx = callPackage ../misc/emulators/openmsx { + openmsx = callPackage ../applications/emulators/openmsx { python = python3; }; - higan = callPackage ../misc/emulators/higan { }; + higan = callPackage ../applications/emulators/higan { }; - bsnes-hd = callPackage ../misc/emulators/bsnes-hd { + bsnes-hd = callPackage ../applications/emulators/bsnes-hd { inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }; - yapesdl = callPackage ../misc/emulators/yapesdl { }; + yapesdl = callPackage ../applications/emulators/yapesdl { }; - x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../misc/emulators/commanderx16/rom.nix { }; - x16-run = (callPackage ../misc/emulators/commanderx16/run.nix { }) { + x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; + x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; + x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { emulator = x16-emulator; rom = x16-rom; }; @@ -34486,6 +34502,8 @@ with pkgs; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; + usb-blaster-udev-rules = callPackage ../os-specific/linux/usb-blaster-udev-rules {}; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; hashdeep = callPackage ../tools/security/hashdeep { }; @@ -34547,7 +34565,7 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; - zesarux = callPackage ../misc/emulators/zesarux { }; + zesarux = callPackage ../applications/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index ff23949ae4f..d6ee88bc4f5 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -148,6 +148,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { lsusb = callPackage ../os-specific/darwin/lsusb { }; + moltenvk = callPackage ../os-specific/darwin/moltenvk { }; + opencflite = callPackage ../os-specific/darwin/opencflite { }; stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index d291c1e830c..1cd2c93da77 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -14,16 +14,20 @@ let }; mkDerivation = mkDerivationWith stdenv.mkDerivation; - callPackage = self.newScope { + callPackage = self.newScope ({ inherit (gnuradio) # Packages that are potentially overriden and used as deps here. boost - uhd volk ; inherit mkDerivationWith mkDerivation; - }; - + } // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") { + inherit (gnuradio) uhd; + } // (if (lib.versionAtLeast gnuradio.versionAttr.major "3.10") then { + inherit (gnuradio) spdlog; + } else { + inherit (gnuradio) log4cpp; + })); in { inherit callPackage mkDerivation mkDerivationWith; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index cf6474f0da5..c8d9e85fbd7 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -8,9 +8,10 @@ let openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; + openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; in { - inherit mavenbuild fetchMaven openjfx11 openjfx15; + inherit mavenbuild fetchMaven openjfx11 openjfx15 openjfx17; compiler = let @@ -170,7 +171,7 @@ in { ../development/compilers/openjdk/darwin/17.nix { inherit openjdk17-bootstrap; - openjfx = openjfx15; + openjfx = openjfx17; }; }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3e38ce116a4..65a81e82a09 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -438,7 +438,7 @@ in { veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; - vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + vhba = callPackage ../applications/emulators/cdemu/vhba.nix { }; virtualbox = callPackage ../os-specific/linux/virtualbox { virtualbox = pkgs.virtualboxHardened; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a29602dfb7d..fe7fd7d856a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -310,6 +310,8 @@ let then pkgs.dune_2 else throw "dune_2 is not available for OCaml ${ocaml.version}"; + dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { }; + dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23a714597ee..fa713e8eaf0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16715,12 +16715,12 @@ let NetSSLeay = buildPerlPackage { pname = "Net-SSLeay"; - version = "1.88"; + version = "1.92"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz"; - sha256 = "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010"; + url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.92.tar.gz"; + sha256 = "sha256-R8LyswDy5xYtcdaZ9jPdajWwYloAy9qMUKwBFEqTlqk="; }; - buildInputs = [ pkgs.openssl ]; + buildInputs = [ pkgs.openssl pkgs.zlib ]; doCheck = false; # Test performs network access. preConfigure = '' mkdir openssl diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65704adecf1..4eefbe1efd1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5645,6 +5645,8 @@ in { onnx = callPackage ../development/python-modules/onnx { }; + onvif-zeep-async = callPackage ../development/python-modules/onvif-zeep-async { }; + oocsi = callPackage ../development/python-modules/oocsi { }; open-garage = callPackage ../development/python-modules/open-garage { }; @@ -6082,6 +6084,8 @@ in { pipdate = callPackage ../development/python-modules/pipdate { }; + pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; + pip-tools = callPackage ../development/python-modules/pip-tools { }; pipx = callPackage ../development/python-modules/pipx { }; @@ -6149,6 +6153,8 @@ in { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyoverkiz = callPackage ../development/python-modules/pyoverkiz { }; + pyownet = callPackage ../development/python-modules/pyownet { }; pypoint = callPackage ../development/python-modules/pypoint { }; @@ -6910,7 +6916,9 @@ in { pygetwindow = callPackage ../development/python-modules/pygetwindow { }; - pygit2 = callPackage ../development/python-modules/pygit2 { }; + pygit2 = callPackage ../development/python-modules/pygit2 { + libgit2 = pkgs.libgit2_1_3_0; + }; PyGithub = callPackage ../development/python-modules/pyGithub { }; @@ -9350,6 +9358,8 @@ in { inherit (pkgs) plantuml; }; + sphinxcontrib-programoutput = callPackage ../development/python-modules/sphinxcontrib-programoutput { }; + sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { }; @@ -10565,6 +10575,8 @@ in { ws4py = callPackage ../development/python-modules/ws4py { }; + wsdiscovery = callPackage ../development/python-modules/wsdiscovery { }; + wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { }; wsgiprox = callPackage ../development/python-modules/wsgiprox { }; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 4f993bdf082..62a2278bd4f 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,8 +1,8 @@ { stdenv, config, callPackage, wineBuild }: rec { - fonts = callPackage ../misc/emulators/wine/fonts.nix {}; - minimal = callPackage ../misc/emulators/wine { + fonts = callPackage ../applications/emulators/wine/fonts.nix {}; + minimal = callPackage ../applications/emulators/wine { wineRelease = config.wine.release or "stable"; inherit wineBuild; }; |