diff --git a/nixos/modules/image/repart-verity-store.nix b/nixos/modules/image/repart-verity-store.nix index 953a5997c5fd..15d0ce88872f 100644 --- a/nixos/modules/image/repart-verity-store.nix +++ b/nixos/modules/image/repart-verity-store.nix @@ -81,12 +81,18 @@ in }; config = lib.mkIf cfg.enable { - boot.initrd.systemd.dmVerity.enable = true; + boot.initrd = { + systemd.dmVerity.enable = true; + supportedFilesystems = { + ${config.image.repart.partitions.${cfg.partitionIds.store}.repartConfig.Format} = + lib.mkDefault true; + }; + }; image.repart.partitions = { # dm-verity hash partition ${cfg.partitionIds.store-verity}.repartConfig = { - Type = partitionTypes.usr-verity; + Type = lib.mkDefault partitionTypes.usr-verity; Verity = "hash"; VerityMatchKey = lib.mkDefault verityMatchKey; Label = lib.mkDefault "store-verity"; @@ -95,7 +101,7 @@ in ${cfg.partitionIds.store} = { storePaths = [ config.system.build.toplevel ]; repartConfig = { - Type = partitionTypes.usr; + Type = lib.mkDefault partitionTypes.usr; Verity = "data"; Format = lib.mkDefault "erofs"; VerityMatchKey = lib.mkDefault verityMatchKey; diff --git a/nixos/modules/services/network-filesystems/moosefs.nix b/nixos/modules/services/network-filesystems/moosefs.nix index 2fef0bec378c..1c874e4108f6 100644 --- a/nixos/modules/services/network-filesystems/moosefs.nix +++ b/nixos/modules/services/network-filesystems/moosefs.nix @@ -26,7 +26,7 @@ let lib.mapAttrsToList (key: val: "${key} = ${valueToString val}") value )); }; - + # Manual initialization tool initTool = pkgs.writeShellScriptBin "mfsmaster-init" '' if [ ! -e ${cfg.master.settings.DATA_PATH}/metadata.mfs ]; then cp ${pkgs.moosefs}/var/mfs/metadata.mfs.empty ${cfg.master.settings.DATA_PATH} @@ -37,19 +37,10 @@ let fi ''; - # master config file - masterCfg = settingsFormat.generate - "mfsmaster.cfg" cfg.master.settings; + masterCfg = settingsFormat.generate "mfsmaster.cfg" cfg.master.settings; + metaloggerCfg = settingsFormat.generate "mfsmetalogger.cfg" cfg.metalogger.settings; + chunkserverCfg = settingsFormat.generate "mfschunkserver.cfg" cfg.chunkserver.settings; - # metalogger config file - metaloggerCfg = settingsFormat.generate - "mfsmetalogger.cfg" cfg.metalogger.settings; - - # chunkserver config file - chunkserverCfg = settingsFormat.generate - "mfschunkserver.cfg" cfg.chunkserver.settings; - - # generic template for all daemons systemdService = name: extraConfig: configFile: { wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; @@ -66,40 +57,43 @@ let in { ###### interface - options = { services.moosefs = { masterHost = lib.mkOption { type = lib.types.str; default = null; - description = "IP or DNS name of master host."; + description = "IP or DNS name of the MooseFS master server."; }; runAsUser = lib.mkOption { type = lib.types.bool; default = true; example = true; - description = "Run daemons as user moosefs instead of root."; + description = "Run daemons as moosefs user instead of root for better security."; }; - client.enable = lib.mkEnableOption "Moosefs client"; + client.enable = lib.mkEnableOption "MooseFS client"; master = { enable = lib.mkOption { type = lib.types.bool; description = '' - Enable Moosefs master daemon. - - You need to run `mfsmaster-init` on a freshly installed master server to - initialize the `DATA_PATH` directory. + Enable MooseFS master daemon. + The master server coordinates all MooseFS operations and stores metadata. ''; default = false; }; + autoInit = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to automatically initialize the master's metadata directory on first run. Use with caution."; + }; + exports = lib.mkOption { type = with lib.types; listOf str; default = null; - description = "Paths to export (see mfsexports.cfg)."; + description = "Export definitions for MooseFS (see mfsexports.cfg)."; example = [ "* / rw,alldirs,admin,maproot=0:0" "* . rw" @@ -108,7 +102,7 @@ in { openFirewall = lib.mkOption { type = lib.types.bool; - description = "Whether to automatically open the necessary ports in the firewall."; + description = "Whether to automatically open required firewall ports for master service."; default = false; }; @@ -119,16 +113,15 @@ in { options.DATA_PATH = lib.mkOption { type = lib.types.str; default = "/var/lib/mfs"; - description = "Data storage directory."; + description = "Directory for storing master metadata."; }; }; - - description = "Contents of config file (mfsmaster.cfg)."; + description = "Master configuration options (mfsmaster.cfg)."; }; }; metalogger = { - enable = lib.mkEnableOption "Moosefs metalogger daemon"; + enable = lib.mkEnableOption "MooseFS metalogger daemon that maintains a backup copy of the master's metadata"; settings = lib.mkOption { type = lib.types.submodule { @@ -137,28 +130,27 @@ in { options.DATA_PATH = lib.mkOption { type = lib.types.str; default = "/var/lib/mfs"; - description = "Data storage directory"; + description = "Directory for storing metalogger data."; }; }; - - description = "Contents of metalogger config file (mfsmetalogger.cfg)."; + description = "Metalogger configuration options (mfsmetalogger.cfg)."; }; }; chunkserver = { - enable = lib.mkEnableOption "Moosefs chunkserver daemon"; + enable = lib.mkEnableOption "MooseFS chunkserver daemon that stores file data"; openFirewall = lib.mkOption { type = lib.types.bool; - description = "Whether to automatically open the necessary ports in the firewall."; + description = "Whether to automatically open required firewall ports for chunkserver service."; default = false; }; hdds = lib.mkOption { type = with lib.types; listOf str; - default = null; - description = "Mount points to be used by chunkserver for storage (see mfshdd.cfg)."; - example = [ "/mnt/hdd1" ]; + default = null; + description = "Mount points used by chunkserver for data storage (see mfshdd.cfg)."; + example = [ "/mnt/hdd1" "/mnt/hdd2" ]; }; settings = lib.mkOption { @@ -168,29 +160,65 @@ in { options.DATA_PATH = lib.mkOption { type = lib.types.str; default = "/var/lib/mfs"; - description = "Directory for lock file."; + description = "Directory for lock files and other runtime data."; }; }; + description = "Chunkserver configuration options (mfschunkserver.cfg)."; + }; + }; - description = "Contents of chunkserver config file (mfschunkserver.cfg)."; + cgiserver = { + enable = lib.mkEnableOption '' + MooseFS CGI server for web interface. + Warning: The CGI server interface should be properly secured from unauthorized access, + as it provides full control over your MooseFS installation. + ''; + + openFirewall = lib.mkOption { + type = lib.types.bool; + description = "Whether to automatically open the web interface port."; + default = false; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + BIND_HOST = lib.mkOption { + type = lib.types.str; + default = "0.0.0.0"; + description = "IP address to bind CGI server to."; + }; + + PORT = lib.mkOption { + type = lib.types.port; + default = 9425; + description = "Port for CGI server to listen on."; + }; + }; + }; + default = {}; + description = "CGI server configuration options."; }; }; }; }; ###### implementation + config = lib.mkIf (cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable || cfg.cgiserver.enable) { + warnings = [ ( lib.mkIf (!cfg.runAsUser) "Running MooseFS services as root is not recommended.") ]; - config = lib.mkIf ( cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) { - - warnings = [ ( lib.mkIf (!cfg.runAsUser) "Running moosefs services as root is not recommended.") ]; - - # Service settings services.moosefs = { - master.settings = lib.mkIf cfg.master.enable { - WORKING_USER = mfsUser; - EXPORTS_FILENAME = toString ( pkgs.writeText "mfsexports.cfg" - (lib.concatStringsSep "\n" cfg.master.exports)); - }; + master.settings = lib.mkIf cfg.master.enable (lib.mkMerge [ + { + WORKING_USER = mfsUser; + EXPORTS_FILENAME = toString ( pkgs.writeText "mfsexports.cfg" + (lib.concatStringsSep "\n" cfg.master.exports)); + } + (lib.mkIf cfg.cgiserver.enable { + MFSCGISERV = toString cfg.cgiserver.settings.PORT; + }) + ]); metalogger.settings = lib.mkIf cfg.metalogger.enable { WORKING_USER = mfsUser; @@ -205,11 +233,10 @@ in { }; }; - # Create system user account for daemons - users = lib.mkIf ( cfg.runAsUser && ( cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) ) { + users = lib.mkIf ( cfg.runAsUser && ( cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable || cfg.cgiserver.enable ) ) { users.moosefs = { isSystemUser = true; - description = "moosefs daemon user"; + description = "MooseFS daemon user"; group = "moosefs"; }; groups.moosefs = {}; @@ -219,28 +246,74 @@ in { (lib.optional cfg.client.enable pkgs.moosefs) ++ (lib.optional cfg.master.enable initTool); - networking.firewall.allowedTCPPorts = - (lib.optionals cfg.master.openFirewall [ 9419 9420 9421 ]) ++ - (lib.optional cfg.chunkserver.openFirewall 9422); + networking.firewall.allowedTCPPorts = lib.mkMerge [ + (lib.optionals cfg.master.openFirewall [ 9419 9420 9421 ]) + (lib.optional cfg.chunkserver.openFirewall 9422) + (lib.optional (cfg.cgiserver.enable && cfg.cgiserver.openFirewall) cfg.cgiserver.settings.PORT) + ]; - # Ensure storage directories exist - systemd.tmpfiles.rules = - lib.optional cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" - ++ lib.optional cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" - ++ lib.optional cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}"; + systemd.tmpfiles.rules = [ + # Master directories + (lib.optionalString cfg.master.enable + "d ${cfg.master.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser} -") - # Service definitions - systemd.services.mfs-master = lib.mkIf cfg.master.enable - ( systemdService "master" { - TimeoutStartSec = 1800; - TimeoutStopSec = 1800; - Restart = "no"; - } masterCfg ); + # Metalogger directories + (lib.optionalString cfg.metalogger.enable + "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser} -") - systemd.services.mfs-metalogger = lib.mkIf cfg.metalogger.enable - ( systemdService "metalogger" { Restart = "on-abnormal"; } metaloggerCfg ); + # Chunkserver directories + (lib.optionalString cfg.chunkserver.enable + "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser} -") + ] ++ lib.optionals (cfg.chunkserver.enable && cfg.chunkserver.hdds != null) + (map (dir: "d ${dir} 0755 ${mfsUser} ${mfsUser} -") cfg.chunkserver.hdds); - systemd.services.mfs-chunkserver = lib.mkIf cfg.chunkserver.enable - ( systemdService "chunkserver" { Restart = "on-abnormal"; } chunkserverCfg ); - }; + systemd.services = lib.mkMerge [ + (lib.mkIf cfg.master.enable { + mfs-master = (lib.mkMerge [ + (systemdService "master" { + TimeoutStartSec = 1800; + TimeoutStopSec = 1800; + Restart = "on-failure"; + User = mfsUser; + } masterCfg) + { + preStart = lib.mkIf cfg.master.autoInit "${initTool}/bin/mfsmaster-init"; + } + ]); + }) + + (lib.mkIf cfg.metalogger.enable { + mfs-metalogger = systemdService "metalogger" { + Restart = "on-abnormal"; + User = mfsUser; + } metaloggerCfg; + }) + + (lib.mkIf cfg.chunkserver.enable { + mfs-chunkserver = systemdService "chunkserver" { + Restart = "on-abnormal"; + User = mfsUser; + } chunkserverCfg; + }) + + (lib.mkIf cfg.cgiserver.enable { + mfs-cgiserv = { + description = "MooseFS CGI Server"; + wantedBy = [ "multi-user.target" ]; + after = [ "mfs-master.service" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.moosefs}/bin/mfscgiserv -D /var/lib/mfs -f start"; + ExecStop = "${pkgs.moosefs}/bin/mfscgiserv -D /var/lib/mfs stop"; + Restart = "on-failure"; + RestartSec = "30s"; + User = mfsUser; + Group = mfsUser; + WorkingDirectory = "/var/lib/mfs"; + }; + }; + }) + ]; + }; } diff --git a/nixos/tests/appliance-repart-image-verity-store.nix b/nixos/tests/appliance-repart-image-verity-store.nix index 3834d0a468ab..ef0fda4f780d 100644 --- a/nixos/tests/appliance-repart-image-verity-store.nix +++ b/nixos/tests/appliance-repart-image-verity-store.nix @@ -29,13 +29,6 @@ options = [ "mode=0755" ]; }; - "/usr" = { - device = "/dev/mapper/usr"; - # explicitly mount it read-only otherwise systemd-remount-fs will fail - options = [ "ro" ]; - fsType = config.image.repart.partitions.${partitionIds.store}.repartConfig.Format; - }; - # bind-mount the store "/nix/store" = { device = "/usr/nix/store"; diff --git a/nixos/tests/moosefs.nix b/nixos/tests/moosefs.nix index ca351c3a8855..633e872f0d30 100644 --- a/nixos/tests/moosefs.nix +++ b/nixos/tests/moosefs.nix @@ -12,6 +12,7 @@ import ./make-test-python.nix ( services.moosefs.master = { enable = true; openFirewall = true; + autoInit = true; exports = [ "* / rw,alldirs,admin,maproot=0:0" "* . rw" @@ -76,8 +77,6 @@ import ./make-test-python.nix ( # prepare master server master.start() master.wait_for_unit("multi-user.target") - master.succeed("mfsmaster-init") - master.succeed("systemctl restart mfs-master") master.wait_for_unit("mfs-master.service") metalogger.wait_for_unit("mfs-metalogger.service") diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 56354f205f24..20c7b060a78e 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchFromGitHub, meson, ninja, pkg-config, @@ -19,19 +19,18 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.4.3"; + version = "0.4.5"; outputs = [ "out" "dev" ]; - src = fetchFromGitLab { - domain = "git.pwmt.org"; + src = fetchFromGitHub { owner = "pwmt"; repo = "girara"; - rev = version; - hash = "sha256-/bJXdLXksTxUFC3w7zuBZY6Zh7tJxUJVbS87ENDQbDE="; + tag = version; + hash = "sha256-XjRmGgljlkvxwcbPmA9ZFAPAjbClSQDdmQU/GFeLLxI="; }; nativeBuildInputs = [ @@ -79,15 +78,15 @@ stdenv.mkDerivation rec { inherit zathura; }; - meta = with lib; { - homepage = "https://git.pwmt.org/pwmt/girara"; + meta = { + homepage = "https://pwmt.org/projects/girara"; description = "User interface library"; longDescription = '' girara is a library that implements a GTK based VIM-like user interface that focuses on simplicity and minimalism. ''; - license = licenses.zlib; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.zlib; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 7aa63a9b6dde..b23e88761577 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,8 +1,7 @@ { lib, stdenv, - fetchFromGitHub, - fetchpatch, + fetchurl, meson, ninja, wrapGAppsHook3, @@ -33,24 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zathura"; - version = "0.5.8"; + version = "0.5.11"; - src = fetchFromGitHub { - owner = "pwmt"; - repo = "zathura"; - rev = finalAttrs.version; - hash = "sha256-k6DEJpUA3s0mGxE38aYnX7uea98LrzevJhWW1abHo/c="; + src = fetchurl { + url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz"; + hash = "sha256-VEWKmZivD7j67y6TSoESe75LeQyG3NLIuPMjZfPRtTw="; }; - patches = [ - # https://github.com/pwmt/zathura/issues/664 - (fetchpatch { - name = "fix-build-on-macos.patch"; - url = "https://github.com/pwmt/zathura/commit/53f151f775091abec55ccc4b63893a8f9a668588.patch"; - hash = "sha256-d8lRdlBN1Kfw/aTjz8x0gvTKy+SqSYWHLQCjV7hF5MI="; - }) - ]; - outputs = [ "bin" "man" diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 282034cc6b38..6f5d5bcee4e1 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -16,6 +16,7 @@ zathura_cb (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) ], + stdenv, }: symlinkJoin { inherit (zathura_core) version; @@ -36,7 +37,12 @@ symlinkJoin { let fishCompletion = "share/fish/vendor_completions.d/zathura.fish"; in - '' + (lib.optionalString stdenv.hostPlatform.isLinux '' + makeWrapper ${zathura_core.bin}/bin/zathura-sandbox $out/bin/zathura-sandbox \ + --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ + --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura" + '') + + '' makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura" @@ -46,11 +52,11 @@ symlinkJoin { # so we need to fix the path to reference $out instead. rm "$out/${fishCompletion}" substitute "${zathura_core.out}/${fishCompletion}" "$out/${fishCompletion}" \ - --replace "${zathura_core.out}" "$out" + --replace-fail "${zathura_core.out}" "$out" ''; - meta = with lib; { - homepage = "https://pwmt.org/projects/zathura/"; + meta = { + homepage = "https://pwmt.org/projects/zathura"; description = "Highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the @@ -58,9 +64,9 @@ symlinkJoin { is an application that provides a minimalistic and space saving interface as well as an easy usage that mainly focuses on keyboard interaction. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ smironov globin TethysSvensson diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 74b54c7b84a5..3e34edc3c519 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "timoni"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-bztaG+agcByiIFR4vp0QCDzL9AvLJoZRyMjwSggtwio="; + hash = "sha256-WlsBW8c6x68oM6g/bVXzPgIglMn+rPcfJKXmUZPC0n0="; }; - vendorHash = "sha256-VHR5eQWC5e45ZcpCunrUPdvFKMETRZxHLZnl7FbyFcI="; + vendorHash = "sha256-mv9H0D99am/VXTP01sXQ+4Dt513Zmo0VffkUVPyF3Kk="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix index a97b3f7d37b6..6febd04f0aaf 100644 --- a/pkgs/applications/office/softmaker/desktop_items.nix +++ b/pkgs/applications/office/softmaker/desktop_items.nix @@ -1,4 +1,8 @@ -{ makeDesktopItem, pname, suiteName }: +{ + makeDesktopItem, + pname, + suiteName, +}: { planmaker = makeDesktopItem { diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index 4e731de72d18..39cf3351dace 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -1,27 +1,32 @@ -{ callPackage -, fetchurl +{ + callPackage, + fetchurl, # This is a bit unusual, but makes version and hash easily # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. -, officeVersion ? { - version = "1054"; - edition = "2021"; - hash = "sha256-dqmJUm0Qi1/GzGrI4OCHo1LwQ5KxMwZZw5EsYTMF6XU="; -} + officeVersion ? { + version = "1220"; + edition = "2024"; + hash = "sha256-F1Srm3/4UPifYls21MhjbpxSyLaT0gEVzEMQF0gIzi0="; + }, -, ... } @ args: + ... +}@args: -callPackage ./generic.nix (args // rec { - inherit (officeVersion) version edition; +callPackage ./generic.nix ( + args + // rec { + inherit (officeVersion) version edition; - pname = "freeoffice"; - suiteName = "FreeOffice"; + pname = "freeoffice"; + suiteName = "FreeOffice"; - src = fetchurl { - inherit (officeVersion) hash; - url = "https://www.softmaker.net/down/softmaker-freeoffice-${edition}-${version}-amd64.tgz"; - }; + src = fetchurl { + inherit (officeVersion) hash; + url = "https://www.softmaker.net/down/softmaker-freeoffice-${edition}-${version}-amd64.tgz"; + }; - archive = "freeoffice${edition}.tar.lzma"; -}) + archive = "freeoffice${edition}.tar.lzma"; + } +) diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index ab47d26f9862..a3fee9a114de 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -1,18 +1,40 @@ -{ lib, stdenv, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems +{ + lib, + stdenv, + autoPatchelfHook, + makeDesktopItem, + makeWrapper, + copyDesktopItems, # Dynamic Libraries -, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender + curl, + glib, + gst_all_1, + libGL, + libX11, + libXext, + libXmu, + libXrandr, + libXrender, # For fixing up execution of /bin/ls, which is necessary for # product unlocking. -, coreutils, libredirect + coreutils, + libredirect, # Extra utilities used by the SoftMaker applications. -, gnugrep, util-linux, which + gnugrep, + util-linux, + which, -, pname, version, edition, suiteName, src, archive + pname, + version, + edition, + suiteName, + src, + archive, -, ... + ... }: let @@ -20,7 +42,8 @@ let inherit makeDesktopItem pname suiteName; }; shortEdition = builtins.substring 2 2 edition; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { inherit pname src; version = "${edition}.${version}"; @@ -33,6 +56,9 @@ in stdenv.mkDerivation { buildInputs = [ curl + glib + gst_all_1.gstreamer + gst_all_1.gst-plugins-base libGL libX11 libXext @@ -56,66 +82,75 @@ in stdenv.mkDerivation { runHook postUnpack ''; - installPhase = let - # SoftMaker/FreeOffice collects some system information upon - # unlocking the product. But in doing so, it attempts to execute - # /bin/ls. If the execve syscall fails, the whole unlock - # procedure fails. This works around that by rewriting /bin/ls - # to the proper path. - # - # In addition, it expects some common utilities (which, whereis) - # to be in the path. - # - # SoftMaker Office restarts itself upon some operations, such - # changing the theme and unlocking. Unfortunately, we do not - # have control over its environment then and it will fail - # with an error. - extraWrapperArgs = '' - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \ - --prefix PATH : "${lib.makeBinPath [ coreutils gnugrep util-linux which ]}" + installPhase = + let + # SoftMaker/FreeOffice collects some system information upon + # unlocking the product. But in doing so, it attempts to execute + # /bin/ls. If the execve syscall fails, the whole unlock + # procedure fails. This works around that by rewriting /bin/ls + # to the proper path. + # + # In addition, it expects some common utilities (which, whereis) + # to be in the path. + # + # SoftMaker Office restarts itself upon some operations, such + # changing the theme and unlocking. Unfortunately, we do not + # have control over its environment then and it will fail + # with an error. + extraWrapperArgs = '' + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \ + --prefix PATH : "${ + lib.makeBinPath [ + coreutils + gnugrep + util-linux + which + ] + }" + ''; + in + '' + runHook preInstall + + mkdir -p $out/share + cp -r ${pname} $out/share/${pname}${edition} + + # Wrap rather than symlinking, so that the programs can determine + # their resource path. + mkdir -p $out/bin + makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \ + ${extraWrapperArgs} + makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ + ${extraWrapperArgs} + makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ + ${extraWrapperArgs} + + for size in 16 32 48 64 96 128 256 512 1024; do + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps + + for app in pml prl tml; do + ln -s $out/share/${pname}${edition}/icons/''${app}_''${size}.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/${pname}-''${app}.png + done + + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/mimetypes + + for mimetype in pmd prd tmd; do + ln -s $out/share/${pname}${edition}/icons/''${mimetype}_''${size}.png \ + $out/share/icons/hicolor/''${size}x''${size}/mimetypes/application-x-''${mimetype}.png + done + done + + # freeoffice 973 misses the 96x96 application icons, giving broken symbolic links + # remove broken symbolic links + find $out -xtype l -ls -exec rm {} \; + + # Add mime types + install -D -t $out/share/mime/packages ${pname}/mime/softmaker-*office*${shortEdition}.xml + + runHook postInstall ''; - in '' - runHook preInstall - - mkdir -p $out/share - cp -r ${pname} $out/share/${pname}${edition} - - # Wrap rather than symlinking, so that the programs can determine - # their resource path. - mkdir -p $out/bin - makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \ - ${extraWrapperArgs} - makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ - ${extraWrapperArgs} - makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ - ${extraWrapperArgs} - - for size in 16 32 48 64 96 128 256 512 1024; do - mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps - - for app in pml prl tml; do - ln -s $out/share/${pname}${edition}/icons/''${app}_''${size}.png \ - $out/share/icons/hicolor/''${size}x''${size}/apps/${pname}-''${app}.png - done - - mkdir -p $out/share/icons/hicolor/''${size}x''${size}/mimetypes - - for mimetype in pmd prd tmd; do - ln -s $out/share/${pname}${edition}/icons/''${mimetype}_''${size}.png \ - $out/share/icons/hicolor/''${size}x''${size}/mimetypes/application-x-''${mimetype}.png - done - done - - # freeoffice 973 misses the 96x96 application icons, giving broken symbolic links - # remove broken symbolic links - find $out -xtype l -ls -exec rm {} \; - - # Add mime types - install -D -t $out/share/mime/packages ${pname}/mime/softmaker-*office*${shortEdition}.xml - - runHook postInstall - ''; desktopItems = builtins.attrValues desktopItems; diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index 68f92c74a87c..8cc4bfada5c9 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -1,28 +1,33 @@ -{ callPackage -, fetchurl +{ + callPackage, + fetchurl, # This is a bit unusual, but makes version and hash easily # overridable. This is useful when people have an older version of # Softmaker Office or when the upstream archive was replaced and # nixpkgs is not in sync yet. -, officeVersion ? { - version = "1032"; - edition = "2021"; - hash = "sha256-LchSqLVBdkmWJQ8hCEvtwRPgIUSDE0URKPzCkEexGbc="; -} + officeVersion ? { + version = "1222"; + edition = "2024"; + hash = "sha256-eyYBK5ZxPcBakOvXUQZIU2aftyH6PXh/rtqC/1BJhg4="; + }, -, ... } @ args: + ... +}@args: -callPackage ./generic.nix (args // rec { - inherit (officeVersion) version edition; +callPackage ./generic.nix ( + args + // rec { + inherit (officeVersion) version edition; - pname = "softmaker-office"; - suiteName = "SoftMaker Office"; + pname = "softmaker-office"; + suiteName = "SoftMaker Office"; - src = fetchurl { - inherit (officeVersion) hash; - url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; - }; + src = fetchurl { + inherit (officeVersion) hash; + url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; + }; - archive = "office${edition}.tar.lzma"; -}) + archive = "office${edition}.tar.lzma"; + } +) diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index e63528037651..5a6135a4f3f9 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -2,11 +2,11 @@ let pname = "anytype"; - version = "0.43.4"; + version = "0.43.8"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; - hash = "sha256-2/+bLRx+iVTBDAH599+TpLquq/z/2FFJ5i6Mz8u4HuM="; + hash = "sha256-inqJvx5K/k97X50E0FYlzJDKqrVjAU6ZKIVdCWHr8NI="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { diff --git a/pkgs/tools/misc/asciinema-agg/default.nix b/pkgs/by-name/as/asciinema-agg/package.nix similarity index 73% rename from pkgs/tools/misc/asciinema-agg/default.nix rename to pkgs/by-name/as/asciinema-agg/package.nix index a053b7c191ed..b27627071e3a 100644 --- a/pkgs/tools/misc/asciinema-agg/default.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -3,26 +3,26 @@ rustPlatform, fetchFromGitHub, stdenv, - Security, + darwin, }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in rustPlatform.buildRustPackage rec { pname = "agg"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "asciinema"; repo = "agg"; rev = "v${version}"; - sha256 = "sha256-WCUYnveTWWQOzhIViMkSnyQ6vgLs5HDLWa/xvfZMh3A="; + hash = "sha256-bCE59NeITaCwgajgyXgP6jxtV7aPihPaZ/Uzh39Po1k="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "avt-0.8.0" = "sha256-5IN8P/2UWJ2EmkbbTSGWECTqiD8TeOd8LgwLZ+W2z90="; - }; - }; + strictDeps = true; + + cargoHash = "sha256-K472Qrsi2FIEOxFMi5CDgau2ODU0P3VDQEz/cwzmKiM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/by-name/bi/bigquery-emulator/package.nix b/pkgs/by-name/bi/bigquery-emulator/package.nix new file mode 100644 index 000000000000..0425cd5af5dd --- /dev/null +++ b/pkgs/by-name/bi/bigquery-emulator/package.nix @@ -0,0 +1,41 @@ +{ + buildGoModule, + pkgs, + fetchFromGitHub, + lib, +}: +let + version = "0.6.6"; + pname = "bigquery-emulator"; +in +buildGoModule.override + { + stdenv = pkgs.clangStdenv; + } + { + name = pname; + src = fetchFromGitHub { + owner = "goccy"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-iAVbxbm1G7FIWTB5g6Ff8h2dZjZssONA2MOCGuvK180="; + }; + + vendorHash = "sha256-TQlsivudutyPFW+3HHX7rYuoB5wafmDTAO1TElO/8pc="; + postPatch = '' + # main module does not contain package + rm -r internal/cmd/generator + ''; + + ldflags = [ "-s -w -X main.version=${version} -X main.revision=v${version}" ]; + doCheck = false; + + meta = with lib; { + description = "BigQuery emulator server implemented in Go."; + homepage = "https://github.com/goccy/bigquery-emulator"; + changelog = "https://github.com/goccy/pname/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ tarantoj ]; + mainProgram = "bigquery-emulator"; + }; + } diff --git a/pkgs/by-name/bl/bloomeetunes/package.nix b/pkgs/by-name/bl/bloomeetunes/package.nix new file mode 100644 index 000000000000..6265ac86e744 --- /dev/null +++ b/pkgs/by-name/bl/bloomeetunes/package.nix @@ -0,0 +1,62 @@ +{ + autoPatchelfHook, + lib, + fetchFromGitHub, + flutter324, + mpv, + pkg-config, + makeDesktopItem, + wrapGAppsHook3, + copyDesktopItems, +}: +flutter324.buildFlutterApplication rec { + pname = "bloomeetunes"; + version = "2.10.9"; + + src = fetchFromGitHub { + owner = "HemantKArya"; + repo = "BloomeeTunes"; + rev = "v${version}+152"; + hash = "sha256-Yv0aSq2eBcHKpy4PPjAhx194UW8Gm0UJlE+F+onZYFM="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + desktopItems = [ + (makeDesktopItem { + name = "bloomeetunes"; + exec = "bloomee"; + icon = "bloomeetunes"; + genericName = "Music Player"; + desktopName = "Bloomee Tunes"; + }) + ]; + + nativeBuildInputs = [ + pkg-config + autoPatchelfHook + wrapGAppsHook3 + copyDesktopItems + ]; + + postInstall = '' + install -Dm644 ./assets/icons/bloomee_new_logo_c.png $out/share/pixmaps/bloomeetunes.png + ''; + + extraWrapProgramArgs = '' + --prefix LD_LIBRARY_PATH : "$out/app/bloomeetunes/lib:${ + lib.makeLibraryPath [ + mpv + ] + }" + ''; + + meta = { + description = "Cross-platform music app designed to bring you ad-free tunes from various sources"; + homepage = "https://github.com/HemantKArya/BloomeeTunes"; + mainProgram = "bloomee"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json b/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json new file mode 100644 index 000000000000..934dde3f014a --- /dev/null +++ b/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json @@ -0,0 +1,1912 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "61.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.13.0" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "audio_service": { + "dependency": "direct main", + "description": { + "name": "audio_service", + "sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.18.15" + }, + "audio_service_mpris": { + "dependency": "direct main", + "description": { + "name": "audio_service_mpris", + "sha256": "b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.5" + }, + "audio_service_platform_interface": { + "dependency": "transitive", + "description": { + "name": "audio_service_platform_interface", + "sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "audio_service_web": { + "dependency": "transitive", + "description": { + "name": "audio_service_web", + "sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "audio_session": { + "dependency": "direct main", + "description": { + "name": "audio_session", + "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.21" + }, + "audio_video_progress_bar": { + "dependency": "direct main", + "description": { + "name": "audio_video_progress_bar", + "sha256": "67f3a5ea70d48b48caaf29f5a0606284a6aa3a393736daf9e82bec985d2f9b70", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "badges": { + "dependency": "direct main", + "description": { + "name": "badges", + "sha256": "a7b6bbd60dce418df0db3058b53f9d083c22cdb5132a052145dc267494df0b84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "bloc": { + "dependency": "transitive", + "description": { + "name": "bloc", + "sha256": "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.4" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.12" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "cached_network_image": { + "dependency": "direct main", + "description": { + "name": "cached_network_image", + "sha256": "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "cached_network_image_platform_interface": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_platform_interface", + "sha256": "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "cached_network_image_web": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_web", + "sha256": "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "carousel_slider": { + "dependency": "direct main", + "description": { + "name": "carousel_slider", + "sha256": "7b006ec356205054af5beaef62e2221160ea36b90fb70a35e4deacd49d0349ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "224a77051d52a11fbad53dd57827594d3bd24f945af28bd70bab376d68d437f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.4" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "dart_des": { + "dependency": "direct main", + "description": { + "name": "dart_des", + "sha256": "0a66afb8883368c824497fd2a1fd67bdb1a785965a3956728382c03d40747c33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "dartx": { + "dependency": "transitive", + "description": { + "name": "dartx", + "sha256": "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.2" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "easy_debounce": { + "dependency": "direct main", + "description": { + "name": "easy_debounce", + "sha256": "f082609cfb8f37defb9e37fc28bc978c6712dedf08d4c5a26f820fa10165a236", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "equatable": { + "dependency": "direct main", + "description": { + "name": "equatable", + "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "extended_image": { + "dependency": "direct main", + "description": { + "name": "extended_image", + "sha256": "9786aab821aac117763d6e4419cd49f5031fbaacfe3fd212c5b313d0334c37a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.2.1" + }, + "extended_image_library": { + "dependency": "transitive", + "description": { + "name": "extended_image_library", + "sha256": "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.5" + }, + "fading_edge_scrollview": { + "dependency": "transitive", + "description": { + "name": "fading_edge_scrollview", + "sha256": "c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.7" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_bloc": { + "dependency": "direct main", + "description": { + "name": "flutter_bloc", + "sha256": "b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.6" + }, + "flutter_cache_manager": { + "dependency": "transitive", + "description": { + "name": "flutter_cache_manager", + "sha256": "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "flutter_displaymode": { + "dependency": "direct main", + "description": { + "name": "flutter_displaymode", + "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "flutter_downloader": { + "dependency": "direct main", + "description": { + "name": "flutter_downloader", + "sha256": "b6da5495b6258aa7c243d0f0a5281e3430b385bccac11cc508f981e653b25aa6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.8" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.21" + }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "e12415c3bce49bcbc3fed383f0ea41ad7d828f6cf0eccba0588ffa5a812fe522", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.82.1" + }, + "flutter_svg": { + "dependency": "transitive", + "description": { + "name": "flutter_svg", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.10+1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "freezed_annotation": { + "dependency": "transitive", + "description": { + "name": "freezed_annotation", + "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "fuzzywuzzy": { + "dependency": "direct main", + "description": { + "name": "fuzzywuzzy", + "sha256": "3004379ffd6e7f476a0c2091f38f16588dc45f67de7adf7c41aa85dec06b432c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "go_router": { + "dependency": "direct main", + "description": { + "name": "go_router", + "sha256": "e1a30a66d734f9e498b1b6522d6a75ded28242bad2359a9158df38a1c30bcf1f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.2.0" + }, + "google_nav_bar": { + "dependency": "direct main", + "description": { + "name": "google_nav_bar", + "sha256": "1c8e3882fa66ee7b74c24320668276ca23affbd58f0b14a24c1e5590f4d07ab0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.6" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "html_unescape": { + "dependency": "direct main", + "description": { + "name": "html_unescape", + "sha256": "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_client_helper": { + "dependency": "transitive", + "description": { + "name": "http_client_helper", + "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "icons_plus": { + "dependency": "direct main", + "description": { + "name": "icons_plus", + "sha256": "8e2f601b8605d45dd55b106a0da084a1809125077a49574ca22e8bcd5b6e86f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "infinite_listview": { + "dependency": "transitive", + "description": { + "name": "infinite_listview", + "sha256": "f6062c1720eb59be553dfa6b89813d3e8dd2f054538445aaa5edaddfa5195ce6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "isar": { + "dependency": "direct main", + "description": { + "name": "isar", + "sha256": "e17a9555bc7f22ff26568b8c64d019b4ffa2dc6bd4cb1c8d9b269aefd32e53ad", + "url": "https://pub.isar-community.dev" + }, + "source": "hosted", + "version": "3.1.8" + }, + "isar_flutter_libs": { + "dependency": "direct main", + "description": { + "name": "isar_flutter_libs", + "sha256": "78710781e658ce4bff59b3f38c5b2735e899e627f4e926e1221934e77b95231a", + "url": "https://pub.isar-community.dev" + }, + "source": "hosted", + "version": "3.1.8" + }, + "isar_generator": { + "dependency": "direct dev", + "description": { + "name": "isar_generator", + "sha256": "484e73d3b7e81dbd816852fe0b9497333118a9aeb646fd2d349a62cc8980ffe1", + "url": "https://pub.isar-community.dev" + }, + "source": "hosted", + "version": "3.1.8" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "just_audio": { + "dependency": "direct main", + "description": { + "name": "just_audio", + "sha256": "d8e8aaf417d33e345299c17f6457f72bd4ba0c549dc34607abb5183a354edc4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.40" + }, + "just_audio_media_kit": { + "dependency": "direct main", + "description": { + "name": "just_audio_media_kit", + "sha256": "7f57d317fafa04cb3e70b924e8f632ffb7eca7a97a369e1e44738ed89fbd5da1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "just_audio_platform_interface": { + "dependency": "transitive", + "description": { + "name": "just_audio_platform_interface", + "sha256": "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "just_audio_web": { + "dependency": "transitive", + "description": { + "name": "just_audio_web", + "sha256": "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.11" + }, + "just_audio_windows": { + "dependency": "direct main", + "description": { + "name": "just_audio_windows", + "sha256": "48ab2dec79cf6097550602fe07b1a644f341450e138dc8fdc23e42ce0ed2d928", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "marquee": { + "dependency": "direct main", + "description": { + "name": "marquee", + "sha256": "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "media_kit": { + "dependency": "transitive", + "description": { + "name": "media_kit", + "sha256": "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.10+1" + }, + "media_kit_libs_linux": { + "dependency": "direct main", + "description": { + "name": "media_kit_libs_linux", + "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "metadata_god": { + "dependency": "direct main", + "description": { + "name": "metadata_god", + "sha256": "cf13931c39eba0b9443d16e8940afdabee125bf08945f18d4c0d02bcae2a3317", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.2+1" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "modal_bottom_sheet": { + "dependency": "direct main", + "description": { + "name": "modal_bottom_sheet", + "sha256": "eac66ef8cb0461bf069a38c5eb0fa728cee525a531a8304bd3f7b2185407c67e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "numberpicker": { + "dependency": "direct main", + "description": { + "name": "numberpicker", + "sha256": "4c129154944b0f6b133e693f8749c3f8bfb67c4d07ef9dcab48b595c22d1f156", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "octo_image": { + "dependency": "transitive", + "description": { + "name": "octo_image", + "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "palette_generator": { + "dependency": "direct main", + "description": { + "name": "palette_generator", + "sha256": "d50fbcd69abb80c5baec66d700033b1a320108b1aa17a5961866a12c0abb7c0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.3+4" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.10" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.12" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.5" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "d220eb8476b466d58b161e10b3001d93999010a26228a3fb89c4280db1249546", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+1" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.2" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "provider": { + "dependency": "transitive", + "description": { + "name": "provider", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "puppeteer": { + "dependency": "transitive", + "description": { + "name": "puppeteer", + "sha256": "de3f921154e5d336b14cdc05b674ac3db5701a5338f3cb0042868a5146f16e67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.12.0" + }, + "receive_sharing_intent": { + "dependency": "direct main", + "description": { + "name": "receive_sharing_intent", + "sha256": "f127989f8662ea15e193bd1e10605e5a0ab6bb92dffd51f3ce002feb0ce24c93", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.8.0" + }, + "responsive_framework": { + "dependency": "direct main", + "description": { + "name": "responsive_framework", + "sha256": "52367ab0c3479b3a5342dec3b74a3d47c4cc1b45bb5d38f720c2e002ebccd4ee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "rxdart": { + "dependency": "direct main", + "description": { + "name": "rxdart", + "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.27.7" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "scrollable_positioned_list": { + "dependency": "direct main", + "description": { + "name": "scrollable_positioned_list", + "sha256": "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.8" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "3ef39599b00059db0990ca2e30fca0a29d8b37aae924d60063f8e0184cf20900", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.2.2" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.0" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "sliding_up_panel": { + "dependency": "direct main", + "description": { + "name": "sliding_up_panel", + "sha256": "578e90956a6212d1e406373250b2436a0f3afece29aee3c24c8360094d6cf968", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0+1" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3+1" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4+2" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "string_similarity": { + "dependency": "direct main", + "description": { + "name": "string_similarity", + "sha256": "b4b73ec3af3e4203504b136dfbcdbca29edea4eb373684811b76ded9f40a54b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "time": { + "dependency": "transitive", + "description": { + "name": "time", + "sha256": "ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "tuple": { + "dependency": "transitive", + "description": { + "name": "tuple", + "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.9" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.4" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.5" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.4" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "xxh3": { + "dependency": "transitive", + "description": { + "name": "xxh3", + "sha256": "a92b30944a9aeb4e3d4f3c3d4ddb3c7816ca73475cd603682c4f8149690f56d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "youtube_explode_dart": { + "dependency": "direct main", + "description": { + "name": "youtube_explode_dart", + "sha256": "28dca07fefb4b6518beab95f0c1ef81031f921ed0fe87ebcd9c51378546edfee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.22.0" + } +} diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix index 00b9c2227b90..f0c0e1c6a3fc 100644 --- a/pkgs/by-name/et/etesync-dav/package.nix +++ b/pkgs/by-name/et/etesync-dav/package.nix @@ -1,23 +1,23 @@ -{ lib -, stdenv -, nixosTests -, python3 -, fetchFromGitHub -, radicale +{ + lib, + stdenv, + nixosTests, + python3Packages, + fetchFromGitHub, + radicale, }: - -python3.pkgs.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.32.1-unstable-2024-09-02"; + version = "0.33.4"; src = fetchFromGitHub { owner = "etesync"; repo = "etesync-dav"; - rev = "b9b23bf6fba60d42012008ba06023bccd9109c08"; - hash = "sha256-wWhwnOlwE1rFgROTSj90hlSw4k48fIEdk5CJOXoecuQ="; + tag = "v${version}"; + hash = "sha256-g+rK762tSWPDaBsaTwpTzfK/lqVs+Z/Qrpq2HCpipQE="; }; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ appdirs etebase etesync @@ -25,10 +25,11 @@ python3.pkgs.buildPythonApplication { flask-wtf msgpack setuptools - (python.pkgs.toPythonModule (radicale.override { python3 = python; })) + (python3Packages.toPythonModule (radicale.override { python3 = python; })) requests types-setuptools - ] ++ requests.optional-dependencies.socks; + requests.optional-dependencies.socks + ]; doCheck = false; @@ -36,12 +37,15 @@ python3.pkgs.buildPythonApplication { inherit (nixosTests) etesync-dav; }; - meta = with lib; { - homepage = "https://www.etesync.com/"; + meta = { + homepage = "https://www.etesync.com"; description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks"; mainProgram = "etesync-dav"; - license = licenses.gpl3; - maintainers = with maintainers; [ thyol valodim ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + thyol + valodim + ]; broken = stdenv.hostPlatform.isDarwin; # pyobjc-framework-Cocoa is missing }; } diff --git a/pkgs/by-name/fi/fido2-manage/package.nix b/pkgs/by-name/fi/fido2-manage/package.nix index 08cfd6a6e0d5..633a148451e4 100644 --- a/pkgs/by-name/fi/fido2-manage/package.nix +++ b/pkgs/by-name/fi/fido2-manage/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "fido2-manage"; - version = "0-unstable-2024-09-24"; + version = "0-unstable-2024-11-22"; src = fetchFromGitHub { owner = "token2"; repo = "fido2-manage"; - rev = "6aef9ceccdf7bcc60a9298e51a4db633256925df"; - hash = "sha256-rXTL6wpdvCifakmxH14wBLbhTptNYNFGEPskpUy3IjA="; + rev = "2c14b222a432e34750bb3929c620bbdffd1c75be"; + hash = "sha256-xdElYXx+F2XCP5zsbRTmTRyHKGnEt97jNRrQM0Oab5E="; }; icon = fetchurl { @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { ''; desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ - (makeDesktopItem rec { + (makeDesktopItem { desktopName = "Fido2 Manager"; name = "fido2-manage"; exec = "fido2-manage-gui"; diff --git a/pkgs/by-name/li/libetonyek/package.nix b/pkgs/by-name/li/libetonyek/package.nix index ec7b9b4a82d1..d366e19e304f 100644 --- a/pkgs/by-name/li/libetonyek/package.nix +++ b/pkgs/by-name/li/libetonyek/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libetonyek"; - version = "0.1.10"; + version = "0.1.12"; src = fetchFromGitHub { owner = "LibreOffice"; repo = "libetonyek"; rev = "libetonyek-${version}"; - hash = "sha256-wgyeQj1sY78sbbZT+NZuq9HEKB+ta7wwipbfN3JkyyU="; + hash = "sha256-dvYbV+7IakgOkGsZ+zaW+qgn/QoD6Jwq/juaE+7iYug="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index c0d1f224b387..ebd2c9f4b3d7 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -8,23 +8,23 @@ let hlsJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.17/dist/hls.min.js"; - hash = "sha256-SEBU6M0D0/bReB+39AK9wxjYpMUn+TOpXGJOJ8yalHA="; + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.18/dist/hls.min.js"; + hash = "sha256-X/LXFN4wvkKPx3sT4B25pLTPAV6bTWs+iGS2XT19Ptc="; }; in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.9.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-2qFJujfnlpmiOAmDBPl3hrbbHDOZOWFy8Yh2VOU0FEI="; + hash = "sha256-nz+8soxZ6lyc0saB4U3tDsTtqA0kV886M95cA3Gn3R0="; }; - vendorHash = "sha256-6MHtYrHZF3Oo53MV1Di0wGw9Xk+2CMei2XeoI0OcKsQ="; + vendorHash = "sha256-Csa8G+ji/OoTItu3XbGOySqmNMVdr7QqE8SNCba8cbI="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js @@ -32,7 +32,7 @@ buildGoModule rec { # disable binary-only rpi camera support substituteInPlace internal/staticsources/rpicamera/camera_disabled.go \ - --replace-fail '!linux || (!arm && !arm64)' 'linux' + --replace-fail '!linux || (!arm && !arm64)' 'linux || !linux' substituteInPlace internal/staticsources/rpicamera/{component,camera,params_serialize,pipe}.go \ --replace-fail '(linux && arm) || (linux && arm64)' 'linux && !linux' substituteInPlace internal/staticsources/rpicamera/component_32.go \ diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index e1237e95ddce..d83ada41b6ae 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -8,11 +8,11 @@ }: let - metaCommon = with lib; { + metaCommon = { description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal"; homepage = "https://docs.temporal.io/cli"; - license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aaronjheng ]; }; overrideModAttrs = old: { @@ -24,16 +24,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-KDJtCqx9Yp/zhutSElFveWYAKwJCckiM9k3FOtYTlLo="; + hash = "sha256-7wURMdi357w5S4s909PTUZanRzFyWM588DMY7iYWP88="; }; - vendorHash = "sha256-Vur3e6olkC0Ewz/RDZe2AIpcIs5GqeVgJa+KO9g8X7o="; + vendorHash = "sha256-umGwew8RwewlYJQD1psYSd9bu67cPEiHBJkQRJGjyGY="; inherit overrideModAttrs; diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index 477ef4db8b17..920952d7e4d4 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "terramate"; - version = "0.10.8"; + version = "0.11.4"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-fT1yuFFHI88wUXKguWZD+PHU4j3w5eda7kzCDn+Gg+o="; + hash = "sha256-RZBafDaSGW01EdvDg8RUynrSO84/pkh3OcVXlSsZ+ao="; }; - vendorHash = "sha256-kjzpXOoyTwjpYLBqDuB6Eup5Yzgej2U+HUo4z8V+cEI="; + vendorHash = "sha256-PwMxmls7sL9RhgvGKKDwxAeObk7HVBtYLOsIYt90dVU="; # required for version info nativeBuildInputs = [ git ]; diff --git a/pkgs/by-name/ti/timewall/package.nix b/pkgs/by-name/ti/timewall/package.nix index 42f128fb409e..216d2ebe5771 100644 --- a/pkgs/by-name/ti/timewall/package.nix +++ b/pkgs/by-name/ti/timewall/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "timewall"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "bcyran"; repo = "timewall"; rev = version; - hash = "sha256-OVLiuYxldk59TbggKNfPtaADz0B6pZ91gP6B6aEjEV8="; + hash = "sha256-B3pZCjl7Z78vAYYzceicwjmGfTbzYgrhpldUJnY8Aqs="; }; - cargoHash = "sha256-2Ij5bv/M6QXXugMg+tvsXc/38hWzk9lrz990+o+3igI="; + cargoHash = "sha256-AYfRZyUitUgWIeDbg00RFbs+VLnIJFHrdpUcjDlkwE8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 763d671f28be..6dba2492e242 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.10.8"; + version = "1.10.9"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-2UOz8o+3jWppk6lWatbG0avcqBFpxHYSMEspCpFWWOk="; + hash = "sha256-sU2eJUUw7crvzMGGBQP6rbxISkL+S5nmT3QspyYXlRQ="; }; pnpmDeps = pnpm.fetchDeps { diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix index 25bb7db6b14e..e2c93b092fd0 100644 --- a/pkgs/by-name/ve/venera/package.nix +++ b/pkgs/by-name/ve/venera/package.nix @@ -9,27 +9,25 @@ }: flutter327.buildFlutterApplication rec { pname = "venera"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "venera-app"; repo = "venera"; tag = "v${version}"; - hash = "sha256-wahQ3SCuPCloJ7eB8U051aSLHXf8FyQv+fEq58fonj4="; + hash = "sha256-zf3KeSoMLmXdD0aEYRPN5IYy0LdMYpqOkCFDmLi2ix0="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { desktop_webview_window = "sha256-15tw3gLN9e886QjBFuYP34KLD1lN8AmQYXVza5Bvs40="; - flutter_qjs = "sha256-IeOuw2oh3WpuYQgfE77BoPU8Qukp4l8SSmZtHebKU4M="; - flutter_to_arch = "sha256-DdP82Bdl58XW/BxMyWV3Vh4JYC2DNTjZcQB0fvw72fA="; - lodepng_flutter = "sha256-puw+eVe/ZtzV+PTsC0WmP0YLuWu5slFY0r0v/SHyzHI="; + flutter_qjs = "sha256-SvOgcZquwZ1/HWVkPVnD8Eo+jD3jjfkKsVleJpNaiV0="; + lodepng_flutter = "sha256-bGc9uXD1EQ/19OIZmR7a/YL9w93fNWdQF5S19LSwxZw="; photo_view = "sha256-Z+9xgvk8YS+bgCbBW7BBY72tV6JUq2kCX5OwKFK4YPE="; scrollable_positioned_list = "sha256-6XmBlNxE7DEqY2LsEFtVrshn2Xt55XnmaiTq+tiPInA="; - zip_flutter = "sha256-104/tGShkLAOYw9dC/yrt/qnm0NZ+Jk7nkbt3lPcYA8="; webdav_client = "sha256-Dz/4qW+cYGyNtK8S/abFslwQNroidgrHl7oJw3uXIqM="; - flutter_saf = "sha256-Blh2YxRlO3U/N6GmCnXhNevQYruWT1Zzl/P2gHSva6k="; + flutter_saf = "sha256-haY4eabTwUUBTpwenK0ILKpLggrtjVQszcmlpirEeTU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json index 5fb541585bc2..ee6895dc7537 100644 --- a/pkgs/by-name/ve/venera/pubspec.lock.json +++ b/pkgs/by-name/ve/venera/pubspec.lock.json @@ -507,8 +507,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "ade0b9d", - "resolved-ref": "ade0b9d67331118c13a2b836684858e251512373", + "ref": "1657f62fe7545ac43a339e0a5ee2b82bacd81e9f", + "resolved-ref": "1657f62fe7545ac43a339e0a5ee2b82bacd81e9f", "url": "https://github.com/wgh136/flutter_qjs" }, "source": "git", @@ -538,8 +538,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "3315082b9f7055655610e4f6f136b69e48228c05", - "resolved-ref": "3315082b9f7055655610e4f6f136b69e48228c05", + "ref": "7637b8b67d0a831f3cd7e702b8173e300880d32e", + "resolved-ref": "7637b8b67d0a831f3cd7e702b8173e300880d32e", "url": "https://github.com/pkuislm/flutter_saf.git" }, "source": "git", @@ -554,12 +554,11 @@ "flutter_to_arch": { "dependency": "direct dev", "description": { - "path": ".", - "ref": "HEAD", - "resolved-ref": "15bfead0380fda79b0256b37c73b886b0882f1bf", - "url": "https://github.com/wgh136/flutter_to_arch" + "name": "flutter_to_arch", + "sha256": "656cffc182b05af38aa96a1115931620b8865c4b0cfe00813b26fcff0875f2ab", + "url": "https://pub.dev" }, - "source": "git", + "source": "hosted", "version": "1.0.0" }, "flutter_to_debian": { @@ -782,8 +781,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "d1c96cd6503103b3270dfe2f320d4a1c93780f53", - "resolved-ref": "d1c96cd6503103b3270dfe2f320d4a1c93780f53", + "ref": "9a784b193af5d55b2a35e58fa390bda3e4f35d00", + "resolved-ref": "9a784b193af5d55b2a35e58fa390bda3e4f35d00", "url": "https://github.com/venera-app/lodepng_flutter" }, "source": "git", @@ -1401,17 +1400,16 @@ "zip_flutter": { "dependency": "direct main", "description": { - "path": ".", - "ref": "HEAD", - "resolved-ref": "d5721f1fd8179ee4a5db59f932ae7c89d94e12a0", - "url": "https://github.com/wgh136/zip_flutter" + "name": "zip_flutter", + "sha256": "955b53d58709fcd9feefbed3d41b5522bc5273e677603e9fc67017a81e568d24", + "url": "https://pub.dev" }, - "source": "git", - "version": "0.0.1" + "source": "hosted", + "version": "0.0.5" } }, "sdks": { "dart": ">=3.6.0 <4.0.0", - "flutter": ">=3.27.0" + "flutter": ">=3.27.1" } } diff --git a/pkgs/by-name/wi/windterm/package.nix b/pkgs/by-name/wi/windterm/package.nix new file mode 100644 index 000000000000..ad142c977a3f --- /dev/null +++ b/pkgs/by-name/wi/windterm/package.nix @@ -0,0 +1,104 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + fontconfig, + freetype, + libGL, + glib, + alsa-lib, + pulseaudio, + xorg, + gtk3, + atk, + pango, + gdk-pixbuf, + cairo, + gst_all_1, + makeWrapper, + libsForQt5, + profiles ? { + path = "~"; + }, +}: +stdenv.mkDerivation rec { + pname = "windterm"; + version = "2.6.1"; + + src = fetchurl { + url = "https://github.com/kingToolbox/WindTerm/releases/download/2.6.0/WindTerm_${version}_Linux_Portable_x86_64.tar.gz"; + hash = "sha256-JwTsfUkESl2vUx48TanKYAOVWw6q4xGY+i0PrN9GfpA="; + }; + + dontBuild = true; + + nativeBuildInputs = [ + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + xorg.libxcb + xorg.xcbutil + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + libsForQt5.qt5.qtbase + libsForQt5.qt5.qtmultimedia + fontconfig + freetype + libGL + glib + alsa-lib + pulseaudio + gst_all_1.gst-plugins-base + xorg.libXtst + gtk3 + atk + pango + gdk-pixbuf + cairo + (lib.getLib stdenv.cc.cc) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r ./* $out/ + find $out -type d -exec chmod 755 {} \; + find $out -type f -exec chmod 644 {} \; + find $out -type f -executable -exec chmod 755 {} \; + chmod 755 $out/WindTerm + mkdir -p $out/bin/ $out/share/applications/ $out/share/pixmaps/ $out/share/licenses/${pname}/ + cat > $out/profiles.config <