diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index a7e2010fe10e..0344a0aa2f3c 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -109,6 +109,9 @@ "modular-services": [ "index.html#modular-services" ], + "module-services-amule": [ + "index.html#module-services-amule" + ], "module-services-anubis": [ "index.html#module-services-anubis" ], diff --git a/nixos/modules/services/networking/amuled.md b/nixos/modules/services/networking/amuled.md new file mode 100644 index 000000000000..10124ad7bd22 --- /dev/null +++ b/nixos/modules/services/networking/amuled.md @@ -0,0 +1,30 @@ +# aMule {#module-services-amule} + +[aMule](https://www.amule.org/) is a free and open-source peer-to-peer file sharing client that supports the eD2k and Kad networks. +It allows users to search for, download, and share files with others on these networks. +The `amuled` daemon is the command-line version of aMule, designed to run as a background service without a graphical user interface, making it suitable for servers or headless systems. +It handles finding sources, managing download and upload queues, and interacting with the eD2k servers and Kad network. + +Here an example which also enables the web server and sets custom paths for the downloads: + +```nix +{ + services.amule = { + enable = true; + openPeerPorts = true; + openWebServerPort = true; + ExternalConnectPasswordFile = "/run/secrets/amule-password"; + WebServerPasswordFile = "/run/secrets/amule-web/password"; + settings = { + eMule = { + IncomingDir = "/mnt/hd/amule"; + TempDir = "/mnt/hd/amule/Temp"; + }; + WebServer.Enabled = 1; + }; + }; +} +``` + +You can connect using `amulegui` and choosing the host, port (`4712` by default) and password, the username is always `amule`. +Otherwise, if you enabled the web server, connect using the browser (port `4711` by default). diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index 0912cfb26abd..32e7dd7c46b2 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -1,89 +1,323 @@ { config, lib, - options, + utils, pkgs, ... }: let cfg = config.services.amule; - opt = options.services.amule; - user = if cfg.user != null then cfg.user else "amule"; -in -{ + settingsFormat = pkgs.formats.ini { }; - ###### interface + inherit (lib) + mkOption + mkEnableOption + mkPackageOption + types + optionalAttrs + mkIf + mkMerge + literalExpression + optionalString + optionals + getExe + ; - options = { - - services.amule = { - - enable = lib.mkOption { - type = lib.types.bool; - default = false; + settingsOptions = { + eMule = { + Port = mkOption { + type = types.port; + default = 4662; description = '' - Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time. + TCP port for eD2k connections. + Required for connecting to servers and achieving a High ID. ''; }; - - dataDir = lib.mkOption { - type = lib.types.str; - default = "/home/${user}/"; - defaultText = lib.literalExpression '' - "/home/''${config.${opt.user}}/" - ''; + UDPPort = mkOption { + type = types.port; + default = 4672; description = '' - The directory holding configuration, incoming and temporary files. + UDP port for eD2k traffic (searches, source exchange) and all Kad network communication. + Essential for a High ID on both networks and proper Kad functioning. ''; }; - - user = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = null; + TempDir = mkOption { + type = types.path; + default = "${cfg.dataDir}/Temp"; + defaultText = literalExpression "\${config.services.amule.dataDir}/Temp"; description = '' - The user the AMule daemon should run as. + Directory where aMule stores incomplete downloads (.part/.part.met files). ''; }; - + IncomingDir = mkOption { + type = types.path; + default = "${cfg.dataDir}/Incoming"; + defaultText = literalExpression "\${config.services.amule.dataDir}/Incoming"; + description = '' + Directory where aMule moves completed downloads. + Files in this directory are automatically shared. + Ensure the aMule service has write permissions + ''; + }; + OSDirectory = mkOption { + type = types.path; + default = cfg.dataDir; + defaultText = literalExpression "\${config.services.amule.dataDir}"; + description = "On-disk state directory, probably you don't want to change this"; + internal = true; + }; + }; + ExternalConnect = { + AcceptExternalConnections = mkOption { + type = types.enum [ + 0 + 1 + ]; + default = 1; + description = "Whether to accept external connections, if disabled amuled refuses to start"; + internal = true; + }; + ECPort = mkOption { + type = types.port; + default = 4712; + description = "TCP port for external connections, like remote control via amule-gui"; + }; + ECPassword = mkOption { + type = types.str; + default = ""; + description = '' + MD5 hash of the password, obtainaible with `echo "" | md5sum | cut -d ' ' -f 1` + ''; + }; + }; + WebServer = { + Enabled = lib.mkOption { + type = types.enum [ + 0 + 1 + ]; + default = 0; + description = "Set to 1 to enable the web server"; + }; + Password = mkOption { + type = types.str; + default = ""; + description = '' + MD5 hash of the password, obtainaible with `echo "" | md5sum | cut -d ' ' -f 1` + ''; + }; + Port = mkOption { + type = types.port; + default = 4711; + description = "Web server port"; + }; }; - }; - ###### implementation + webServerEnabled = cfg.settings.WebServer.Enabled == 1; +in +{ + options.services.amule = { + enable = mkEnableOption "aMule daemon"; - config = lib.mkIf cfg.enable { + package = mkPackageOption pkgs "amule-daemon" { }; - users.users = lib.mkIf (cfg.user == null) [ + amuleWebPackage = mkPackageOption pkgs "amule-web" { }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Additional passed arguments"; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/amuled"; + description = "Directory holding configuration and by default also incoming and temporary files"; + }; + + user = mkOption { + type = types.str; + default = "amule"; + description = "The user the aMule daemon should run as"; + }; + + group = mkOption { + type = types.str; + default = "amule"; + description = "Group under which amule runs"; + }; + + openPeerPorts = mkEnableOption "open the peer port(s) in the firewall"; + + openExternalConnectPort = mkEnableOption "open the external connect port"; + + openWebServerPort = mkEnableOption "open the web server port"; + + ExternalConnectPasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File containing the password for connecting with amule-gui, + set this only if you didn't set `settings.ExternalConnect.ECPassword` + ''; + }; + + WebServerPasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File containing the password for connecting to the web server, + set this only if you didn't set `settings.ExternalConnect.ECPassword` + ''; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + options = settingsOptions; + }; + description = '' + Free form attribute set for aMule settings. + The final configuration file is generated merging the default settings with these options. + ''; + example = literalExpression '' + { + eMule = { + IncomingDir = "/mnt/hd/amule/Incoming"; + TempDir = "/mnt/hd/amule/Temp"; + }; + WebServer.Enabled = 1; + } + ''; + default = { }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ { - name = "amule"; - description = "AMule daemon"; - group = "amule"; + assertion = isNull cfg.ExternalConnectPasswordFile -> cfg.settings.ExternalConnect.ECPassword != ""; + message = "Set only one between `ExternalConnectPasswordFile` and `settings.ExternalConnect.ECPassword`"; + } + ] + ++ optionals webServerEnabled [ + { + assertion = isNull cfg.WebServerPasswordFile -> cfg.settings.WebServer.Password != ""; + message = "Set only one between `ExternalWebServerFile` `settings.WebServer.Password`"; + } + ]; + + users.users = optionalAttrs (cfg.user == "amule") { + amule = { + group = cfg.group; + description = "aMule user"; + isSystemUser = true; uid = config.ids.uids.amule; - } - ]; + }; + }; - users.groups = lib.mkIf (cfg.user == null) [ - { - name = "amule"; - gid = config.ids.gids.amule; - } - ]; + users.groups = optionalAttrs (cfg.group == "amule") { + amule.gid = config.ids.gids.amule; + }; + + systemd.tmpfiles.settings."10-amuled".${cfg.dataDir}.d = { + inherit (cfg) user group; + mode = "0755"; + }; + + services.amule.settings = { + eMule.AppVersion = lib.getVersion cfg.package; + }; systemd.services.amuled = { description = "AMule daemon"; - wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.crudini ]; preStart = '' - mkdir -p ${cfg.dataDir} - chown ${user} ${cfg.dataDir} + AMULE_CONF="${cfg.dataDir}/amule.conf" + + if [ ! -f "$AMULE_CONF" ]; then + echo "First run detected: starting aMule to generate default configuration..." + echo "aMule will fail with an error - this is expected and normal" + rm -f ${cfg.dataDir}/lastversion + set +e + ${getExe cfg.package} --config-dir ${cfg.dataDir} + set -e + fi + '' + + (lib.concatMapAttrsStringSep "" ( + section: + lib.concatMapAttrsStringSep "" ( + param: value: '' + crudini --inplace --set "$AMULE_CONF" "${section}" "${param}" "${builtins.toString value}" + '' + ) + ) cfg.settings) + + optionalString (!isNull cfg.ExternalConnectPasswordFile) '' + EC_PASSWORD=$(cat ${cfg.ExternalConnectPasswordFile} | md5sum | cut -d ' ' -f 1) + crudini --inplace --set "$AMULE_CONF" "ExternalConnect" "ECPassword" "$EC_PASSWORD" + '' + + optionalString (!isNull cfg.WebServerPasswordFile) '' + WEB_PASSWORD=$(cat ${cfg.WebServerPasswordFile} | md5sum | cut -d ' ' -f 1) + crudini --inplace --set "$AMULE_CONF" "WebServer" "Password" "$WEB_PASSWORD" ''; - script = '' - ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \ - -c 'HOME="${cfg.dataDir}" ${pkgs.amule-daemon}/bin/amuled' - ''; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + + ExecStart = utils.escapeSystemdExecArgs ( + [ + (getExe cfg.package) + "--config-dir" + cfg.dataDir + ] + ++ optionals webServerEnabled [ "--use-amuleweb=${getExe cfg.amuleWebPackage}" ] + ++ cfg.extraArgs + ); + + Restart = "on-failure"; + RestartSec = "5s"; + + # Hardening + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + DevicePolicy = "closed"; + ProtectSystem = "strict"; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ReadWritePaths = [ + cfg.dataDir + cfg.settings.eMule.TempDir + cfg.settings.eMule.IncomingDir + ]; + RestrictAddressFamilies = "AF_INET"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + LockPersonality = true; + }; }; + + networking.firewall = mkMerge [ + (mkIf cfg.openPeerPorts { + allowedTCPPorts = [ cfg.settings.eMule.Port ]; + allowedUDPPorts = [ cfg.settings.eMule.UDPPort ]; + }) + (mkIf cfg.openWebServerPort { + allowedTCPPorts = [ cfg.settings.WebServer.Port ]; + }) + ]; + }; + + meta = { + maintainers = with lib.maintainers; [ aciceri ]; + doc = ./amuled.md; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index c12ed8350f25..6eeb435f31e2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild rec { pname = "ebuild-mode"; - version = "1.80"; + version = "1.81"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; - hash = "sha256-pQ177zp0UTk9Koq+yhgaGIeFziV7KFng+Z6sAZs7qzY="; + hash = "sha256-b+59Ec+NOHvFgbFOmnsvGjnq392VR1JCsPx/ORSdffo="; }; meta = { diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix index 791f01e1c906..87225a32e87b 100644 --- a/pkgs/by-name/am/amule/package.nix +++ b/pkgs/by-name/am/amule/package.nix @@ -3,6 +3,7 @@ enableDaemon ? false, # build amule daemon httpServer ? false, # build web interface for the daemon client ? false, # build amule remote gui + mainProgram ? "amule", fetchFromGitHub, fetchpatch, stdenv, @@ -103,10 +104,10 @@ stdenv.mkDerivation rec { no adware or spyware as is often found in proprietary P2P applications. ''; - homepage = "https://github.com/amule-project/amule"; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ aciceri ]; + inherit mainProgram; platforms = lib.platforms.unix; # Undefined symbols for architecture arm64: "_FSFindFolder" broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/bi/bilibili-tui/package.nix b/pkgs/by-name/bi/bilibili-tui/package.nix index 8cefe05b3c67..c582a809336d 100644 --- a/pkgs/by-name/bi/bilibili-tui/package.nix +++ b/pkgs/by-name/bi/bilibili-tui/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, stdenv, pkg-config, makeWrapper, @@ -13,16 +14,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "bilibili-tui"; - version = "1.0.6"; + version = "1.0.9"; src = fetchFromGitHub { owner = "MareDevi"; repo = "bilibili-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-nWUFcKQgUNaiVU0zgSB8LTdvUruc8fovCAembQz5w3I="; + hash = "sha256-LACNDpVhlYEgT3fN+Ff2MVipblUqPlqwOUpTLaXSCbk="; }; - cargoHash = "sha256-KvJpMQuvZM/s3b4/Pzmeucb95KeuuUx4bz3sJsKyLc8="; + cargoHash = "sha256-q3jRjmzQA64sZjVShoEmu1x2CFOAgBGgZYyTq7Lg4is="; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; @@ -41,6 +42,8 @@ rustPlatform.buildRustPackage (finalAttrs: { } ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Terminal user interface (TUI) client for Bilibili"; homepage = "https://maredevi.moe/projects/bilibili-tui/"; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index 7b1565fd93d5..cc5dbc5a705f 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Aviac"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-81435dgw7fy4igUN3TYNjRans8uRZ/6TQWBxu0benwU="; + hash = "sha256-o+Jf9JKDGsnSVV8sJcJddZG+9DBn6DB4HfaxLxxwa+U="; }; - cargoHash = "sha256-1E7UuDbJKrnhMQI6trk7nHkeywCPFg1021pQhRcb4kQ="; + cargoHash = "sha256-HBVswxako/Djv8ayhEfgGVaFWblNn6ngtbQh9jNaxcQ="; nativeBuildInputs = [ pkg-config installShellFiles diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix index df7d41f4883b..7bcc9283814b 100644 --- a/pkgs/by-name/co/contour/package.nix +++ b/pkgs/by-name/co/contour/package.nix @@ -5,6 +5,7 @@ cmake, pkg-config, boxed-cpp, + cairo, freetype, fontconfig, libunicode, @@ -28,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "contour"; - version = "0.6.1.7494"; + version = "0.6.2.8008"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "contour"; tag = "v${finalAttrs.version}"; - hash = "sha256-jgasZhdcJ+UF3VIl8HLcxBayvbA/dkaOG8UtANRgeP4="; + hash = "sha256-xbJxV1q7+ddhnH0jDYzqVHwARCD0EyVh3POFRkl4d1Q="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boxed-cpp + cairo fontconfig freetype libunicode @@ -79,8 +81,6 @@ stdenv.mkDerivation (finalAttrs: { darwin.libutil ]; - cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ]; - postInstall = '' mkdir -p $out/nix-support $terminfo/share '' diff --git a/pkgs/by-name/co/coordgenlibs/package.nix b/pkgs/by-name/co/coordgenlibs/package.nix index be43103068bb..e08f7cc9a3fc 100644 --- a/pkgs/by-name/co/coordgenlibs/package.nix +++ b/pkgs/by-name/co/coordgenlibs/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Schrodinger-developed 2D Coordinate Generation"; homepage = "https://github.com/schrodinger/coordgenlibs"; - changelog = "https://github.com/schrodinger/coordgenlibs/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/schrodinger/coordgenlibs/releases/tag/v${finalAttrs.version}"; maintainers = [ lib.maintainers.rmcgibbo ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index 6cc820c52ca7..d672b987265c 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - changelog = "https://github.com/cowsql/cowsql/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/cowsql/cowsql/releases/tag/v${finalAttrs.version}"; description = "Embeddable, replicated and fault tolerant SQL engine"; homepage = "https://github.com/cowsql/cowsql"; license = lib.licenses.lgpl3Only; diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix index bf1f125f3e39..2c6bf58109be 100644 --- a/pkgs/by-name/db/dbmate/package.nix +++ b/pkgs/by-name/db/dbmate/package.nix @@ -2,28 +2,41 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, + + # testing + sqlite, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "dbmate"; - version = "2.28.0"; + version = "2.29.3"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; - tag = "v${version}"; - hash = "sha256-DQTeLqlZmzfTQoJBTFTX8x3iplkmrl1cplDQQcCGCZM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-H/HBDM2uBRrlgetU2S9ZS1c6//Le+DlrYlnnJpTs3XM="; }; - vendorHash = "sha256-Js0hiRt6l3ur7+pfeYa35C17gr77NHvapaSrgF9cP8c="; + vendorHash = "sha256-wfcVb8fqnpT8smKuL6SPANAK86tLXglhQPZCA4G8P9E="; - doCheck = false; + tags = [ "fts5" ]; + + nativeCheckInputs = [ + sqlite + ]; + + passthru.updateScript = nix-update-script { }; meta = { description = "Database migration tool"; mainProgram = "dbmate"; homepage = "https://github.com/amacneil/dbmate"; - changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}"; + changelog = "https://github.com/amacneil/dbmate/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + sarahec + ]; }; -} +}) diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix index eb3d48f4bb6a..56264a50fdaa 100644 --- a/pkgs/by-name/de/delve/package.nix +++ b/pkgs/by-name/de/delve/package.nix @@ -3,16 +3,17 @@ buildGoModule, fetchFromGitHub, stdenv, + nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "delve"; version = "1.26.0"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tFd8g866nRSNUVNz+6SM6YLl4ys3AUP3c8eT1kWbjKY="; }; @@ -24,6 +25,11 @@ buildGoModule rec { subPackages = [ "cmd/dlv" ]; + ldflags = [ + "-s" + "-w" + ]; + hardeningDisable = [ "fortify" ]; preCheck = '' @@ -44,11 +50,17 @@ buildGoModule rec { ln $out/bin/dlv $out/bin/dlv-dap ''; + # delve doesn't support --version + doInstallCheck = false; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Debugger for the Go programming language"; homepage = "https://github.com/go-delve/delve"; + changelog = "https://github.com/go-delve/delve/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ vdemeester ]; license = lib.licenses.mit; mainProgram = "dlv"; }; -} +}) diff --git a/pkgs/by-name/ef/efficient-compression-tool/package.nix b/pkgs/by-name/ef/efficient-compression-tool/package.nix index 659fceca90f7..10da59dc6f3b 100644 --- a/pkgs/by-name/ef/efficient-compression-tool/package.nix +++ b/pkgs/by-name/ef/efficient-compression-tool/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Fast and effective C++ file optimizer"; homepage = "https://github.com/fhanau/Efficient-Compression-Tool"; - changelog = "https://github.com/fhanau/Efficient-Compression-Tool/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/fhanau/Efficient-Compression-Tool/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jwillikers diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 49cdbdf5ffd6..26ed6654cbb2 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -20,14 +20,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "freetube"; - version = "0.23.12-unstable-2026-01-15"; + version = "0.23.13"; src = fetchFromGitHub { owner = "FreeTubeApp"; repo = "FreeTube"; - # tag = "v${finalAttrs.version}-beta"; - rev = "e110a4b603e0f5f275d210aea005698a0d4b26ad"; - hash = "sha256-kq6twf7ce2987iHtwikPzolzzbxr1xcoirqUGpPG4V8="; + tag = "v${finalAttrs.version}-beta"; + hash = "sha256-vnqrl/2hxL0RQbLHkgRntyTRSWmhMM7hOi31r4pKCgs="; }; # Darwin requires writable Electron dist @@ -50,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-E6D2Uo06MAcnOKy00e5JoLdKQOeGVr7y7Lu6rZ1F82M="; + hash = "sha256-sM9CkDnATSEUf/uuUyT4JuRmjzwa1WzIyNYEw69MPtU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/freetube/patch-build-script.patch b/pkgs/by-name/fr/freetube/patch-build-script.patch index 91aa139eed4c..0e8baf9d4e3a 100644 --- a/pkgs/by-name/fr/freetube/patch-build-script.patch +++ b/pkgs/by-name/fr/freetube/patch-build-script.patch @@ -1,13 +1,13 @@ -diff --git a/_scripts/ebuilder.config.mjs b/_scripts/ebuilder.config.mjs -index 55e72b227..d218f5ac4 100644 ---- a/_scripts/ebuilder.config.mjs -+++ b/_scripts/ebuilder.config.mjs -@@ -2,6 +2,8 @@ import packageDetails from '../package.json' with { type: 'json' } +diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js +index 14d0d9df1..c5fc569c8 100644 +--- a/_scripts/ebuilder.config.js ++++ b/_scripts/ebuilder.config.js +@@ -1,6 +1,8 @@ + const { name, productName } = require('../package.json') - /** @type {import('electron-builder').Configuration} */ - export default { + const config = { + electronVersion: "@electron-version@", + electronDist: "electron-dist", - appId: `io.freetubeapp.${packageDetails.name}`, + appId: `io.freetubeapp.${name}`, copyright: 'Copyleft © 2020-2025 freetubeapp@protonmail.com', // asar: false, diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index 643f2c5c08f2..e788c5123485 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -68,7 +68,7 @@ pkg-config, poppler, proj, - python3, + python3Packages, qhull, rav1e, sqlite, @@ -98,8 +98,8 @@ stdenv.mkDerivation (finalAttrs: { doxygen graphviz pkg-config - python3.pkgs.setuptools - python3.pkgs.wrapPython + python3Packages.setuptools + python3Packages.wrapPython swig ] ++ lib.optionals useJava [ @@ -202,8 +202,8 @@ stdenv.mkDerivation (finalAttrs: { libwebp zlib zstd - python3 - python3.pkgs.numpy + python3Packages.python + python3Packages.numpy ] ++ tileDbDeps ++ libAvifDeps @@ -219,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: { ++ darwinDeps ++ nonDarwinDeps; - pythonPath = [ python3.pkgs.numpy ]; + pythonPath = [ python3Packages.numpy ]; postInstall = '' wrapPythonProgramsIn "$out/bin" "$out $pythonPath" '' @@ -238,14 +238,14 @@ stdenv.mkDerivation (finalAttrs: { pushd autotest export HOME=$(mktemp -d) - export PYTHONPATH="$out/${python3.sitePackages}:$PYTHONPATH" + export PYTHONPATH="$out/${python3Packages.python.sitePackages}:$PYTHONPATH" export GDAL_DOWNLOAD_TEST_DATA=OFF # allows to skip tests that fail because of file handle leak # the issue was not investigated # https://github.com/OSGeo/gdal/blob/v3.9.0/autotest/gdrivers/bag.py#L54 export CI=1 ''; - nativeInstallCheckInputs = with python3.pkgs; [ + nativeInstallCheckInputs = with python3Packages; [ pytestCheckHook pytest-benchmark pytest-env diff --git a/pkgs/by-name/gd/gdb-dashboard/package.nix b/pkgs/by-name/gd/gdb-dashboard/package.nix index 95be3cda0310..5aaf4218fecc 100644 --- a/pkgs/by-name/gd/gdb-dashboard/package.nix +++ b/pkgs/by-name/gd/gdb-dashboard/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Modular visual interface for GDB in Python"; homepage = "https://github.com/cyrus-and/gdb-dashboard"; downloadPage = "https://github.com/cyrus-and/gdb-dashboard"; - changelog = "https://github.com/cyrus-and/gdb-dashboard/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/cyrus-and/gdb-dashboard/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ethancedwards8 ]; }; diff --git a/pkgs/by-name/go/gomacro/package.nix b/pkgs/by-name/go/gomacro/package.nix index fb3cbeb8999c..6f41686bee14 100644 --- a/pkgs/by-name/go/gomacro/package.nix +++ b/pkgs/by-name/go/gomacro/package.nix @@ -1,10 +1,13 @@ { lib, - buildGoModule, + # Build fails with Go 1.25, with the following error: + # 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)' + # Wait for upstream to update their vendored dependencies before unpinning. + buildGo124Module, fetchFromGitHub, }: -buildGoModule { +buildGo124Module { pname = "gomacro"; version = "2.7-unstable-2024-01-07"; diff --git a/pkgs/by-name/ip/ipu6-camera-bins/package.nix b/pkgs/by-name/ip/ipu6-camera-bins/package.nix index 050de3108018..8ab771c47842 100644 --- a/pkgs/by-name/ip/ipu6-camera-bins/package.nix +++ b/pkgs/by-name/ip/ipu6-camera-bins/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { repo = "ipu6-camera-bins"; owner = "intel"; - rev = "30e87664829782811a765b0ca9eea3a878a7ff29"; + tag = "20250923_ov02e"; # Released on 2025-06-27 hash = "sha256-YPPzuK13o2jnRSB3ORoMUU5E9/IifKVSetAqZHRofhw="; }; diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix index 3ea8c890954e..0a2214e746ca 100644 --- a/pkgs/by-name/is/ispc/package.nix +++ b/pkgs/by-name/is/ispc/package.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; homepage = "https://ispc.github.io/"; - changelog = "https://github.com/ispc/ispc/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/ispc/ispc/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ thoughtpolice diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index ec34d7f2418c..db39b29bf0f7 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -9,7 +9,7 @@ let pname = "jai"; minor = "2"; - patch = "021"; + patch = "024"; version = "0.${minor}.${patch}"; zipName = "jai-beta-${minor}-${patch}.zip"; jai = stdenv.mkDerivation { @@ -20,7 +20,7 @@ let nix-store --add-fixed sha256 ${zipName} ''; name = zipName; - sha256 = "sha256-0hli9489cBtLzEcwN87sdh54hbkqtq3hCxqN9XxTX2U="; + sha256 = "sha256-vZonIbSxG5B/lk2YAj9lz+F3stNQn6tokhleFWnY7AI="; }; nativeBuildInputs = [ unzip ]; buildCommand = "unzip $src -d $out"; diff --git a/pkgs/by-name/li/libunicode/package.nix b/pkgs/by-name/li/libunicode/package.nix index 5ca5a5f77382..c1cfd06efdf6 100644 --- a/pkgs/by-name/li/libunicode/package.nix +++ b/pkgs/by-name/li/libunicode/package.nix @@ -7,26 +7,27 @@ catch2_3, fmt, python3, + simdImplementation ? "none", # see https://github.com/contour-terminal/libunicode/blob/v0.7.0/CMakeLists.txt#L53 for options }: let - ucd-version = "16.0.0"; + ucd-version = "17.0.0"; ucd-src = fetchzip { url = "https://www.unicode.org/Public/${ucd-version}/ucd/UCD.zip"; - hash = "sha256-GgEYjOLrxxfTAQsc2bpi7ShoAr3up8z7GXXpe+txFuw"; + hash = "sha256-k2OFy8xPvn+Bboyr1EsmZNeVDOglvk2kSZ+H17YaX60="; stripRoot = false; }; in stdenv.mkDerivation (final: { pname = "libunicode"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "libunicode"; - rev = "v${final.version}"; - hash = "sha256-zX33aTQ7Wgl8MABu+o6nA2HWrfXD4zQ9b3NDB+T2saI"; + tag = "v${final.version}"; + hash = "sha256-J8qawT1oiUO9xTVEMQvsY0K2NtIfkUq9PoCbFt6wqek="; }; # Fix: set_target_properties Can not find target to add properties to: Catch2, et al. @@ -41,7 +42,10 @@ stdenv.mkDerivation (final: { fmt ]; - cmakeFlags = [ "-DLIBUNICODE_UCD_DIR=${ucd-src}" ]; + cmakeFlags = [ + (lib.cmakeFeature "LIBUNICODE_SIMD_IMPLEMENTATION" simdImplementation) + (lib.cmakeFeature "LIBUNICODE_UCD_DIR" "${ucd-src}") + ]; meta = { description = "Modern C++20 Unicode library"; diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix index 7fad58679daf..c38a269f0121 100644 --- a/pkgs/by-name/lu/luastatus/package.nix +++ b/pkgs/by-name/lu/luastatus/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Universal status bar content generator"; homepage = "https://github.com/shdown/luastatus"; - changelog = "https://github.com/shdown/luastatus/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/shdown/luastatus/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ kashw2 ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix index f3a737cefadd..ad43e981d6b0 100644 --- a/pkgs/by-name/lu/lurk/package.nix +++ b/pkgs/by-name/lu/lurk/package.nix @@ -2,6 +2,9 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -15,6 +18,14 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-Sng+mMMKDuI1aSgusJDRFMT5iKNUlp9arp9ruRn0bb0="; }; + patches = [ + (fetchpatch { + name = "fix-aarch64-build.patch"; + url = "https://github.com/JakWai01/lurk/commit/132e6557ddeafbdb1bb1d4d1411099f0d7df7a51.patch?full_index=1"; + hash = "sha256-B5rNLipnFFWxIhTm+eCacJkw38D7stQ27WIHzgj7Vy0="; + }) + ]; + cargoHash = "sha256-Cmlhhda35FmNg/OvfMRPHBLPRXF5bs0ebBYT7KfierA="; postPatch = '' @@ -22,6 +33,14 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/bin/ls' 'ls' ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/jakwai01/lurk/releases/tag/v${finalAttrs.version}"; description = "Simple and pretty alternative to strace"; diff --git a/pkgs/by-name/md/mdbook-plugins/package.nix b/pkgs/by-name/md/mdbook-plugins/package.nix index 206fc84d7d05..4946e953f372 100644 --- a/pkgs/by-name/md/mdbook-plugins/package.nix +++ b/pkgs/by-name/md/mdbook-plugins/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdbook-plugins"; - version = "0.2.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "RustForWeb"; repo = "mdbook-plugins"; rev = "v${finalAttrs.version}"; - hash = "sha256-IyIUJH5pbuvDarQf7yvrStMIb5HdimudYF+Tq/+OtvY="; + hash = "sha256-28Olgft2IQvvJEQ9oqj5o96MT8rILUESQiTOtpc2xLw="; }; - cargoHash = "sha256-/UM85Lhq52MFTjczPRuXENPJOQkjiHLWGPPW/VD9kBQ="; + cargoHash = "sha256-5Mok7E85DKmo0NIdUZJhinLCWKk+G0tIBKcTy71kUxk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mh/mhabit/package.nix b/pkgs/by-name/mh/mhabit/package.nix index 9558c05dfde8..b1d11829cb4a 100644 --- a/pkgs/by-name/mh/mhabit/package.nix +++ b/pkgs/by-name/mh/mhabit/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutter332, + flutter338, sqlite, libsecret, _experimental-update-script-combinators, @@ -12,16 +12,16 @@ }: let - version = "1.22.6+133"; + version = "1.23.3+142"; src = fetchFromGitHub { owner = "FriesI23"; repo = "mhabit"; tag = "v${version}"; - hash = "sha256-zdgD3TGSjRQc6PAeTh2EV42X5EEgiOh0yH0+Fqre+Qc="; + hash = "sha256-jseb1AcM+AygVLFN3O5P2LiQppxOuLWMmBON0FRqPFQ="; }; in -flutter332.buildFlutterApplication { +flutter338.buildFlutterApplication { pname = "mhabit"; inherit version src; diff --git a/pkgs/by-name/mh/mhabit/pubspec.lock.json b/pkgs/by-name/mh/mhabit/pubspec.lock.json index e218672521e6..d85a2d309e48 100644 --- a/pkgs/by-name/mh/mhabit/pubspec.lock.json +++ b/pkgs/by-name/mh/mhabit/pubspec.lock.json @@ -44,11 +44,11 @@ "dependency": "direct main", "description": { "name": "animations", - "sha256": "a8031b276f0a7986ac907195f10ca7cd04ecf2a8a566bd6dbe03018a9b02b427", + "sha256": "18938cefd7dcc04e1ecac0db78973761a01e4bc2d6bfae0cfa596bfeac9e96ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "ansicolor": { "dependency": "transitive", @@ -64,11 +64,11 @@ "dependency": "direct main", "description": { "name": "app_settings", - "sha256": "3e46c561441e5820d3a25339bf8b51b9e45a5f686873851a20c257a530917795", + "sha256": "64d50e666fd96ae90301bf71205f05019286f940ad6f5fed3d1be19c6af7546a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.1" + "version": "7.0.0" }, "archive": { "dependency": "direct main", @@ -94,11 +94,11 @@ "dependency": "direct main", "description": { "name": "async", - "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.12.0" + "version": "2.13.0" }, "boolean_selector": { "dependency": "transitive", @@ -114,61 +114,61 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7", + "sha256": "ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "3.1.0" }, "build_config": { "dependency": "transitive", "description": { "name": "build_config", - "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.2.0" }, "build_daemon": { "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "409002f1adeea601018715d613115cfaf0e31f512cb80ae4534c79867ae2363d", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "version": "4.1.1" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62", + "sha256": "d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "3.0.3" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53", + "sha256": "b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.7.1" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792", + "sha256": "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.2" + "version": "9.3.1" }, "built_collection": { "dependency": "transitive", @@ -184,11 +184,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", + "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.0" + "version": "8.12.1" }, "characters": { "dependency": "transitive", @@ -204,11 +204,11 @@ "dependency": "transitive", "description": { "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.4" }, "cli_config": { "dependency": "transitive", @@ -244,11 +244,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.11.0" + "version": "4.11.1" }, "collection": { "dependency": "direct main", @@ -274,11 +274,11 @@ "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec", + "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.5" + "version": "7.0.0" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -314,21 +314,21 @@ "dependency": "direct main", "description": { "name": "copy_with_extension", - "sha256": "0447e5ea09845b275fbeaa7605bc85e74da759788678760b2a6c4e06ca622410", + "sha256": "09cf9385a0032af3724fd0d44fd7663bee7484ae0bc71c9734165476d5fc6e72", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "9.1.1" }, "copy_with_extension_gen": { "dependency": "direct dev", "description": { "name": "copy_with_extension_gen", - "sha256": "86f7be2fd800d058356541b3646c1713a368daca0ada6718bfaf94584f7b775b", + "sha256": "197ecbb51e715a043bc0559b7436bffd1aa9815aa62d88cb8fbcff596d9a4725", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "9.1.1" }, "coverage": { "dependency": "transitive", @@ -344,21 +344,21 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4+2" + "version": "0.3.5+1" }, "crypto": { "dependency": "direct main", "description": { "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.0.7" }, "cryptofont": { "dependency": "direct main", @@ -434,11 +434,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a", + "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.5.0" + "version": "12.3.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -474,21 +474,21 @@ "dependency": "transitive", "description": { "name": "equatable", - "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", + "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.7" + "version": "2.0.8" }, "fake_async": { "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.3.3" }, "ffi": { "dependency": "transitive", @@ -514,61 +514,61 @@ "dependency": "direct main", "description": { "name": "file_selector", - "sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0", + "sha256": "bd15e43e9268db636b53eeaca9f56324d1622af30e5c34d6e267649758c84d9a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.1.0" }, "file_selector_android": { "dependency": "transitive", "description": { "name": "file_selector_android", - "sha256": "1ce58b609289551f8ec07265476720e77d19764339cc1d8e4df3c4d34dac6499", + "sha256": "51e8fd0446de75e4b62c065b76db2210c704562d072339d333bd89c57a7f8a7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1+17" + "version": "0.5.2+4" }, "file_selector_ios": { "dependency": "transitive", "description": { "name": "file_selector_ios", - "sha256": "fe9f52123af16bba4ad65bd7e03defbbb4b172a38a8e6aaa2a869a0c56a5f5fb", + "sha256": "628ec99afd8bb40620b4c8707d5fd5fc9e89d83e9b0b327d471fe5f7bc5fc33f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.3+2" + "version": "0.5.3+4" }, "file_selector_linux": { "dependency": "transitive", "description": { "name": "file_selector_linux", - "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33", + "sha256": "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+2" + "version": "0.9.4" }, "file_selector_macos": { "dependency": "transitive", "description": { "name": "file_selector_macos", - "sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c", + "sha256": "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.4+4" + "version": "0.9.5" }, "file_selector_platform_interface": { "dependency": "transitive", "description": { "name": "file_selector_platform_interface", - "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", + "sha256": "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.2" + "version": "2.7.0" }, "file_selector_web": { "dependency": "transitive", @@ -584,11 +584,11 @@ "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", + "sha256": "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+4" + "version": "0.9.3+5" }, "fixnum": { "dependency": "transitive", @@ -604,11 +604,11 @@ "dependency": "direct main", "description": { "name": "fl_chart", - "sha256": "577aeac8ca414c25333334d7c4bb246775234c0e44b38b10a82b559dd4d764e7", + "sha256": "7ca9a40f4eb85949190e54087be8b4d6ac09dc4c54238d782a34cf1f7c011de9", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.1.1" }, "flutter": { "dependency": "direct main", @@ -690,11 +690,11 @@ "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.0" + "version": "6.0.0" }, "flutter_local_notifications": { "dependency": "direct main", @@ -746,11 +746,11 @@ "dependency": "direct dev", "description": { "name": "flutter_native_splash", - "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc", + "sha256": "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.6" + "version": "2.4.7" }, "flutter_secure_storage": { "dependency": "direct main", @@ -816,11 +816,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678", + "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.3" }, "flutter_test": { "dependency": "direct dev", @@ -832,11 +832,11 @@ "dependency": "direct main", "description": { "name": "flutter_timezone", - "sha256": "13b2109ad75651faced4831bf262e32559e44aa549426eab8a597610d385d934", + "sha256": "978192f2f9ea6d019a4de4f0211d76a9af955ca24865828fa98ca4e20cf0cb3c", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.1" + "version": "5.0.1" }, "flutter_web_plugins": { "dependency": "transitive", @@ -858,11 +858,11 @@ "dependency": "transitive", "description": { "name": "get_it", - "sha256": "a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b", + "sha256": "ae78de7c3f2304b8d81f2bb6e320833e5e81de942188542328f074978cc0efa9", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.2.0" + "version": "8.3.0" }, "glob": { "dependency": "transitive", @@ -928,11 +928,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.0" }, "http_multi_server": { "dependency": "transitive", @@ -969,11 +969,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", + "sha256": "492bd52f6c4fbb6ee41f781ff27765ce5f627910e1e0cbecfa3d9add5562604c", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.4" + "version": "4.7.2" }, "image_size_getter": { "dependency": "transitive", @@ -989,11 +989,11 @@ "dependency": "direct main", "description": { "name": "intl", - "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.19.0" + "version": "0.20.2" }, "io": { "dependency": "transitive", @@ -1029,41 +1029,41 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", + "sha256": "c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.9.5" + "version": "6.11.2" }, "leak_tracker": { "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.8" + "version": "11.0.2" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.9" + "version": "3.0.10" }, "leak_tracker_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_testing", - "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "linked_scroll_controller": { "dependency": "direct main", @@ -1079,11 +1079,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.1" + "version": "6.0.0" }, "logger": { "dependency": "direct main", @@ -1179,11 +1179,11 @@ "dependency": "direct dev", "description": { "name": "mockito", - "sha256": "4546eac99e8967ea91bae633d2ca7698181d008e95fa4627330cf903d573277a", + "sha256": "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.6" + "version": "5.5.0" }, "msix": { "dependency": "direct dev", @@ -1329,11 +1329,11 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.1" + "version": "9.0.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -1349,11 +1349,11 @@ "dependency": "direct dev", "description": { "name": "package_rename", - "sha256": "5dbef9f2f0849a7b5d237733a898bcdab917e5b7e16d662e91e095b6278d9af9", + "sha256": "8e957670ab3c8ab0aa9976d10dfe8575c279e81a48aeeca9e7de43dbdc2c2be0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "path": { "dependency": "direct main", @@ -1389,21 +1389,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37", + "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.19" + "version": "2.2.22" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", + "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.1" }, "path_provider_linux": { "dependency": "transitive", @@ -1439,11 +1439,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "7.0.1" }, "platform": { "dependency": "transitive", @@ -1569,11 +1569,11 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1", + "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.1.0" + "version": "12.0.1" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -1589,31 +1589,31 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.5.4" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e", + "sha256": "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.13" + "version": "2.4.18" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.5.6" }, "shared_preferences_linux": { "dependency": "transitive", @@ -1745,21 +1745,21 @@ "dependency": "direct dev", "description": { "name": "source_gen", - "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "sha256": "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "3.1.0" }, "source_helper": { "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca", + "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.7" + "version": "1.3.8" }, "source_map_stack_trace": { "dependency": "transitive", @@ -1791,16 +1791,6 @@ "source": "hosted", "version": "1.10.1" }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, "sqflite": { "dependency": "direct main", "description": { @@ -1815,31 +1805,31 @@ "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", + "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2+2" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.5" + "version": "2.5.6" }, "sqflite_common_ffi": { "dependency": "direct main", "description": { "name": "sqflite_common_ffi", - "sha256": "9faa2fedc5385ef238ce772589f7718c24cdddd27419b609bb9c6f703ea27988", + "sha256": "8d7b8749a516cbf6e9057f9b480b716ad14fc4f3d3873ca6938919cc626d9025", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.3.7+1" }, "sqflite_darwin": { "dependency": "transitive", @@ -1865,11 +1855,11 @@ "dependency": "transitive", "description": { "name": "sqlite3", - "sha256": "f18fd9a72d7a1ad2920db61368f2a69368f1cc9b56b8233e9d83b47b0a8435aa", + "sha256": "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.3" + "version": "2.9.4" }, "stack_trace": { "dependency": "transitive", @@ -1915,11 +1905,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.4.0" }, "term_glyph": { "dependency": "transitive", @@ -1935,31 +1925,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", + "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.15" + "version": "1.26.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" + "version": "0.7.6" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", + "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.8" + "version": "0.6.11" }, "test_cov_console": { "dependency": "direct dev", @@ -1975,11 +1965,11 @@ "dependency": "transitive", "description": { "name": "time", - "sha256": "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461", + "sha256": "46187cf30bffdab28c56be9a63861b36e4ab7347bf403297595d6a97e10c789f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.1.6" }, "timezone": { "dependency": "direct main", @@ -2025,11 +2015,11 @@ "dependency": "transitive", "description": { "name": "universal_io", - "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "sha256": "f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.3.1" }, "url_launcher": { "dependency": "direct main", @@ -2045,41 +2035,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.20" + "version": "6.3.28" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", + "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.4" + "version": "6.3.6" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.3" + "version": "3.2.5" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2105,21 +2095,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "uuid": { "dependency": "direct main", "description": { "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.1" + "version": "4.5.2" }, "vector_graphics": { "dependency": "transitive", @@ -2155,11 +2145,11 @@ "dependency": "transitive", "description": { "name": "vector_math", - "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "visibility_detector": { "dependency": "transitive", @@ -2175,21 +2165,21 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.1" + "version": "15.0.2" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", + "sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.2.0" }, "web": { "dependency": "transitive", @@ -2245,11 +2235,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.13.0" + "version": "5.15.0" }, "win32_registry": { "dependency": "transitive", @@ -2285,11 +2275,11 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.6.1" }, "yaml": { "dependency": "transitive", @@ -2303,7 +2293,7 @@ } }, "sdks": { - "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.29.0" + "dart": ">=3.9.0 <4.0.0", + "flutter": ">=3.35.0" } } diff --git a/pkgs/by-name/mi/miniaudio/package.nix b/pkgs/by-name/mi/miniaudio/package.nix index 4d35736ddcc3..1b41b4aeba1b 100644 --- a/pkgs/by-name/mi/miniaudio/package.nix +++ b/pkgs/by-name/mi/miniaudio/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "miniaudio"; - version = "0.11.23"; + version = "0.11.24"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; tag = finalAttrs.version; - hash = "sha256-ZrfKw5a3AtIER2btCKWhuvygasNaHNf9EURf1Kv96Vc="; + hash = "sha256-2i0VTbf/zcolGcf1vzleFNRiGnisoaN+g+Dy9iCbei8="; }; outputs = [ diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 126996b3b2a2..6bc671ac7b86 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.456"; + version = "0.0.474"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-V+OHqM4rqoqroH3IL+zjhxmK4G5J04Fy6Yn/GqTqtaQ="; + hash = "sha256-OzHS3L0mJp6+zRHeK+kidJQDSbmy2VjyFdHU1iJZpsM="; }; - vendorHash = "sha256-PwSDl4dPcTPGzXAunW4J4gyu9a68qTP3MpdexUpFt1U="; + vendorHash = "sha256-jeH5/x4hIh2Q5bi6o7c0tcQLmyrMp0NJ641fZDPCHkw="; subPackages = [ "cmd/nsc" diff --git a/pkgs/by-name/nv/nvrs/package.nix b/pkgs/by-name/nv/nvrs/package.nix index c184373521cf..82b6e174e6fe 100644 --- a/pkgs/by-name/nv/nvrs/package.nix +++ b/pkgs/by-name/nv/nvrs/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=api::regex::request_test" ]; - passthru.update-script = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = { description = "Fast new version checker for software releases"; diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 19724d8997fa..b17c45406c89 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -110,11 +110,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "petsc"; - version = "3.24.2"; + version = "3.24.3"; src = fetchzip { url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz"; - hash = "sha256-cUd8hg+e9/IiJ9lUnxeTMg2lVMW77qV1CktTQKxL/qQ="; + hash = "sha256-acrNcCTcjC4iLZD0lYvRhidnRTWsXs57XIQmZWKYIMg="; }; patches = [ diff --git a/pkgs/by-name/pi/pince/libptrscan/Cargo.lock b/pkgs/by-name/pi/pince/libptrscan/Cargo.lock new file mode 100644 index 000000000000..0b44473dd19f --- /dev/null +++ b/pkgs/by-name/pi/pince/libptrscan/Cargo.lock @@ -0,0 +1,25 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "libc" +version = "0.2.180" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" + +[[package]] +name = "machx" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ac9b6ef56836bbcf4a55a3b7ac0964fdeb988ee4ef288a34b184d156965bd93" +dependencies = [ + "libc", +] + +[[package]] +name = "libptrscan" +version = "0.7.4" +dependencies = [ + "machx", +] diff --git a/pkgs/by-name/pi/pince/package.nix b/pkgs/by-name/pi/pince/package.nix new file mode 100644 index 000000000000..44e0a0e2a7dd --- /dev/null +++ b/pkgs/by-name/pi/pince/package.nix @@ -0,0 +1,186 @@ +{ + stdenv, + lib, + fetchFromGitHub, + replaceVars, + nix-update-script, + + rustPlatform, + + cmake, + makeWrapper, + + python3Packages, + python3, + gdb, + qt6, + gtk3, + gobject-introspection, +}: + +let + libptrscan = rustPlatform.buildRustPackage { + pname = "libptrscan"; + version = "0.7.4-unstable-2024-09-13"; + + src = fetchFromGitHub { + owner = "kekeimiku"; + repo = "PointerSearcher-X"; + rev = "ba2b5eab4856aa4ffb3ece0bd2c7d0917fa4e6ce"; # last commit on pince_fix_32 branch + hash = "sha256-skOM2dx+u7dYbWywaC8dtUuJuXzc4Mm6skBbMfaTwfY="; + }; + + cargoLock.lockFile = ./libptrscan/Cargo.lock; + + postPatch = '' + cp ${./libptrscan/Cargo.lock} Cargo.lock + chmod +w Cargo.lock + ''; + + cargoBuildFlags = [ "-p libptrscan" ]; + + postInstall = '' + install -Dm644 libptrscan/ptrscan.py -t "$out"/lib/ + ''; + }; + + pythonEnv = python3.withPackages ( + ps: with ps; [ + capstone + keyboard + keystone-engine + pexpect + pygdbmi + pygobject3 + pyqt6 + ] + ); + + gdb' = gdb.override { + python3 = pythonEnv; + }; + + # LD_LIBRARY_PATH libraries + LDPath = lib.makeLibraryPath [ + (lib.getLib stdenv.cc.cc) + gtk3 + gdb' + ]; + + # GI_TYPELIB_PATH libraries + GIPath = lib.makeSearchPath "lib/girepository-1.0" [ + gtk3 + gobject-introspection + ]; +in + +python3Packages.buildPythonApplication rec { + pname = "pince"; + version = "0.4.5"; + pyproject = false; + + src = fetchFromGitHub { + owner = "korcankaraokcu"; + repo = "PINCE"; + tag = "v${version}"; + hash = "sha256-NgoZmmcMEPGpIF3IPEIoeRPOwwuxdinBlkeP0P5eVmU="; + fetchSubmodules = true; + }; + + patches = [ + (replaceVars ./set-gdb-path.patch { + gdb_exe_path = lib.getExe gdb'; + }) + ]; + + build-system = with python3Packages; [ + setuptools + ]; + + nativeBuildInputs = [ + cmake + gobject-introspection + qt6.qttools + qt6.wrapQtAppsHook + makeWrapper + ]; + + buildInputs = [ + pythonEnv + gdb' + gobject-introspection + qt6.qtbase + qt6.qtwayland + gtk3 + ]; + + dontUseCmakeConfigure = true; + + buildPhase = '' + runHook preBuild + + # libscanmem + pushd libscanmem-PINCE + + cmake -DCMAKE_BUILD_TYPE=Release . + make -j$NIX_BUILD_CORES + + install -Dm555 libscanmem.so -t ../libpince/libscanmem/ + install -Dm444 wrappers/scanmem.py -t ../libpince/libscanmem/ + popd + + # libptrscan + install -Dm555 ${libptrscan}/lib/libptrscan.so -t libpince/libptrscan + install -Dm444 ${libptrscan}/lib/ptrscan.py -t libpince/libptrscan + + # Translations + lrelease i18n/ts/* + mkdir -p i18n/qm + mv i18n/ts/*.qm i18n/qm/ + + runHook postBuild + ''; + + makeWrapperArgs = [ + ''--chdir "$out/lib/pince"'' + ''--prefix LD_LIBRARY_PATH : "${LDPath}"'' + ''--prefix GI_TYPELIB_PATH : "${GIPath}"'' + ''--set PYTHONPATH "$out/lib/pince"'' + ''--set PYTHONDONTWRITEBYTECODE "1"'' + ''--add-flags "$out/lib/pince/PINCE.py"'' + ''--prefix PATH : "${lib.makeBinPath [ pythonEnv ]}"'' + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/pince/ + cp -r GUI i18n libpince media tr AUTHORS COPYING COPYING.CC-BY PINCE.py THANKS $out/lib/pince/ + + mkdir -p $out/bin + ln -s $out/lib/pince/PINCE.py $out/bin/pince + + runHook postInstall + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/lib/pince" "$out $pythonPath" + ''; + + passthru = { + inherit libptrscan; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Reverse engineering tool for games (Linux alternative to Cheat Engine)"; + homepage = "https://github.com/korcankaraokcu/PINCE"; + mainProgram = "pince"; + license = with lib.licenses; [ + gpl3Plus + cc-by-30 + ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ yuannan ]; + }; +} diff --git a/pkgs/by-name/pi/pince/set-gdb-path.patch b/pkgs/by-name/pi/pince/set-gdb-path.patch new file mode 100644 index 000000000000..d382f3e1c070 --- /dev/null +++ b/pkgs/by-name/pi/pince/set-gdb-path.patch @@ -0,0 +1,108 @@ +diff --git a/GUI/Settings/settings.py b/GUI/Settings/settings.py +index 05cf0fa..598ac87 100644 +--- a/GUI/Settings/settings.py ++++ b/GUI/Settings/settings.py +@@ -118,7 +118,7 @@ def set_default_settings(): + settings.setValue("bytes_per_scroll", 0x40) + settings.endGroup() + settings.beginGroup("Debug") +- settings.setValue("gdb_path", typedefs.PATHS.GDB) ++ settings.setValue("gdb_path", utils.get_default_gdb_path()) + settings.setValue("gdb_logging", False) + settings.setValue("interrupt_signal", "SIGINT") + settings.setValue("handle_signals", json.dumps(default_signals)) +diff --git a/GUI/Widgets/Settings/Settings.py b/GUI/Widgets/Settings/Settings.py +index 11ae44e..8ca87a1 100644 +--- a/GUI/Widgets/Settings/Settings.py ++++ b/GUI/Widgets/Settings/Settings.py +@@ -91,7 +91,7 @@ class SettingsDialog(QDialog, Ui_Dialog): + self.settings.setValue("MemoryView/show_memory_view_on_stop", self.checkBox_ShowMemoryViewOnStop.isChecked()) + self.settings.setValue("MemoryView/instructions_per_scroll", self.spinBox_InstructionsPerScroll.value()) + self.settings.setValue("MemoryView/bytes_per_scroll", self.spinBox_BytesPerScroll.value()) +- if not os.environ.get("APPDIR"): ++ if False: + selected_gdb_path = self.lineEdit_GDBPath.text() + if selected_gdb_path != states.gdb_path: + if utilwidgets.InputDialog(self, tr.GDB_RESET).exec(): +@@ -147,7 +147,7 @@ class SettingsDialog(QDialog, Ui_Dialog): + self.spinBox_InstructionsPerScroll.setValue(self.settings.value("MemoryView/instructions_per_scroll", type=int)) + self.spinBox_BytesPerScroll.setValue(self.settings.value("MemoryView/bytes_per_scroll", type=int)) + self.lineEdit_GDBPath.setText(str(self.settings.value("Debug/gdb_path", type=str))) +- if os.environ.get("APPDIR"): ++ if True: + self.label_GDBPath.setDisabled(True) + self.label_GDBPath.setToolTip(tr.UNUSED_APPIMAGE_SETTING) + self.lineEdit_GDBPath.setDisabled(True) +diff --git a/PINCE.py b/PINCE.py +index aa5da2f..b356458 100644 +--- a/PINCE.py ++++ b/PINCE.py +@@ -334,7 +334,7 @@ class MainForm(QMainWindow, MainWindow): + + settings.init_settings() + self.settings_changed() +- if os.environ.get("APPDIR"): ++ if True: + gdb_path = utils.get_default_gdb_path() + else: + gdb_path = states.gdb_path +@@ -1426,7 +1426,7 @@ class MainForm(QMainWindow, MainWindow): + + # Returns: a bool value indicates whether the operation succeeded. + def attach_to_pid(self, pid: int): +- attach_result = debugcore.attach(pid, states.gdb_path) ++ attach_result = debugcore.attach(pid, utils.get_default_gdb_path()) + if attach_result == typedefs.ATTACH_RESULT.SUCCESSFUL: + settings.apply_after_init() + scanmem.pid(pid) +@@ -1524,7 +1524,7 @@ class MainForm(QMainWindow, MainWindow): + self.flashAttachButtonTimer.start(100) + self.label_SelectedProcess.setText(tr.NO_PROCESS_SELECTED) + self.memory_view_window.setWindowTitle(tr.NO_PROCESS_SELECTED) +- if os.environ.get("APPDIR"): ++ if True: + gdb_path = utils.get_default_gdb_path() + else: + gdb_path = states.gdb_path +diff --git a/libpince/debugcore.py b/libpince/debugcore.py +index 987762f..9779120 100644 +--- a/libpince/debugcore.py ++++ b/libpince/debugcore.py +@@ -498,7 +498,7 @@ def init_gdb(gdb_path=utils.get_default_gdb_path()): + status_thread.start() + gdb_initialized = True + set_logging(False) +- if not is_appimage: ++ if False: + send_command("source ./gdbinit_venv") + set_pince_paths() + send_command("source " + utils.get_user_path(typedefs.USER_PATHS.GDBINIT)) +diff --git a/libpince/utils.py b/libpince/utils.py +index 604aeb3..0569a7e 100644 +--- a/libpince/utils.py ++++ b/libpince/utils.py +@@ -881,10 +881,7 @@ def get_user_path(user_path): + + + def get_default_gdb_path(): +- appdir = os.environ.get("APPDIR") +- if appdir: +- return appdir + "/usr/bin/gdb" +- return typedefs.PATHS.GDB ++ return "@gdb_exe_path@" + + + def execute_script(file_path): +diff --git a/tr/tr.py b/tr/tr.py +index 81e156c..74aef4c 100644 +--- a/tr/tr.py ++++ b/tr/tr.py +@@ -148,7 +148,7 @@ class TranslationConstants(QObject): + r"\[asdf\] --> search for opcodes that contain [asdf]" + ) + SEPARATE_PROCESSES_WITH = QT_TR_NOOP("Separate processes with {}") +- UNUSED_APPIMAGE_SETTING = QT_TR_NOOP("This setting is unused in AppImage builds") ++ UNUSED_APPIMAGE_SETTING = QT_TR_NOOP("This setting is unused in nixpkgs-based builds") + SELECT_GDB_BINARY = QT_TR_NOOP("Select the gdb binary") + QUIT_SESSION_CRASH = QT_TR_NOOP("Quitting current session will crash PINCE") + CONT_SESSION_CRASH = QT_TR_NOOP("Use global hotkeys or the commands 'interrupt' and 'c&' to stop/run the inferior") diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index 8ba306f020bb..ec287005022d 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.0.216"; + version = "0.0.221"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-aHgaqsU6cvAfWF4q1aynE9H+Ok46Tld9ukRvS0urfRU="; + hash = "sha256-r9aVSllmz7fXlePRC/vS6vxmi7zhUyVPEEo6dEkokKg="; }; - cargoHash = "sha256-G7++F3Av56KVan6PTsqI0AjSlKLTY7Ypk9mZBrhqevI="; + cargoHash = "sha256-LedT/ZwDz9FBsHZdObPZc2CoBNR8gNYF/4kvefgmNq8="; cargoBuildFlags = [ "--bin=rumdl" diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index e9978421ef22..38a10985155c 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.7-unstable-2026-01-07"; + version = "11.7-unstable-2026-01-15"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "5f6a6ab3af054cf74280d3798aff63a6deb22c86"; - hash = "sha256-QEEq6ac0OxnmH0p/M/uLRMd5uBIE9JnLdkjtsDqlT48="; + rev = "6a37e688266eb5bcea0959b297b352fcaa75976c"; + hash = "sha256-rTocm8AADnDoeMas4/cwQBv7LTMUgo2+SvNwR3oWNXA="; }; buildInputs = diff --git a/pkgs/by-name/sp/spedread/package.nix b/pkgs/by-name/sp/spedread/package.nix index bd10d3a00486..50aa4bff1cdc 100644 --- a/pkgs/by-name/sp/spedread/package.nix +++ b/pkgs/by-name/sp/spedread/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Rapid word display tool for improved reading focus and reduced eye movement"; homepage = "https://github.com/Darazaki/Spedread"; - changelog = "https://github.com/Darazaki/Spedread/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/Darazaki/Spedread/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ thtrf ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/sy/systemd-netlogd/package.nix b/pkgs/by-name/sy/systemd-netlogd/package.nix index 8c2ae7f72433..4f54345f0d52 100644 --- a/pkgs/by-name/sy/systemd-netlogd/package.nix +++ b/pkgs/by-name/sy/systemd-netlogd/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Forwards messages from the journal to other hosts over the network"; homepage = "https://github.com/systemd/systemd-netlogd"; - changelog = "https://github.com/systemd/systemd-netlogd/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/systemd/systemd-netlogd/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "systemd-netlogd"; diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix index 2431fe4b21ef..4916bfc9800a 100644 --- a/pkgs/by-name/ta/tauno-monitor/package.nix +++ b/pkgs/by-name/ta/tauno-monitor/package.nix @@ -13,14 +13,14 @@ }: python3Packages.buildPythonApplication rec { pname = "tauno-monitor"; - version = "0.2.17"; + version = "0.2.18"; pyproject = false; src = fetchFromGitHub { owner = "taunoe"; repo = "tauno-monitor"; tag = "v${version}"; - hash = "sha256-klYL9A2E7MsgzX9Aj0nrmaKWjvzI3giZVZVvFot16XU="; + hash = "sha256-UkBEronqxvf3wAqMUvTbvIjYZSe4Y53ZU3JklzK4Na0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index 388ad67fe6a7..d214348835d5 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "testkube"; - version = "2.2.6"; + version = "2.5.7"; src = fetchFromGitHub { owner = "kubeshop"; repo = "testkube"; - rev = "v${version}"; - hash = "sha256-aAE3Mb39ddy9I4Ftzb5WKRlcIv7iTrZ8mRsjjyyZv9Y="; + rev = "${version}"; + hash = "sha256-5Fc/esXmwTMS929k6HXhmzGGlGaCWp/dKQUZm+kIz7M="; }; - vendorHash = "sha256-WaanaknTuCnjBjxIi39ZHTqh3C92rLQAPRFx0o7dwZY="; + vendorHash = "sha256-e2lyJdD3j87494S6oif2/OnjzRY8AEiLZxd9KeMO7UE="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/tr/trzsz-ssh/package.nix b/pkgs/by-name/tr/trzsz-ssh/package.nix index 9feafa7fb7cb..15dcd2490eb3 100644 --- a/pkgs/by-name/tr/trzsz-ssh/package.nix +++ b/pkgs/by-name/tr/trzsz-ssh/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "trzsz-ssh"; - version = "0.1.23"; + version = "0.1.24"; src = fetchFromGitHub { owner = "trzsz"; repo = "trzsz-ssh"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cp5XI7ggpt48llojcmarYPi9mTM+YBqwjG/eNAnKTxc="; + hash = "sha256-mcGsCPW8YHKCm5c+OWlKMp6k+J7ibvd6zN/76Ws5eUE="; }; - vendorHash = "sha256-pI9BlttS9a1XrgBBmUd+h529fLbsbwSMwjKn4P50liE="; + vendorHash = "sha256-RhmWoULbJZdYYFxLlj+ekca4u8+DQTH3QmZlpnUeZ2Y="; ldflags = [ "-s" diff --git a/pkgs/by-name/un/units/package.nix b/pkgs/by-name/un/units/package.nix index 9a7531653479..5aa090f30960 100644 --- a/pkgs/by-name/un/units/package.nix +++ b/pkgs/by-name/un/units/package.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "units"; - version = "2.24"; + version = "2.25"; src = fetchurl { url = "mirror://gnu/units/units-${finalAttrs.version}.tar.gz"; - hash = "sha256-HlAsTt+s8gspKEcWxy5d21GklaI2XXsD55YElMSgyQI="; + hash = "sha256-Nu30OsALTWMEuuqROH5lqwURi/Zckh9z07CIKOWm7As="; }; # Until upstream updates their code to work with GCC 15. diff --git a/pkgs/by-name/wr/wrtag/package.nix b/pkgs/by-name/wr/wrtag/package.nix index 5a6112904ef5..f1774cd7ee3b 100644 --- a/pkgs/by-name/wr/wrtag/package.nix +++ b/pkgs/by-name/wr/wrtag/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "wrtag"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "sentriz"; repo = "wrtag"; tag = "v${finalAttrs.version}"; - hash = "sha256-u5mLd9C1yphfCtFOKUypuswLvNzkwzRKYfPpbOAOVcQ="; + hash = "sha256-LSYrkXDbl0W7V+wDixIKGlOlSE/t10m/7cdgUYUNcr0="; }; - vendorHash = "sha256-CevWYD93fdt7MmWZjBKGR3+isOzWzAo5c8X55qG8/2A="; + vendorHash = "sha256-u2HM1J535SgB7RrDfVjKFa7QpcK06gqr5+DZaNTxcmA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 366e6d67d461..b41e8192aaa4 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -3,6 +3,8 @@ lib, newScope, apple-sdk, + ipu6ep-camera-hal, + ipu6epmtl-camera-hal, }: lib.makeScope newScope ( @@ -38,8 +40,12 @@ lib.makeScope newScope ( gst-vaapi = callPackage ./vaapi { }; icamerasrc-ipu6 = callPackage ./icamerasrc { }; - icamerasrc-ipu6ep = callPackage ./icamerasrc { }; - icamerasrc-ipu6epmtl = callPackage ./icamerasrc { }; + icamerasrc-ipu6ep = callPackage ./icamerasrc { + ipu6-camera-hal = ipu6ep-camera-hal; + }; + icamerasrc-ipu6epmtl = callPackage ./icamerasrc { + ipu6-camera-hal = ipu6epmtl-camera-hal; + }; # note: gst-python is in ../../python-modules/gst-python - called under python3Packages } diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index 5a71e04eb23a..35801332a7da 100644 --- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "icamerasrc-${ipu6-camera-hal.ipuVersion}"; - version = "unstable-2024-09-29"; + version = "unstable-2025-12-26"; src = fetchFromGitHub { owner = "intel"; repo = "icamerasrc"; - tag = "20240926_1446"; - hash = "sha256-BpIZxkPmSVKqPntwBJjGmCaMSYFCEZHJa4soaMAJRWE="; + tag = "20251226_1140_191_PTL_PV_IoT"; + hash = "sha256-BYURJfNz4D8bXbSeuWyUYnoifozFOq6rSfG9GBKVoHo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/development/libraries/ipu6-camera-hal/default.nix index d2cd970014a6..1b98caa3e5d1 100644 --- a/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "intel"; repo = "ipu6-camera-hal"; - rev = "c933525a6efe8229a7129b7b0b66798f19d2bef7"; + tag = "20250923_ov02e"; # Released on 2025-06-27 hash = "sha256-ZWwszteRmUBn0wGgN5rmzw/onfzBoPGadcmpk+93kAM="; }; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 587984f4768b..3593e438f794 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -111,6 +111,8 @@ let adios2 = self.callPackage adios2.override { }; cgns = self.callPackage cgns.override { }; viskores = self.callPackage viskores.override { }; + gdal = self.callPackage gdal.override { useMinimalFeatures = true; }; + pdal = self.callPackage pdal.override { }; }); vtkBool = feature: bool: lib.cmakeFeature feature "${if bool then "YES" else "NO"}"; in @@ -137,8 +139,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libLAS - gdal - pdal alembic imath c-blosc @@ -152,6 +152,8 @@ stdenv.mkDerivation (finalAttrs: { libarchive libGL openvdb + vtkPackages.gdal + vtkPackages.pdal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libXfixes diff --git a/pkgs/development/php-packages/php-codesniffer/default.nix b/pkgs/development/php-packages/php-codesniffer/default.nix index 473906ed199f..dac7a4c23360 100644 --- a/pkgs/development/php-packages/php-codesniffer/default.nix +++ b/pkgs/development/php-packages/php-codesniffer/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "php-codesniffer"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "PHPCSStandards"; repo = "PHP_CodeSniffer"; tag = finalAttrs.version; - hash = "sha256-2fubJMn44pS+++QgK66vm4YTT+0zdgtAJVHKvvWO/QA="; + hash = "sha256-63W9GMTDrIIMWSieYjv+xAHEj9xjsnvXsUXQ1I7fQFo="; }; - vendorHash = "sha256-t+cNnrs/4xzIDg3qM/MIRyu1Ulen03s2asZ2JuOxQgI="; + vendorHash = "sha256-h+EVwPtIeXnVHEMCMYJFwuqeWXvZaYLTxrb/RKycIx0="; meta = { changelog = "https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/fenics-ufl/default.nix b/pkgs/development/python-modules/fenics-ufl/default.nix index b9d3f46547a3..3770d4feff56 100644 --- a/pkgs/development/python-modules/fenics-ufl/default.nix +++ b/pkgs/development/python-modules/fenics-ufl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "fenics-ufl"; - version = "2025.2.0"; + version = "2025.2.1"; pyproject = true; src = fetchFromGitHub { owner = "fenics"; repo = "ufl"; tag = finalAttrs.version; - hash = "sha256-REDjNiUM3bd166Pq92P9Yl4Ff9C9hFNjTWWO1FElHrU="; + hash = "sha256-7hibe/oVueK5YORhA81641b5UcE4MVyQvgVD0Fngje4="; }; build-system = [ diff --git a/pkgs/development/python-modules/gstools-cython/default.nix b/pkgs/development/python-modules/gstools-cython/default.nix index 62da676f50be..962e6565d0e0 100644 --- a/pkgs/development/python-modules/gstools-cython/default.nix +++ b/pkgs/development/python-modules/gstools-cython/default.nix @@ -13,21 +13,16 @@ buildPythonPackage rec { pname = "gstools-cython"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "GeoStat-Framework"; repo = "GSTools-Cython"; tag = "v${version}"; - hash = "sha256-Kzn/ThLjTGy3ZYIkTwCV1wi22c7rWo4u/L3llppC6wQ="; + hash = "sha256-D5oOSOVfmwAOF7MYpMmOMXIS82NJeztRJh4sDXS+Ouc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "Cython>=3.0.10,<3.1.0" "Cython>=3.1.0,<4.0.0" - ''; - build-system = [ cython extension-helpers diff --git a/pkgs/development/python-modules/ormsgpack/default.nix b/pkgs/development/python-modules/ormsgpack/default.nix index 8b45f5df0e20..4c2d8701a56f 100644 --- a/pkgs/development/python-modules/ormsgpack/default.nix +++ b/pkgs/development/python-modules/ormsgpack/default.nix @@ -18,19 +18,19 @@ buildPythonPackage rec { pname = "ormsgpack"; - version = "1.12.0"; + version = "1.12.2"; pyproject = true; src = fetchFromGitHub { owner = "aviramha"; repo = "ormsgpack"; tag = version; - hash = "sha256-kCISXmj2dDDMb7iuY/eY4W/dmyNziQwtIQX6qNvEJa4="; + hash = "sha256-a2PgCCIPPJt6YNW7UFl9urYZkAoVj5Np0lbv4QfzMAs="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-J8XVLl7EHnxctYk3GMs4pRexHegFl6yRSxeCCFDQPgk="; + hash = "sha256-PLLSVoQLsbTOIMqOsaaei/dm8SybfyqP0WLJW8hTOoo="; }; build-system = [ diff --git a/pkgs/development/python-modules/pydo/default.nix b/pkgs/development/python-modules/pydo/default.nix index 6b681ee26615..18dad347f5c4 100644 --- a/pkgs/development/python-modules/pydo/default.nix +++ b/pkgs/development/python-modules/pydo/default.nix @@ -3,44 +3,44 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - aioresponses, azure-core, azure-identity, isodate, msrest, - responses, - pytestCheckHook, + aioresponses, pytest-asyncio, + pytestCheckHook, + responses, }: buildPythonPackage rec { pname = "pydo"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; src = fetchFromGitHub { owner = "digitalocean"; repo = "pydo"; tag = "v${version}"; - hash = "sha256-wmrth6n6vlYLMMiNYm6p5sS2keEFsnGm9sGjShSsLaA="; + hash = "sha256-IfoW8JaLqghecADPKfVwjW99ZosHFXFt3iQ8WOyrCns="; }; build-system = [ poetry-core ]; dependencies = [ - aioresponses azure-core azure-identity isodate msrest - responses ]; pythonImportsCheck = [ "pydo" ]; nativeCheckInputs = [ - pytestCheckHook + aioresponses pytest-asyncio + pytestCheckHook + responses ]; # integration tests require hitting the live api with a diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 41a38ed2e466..82a644355182 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { pname = "qtile-extras"; version = "0.34.1"; + # nixpkgs-update: no auto update + # should be updated alongside with `qtile` pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 4ceebac894e4..8f059c4ecea5 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -39,6 +39,9 @@ buildPythonPackage (finalAttrs: { pname = "qtile"; version = "0.34.1"; + # nixpkgs-update: no auto update + # should be updated alongside with `qtile-extras` + pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/roman/default.nix b/pkgs/development/python-modules/roman/default.nix index 074b2108094e..ccda094ade4c 100644 --- a/pkgs/development/python-modules/roman/default.nix +++ b/pkgs/development/python-modules/roman/default.nix @@ -1,23 +1,37 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, + pytestCheckHook, }: -buildPythonPackage rec { - version = "2.0.0"; - format = "setuptools"; +buildPythonPackage (finalAttrs: { + version = "5.2"; pname = "roman"; + pyproject = true; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae"; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "roman"; + tag = finalAttrs.version; + hash = "sha256-ZtwHlS3V18EqDXJxTTwfUdtOvyQg9GbSArV7sOs1b38="; }; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "roman" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + enabledTestPaths = [ "src/tests.py" ]; + meta = { description = "Integer to Roman numerals converter"; + changelog = "https://github.com/zopefoundation/roman/blob/${finalAttrs.version}/CHANGES.rst"; homepage = "https://pypi.python.org/pypi/roman"; license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "roman"; }; -} +}) diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix index 550db28bdfe4..799043833101 100644 --- a/pkgs/development/python-modules/submitit/default.nix +++ b/pkgs/development/python-modules/submitit/default.nix @@ -30,7 +30,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - # event_loop was removed in pytest-asyncio 1.x pytest-asyncio ]; @@ -40,13 +39,7 @@ buildPythonPackage rec { disabledTests = [ # These tests are broken - "test_snapshot" - "test_snapshot_excludes" - "test_job_use_snapshot_cwd" - "test_job_use_snapshot_modules" - "test_nested_pickling" "test_setup" - "test_requeuing" ]; meta = { @@ -54,6 +47,6 @@ buildPythonPackage rec { description = "Python 3.8+ toolbox for submitting jobs to Slurm"; homepage = "https://github.com/facebookincubator/submitit"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.nickcao ]; }; } diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index ccc3e4ef7431..36e258874a33 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, filetype, flit-core, - numpy, opencv4, pillow-heif, pillow, @@ -15,14 +14,14 @@ buildPythonPackage rec { pname = "willow"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; src = fetchFromGitHub { owner = "wagtail"; repo = "Willow"; tag = "v${version}"; - hash = "sha256-7aVLPSspwQRWQ+aNYbKkOBzwc7uoVzQvAG8vezp8QZY="; + hash = "sha256-vboQwOEDRdbwmLT2EW1iF98ZuyzEzlrP2k2ZcvVKjFE="; }; build-system = [ flit-core ]; @@ -33,17 +32,16 @@ buildPythonPackage rec { ]; optional-dependencies = { + wand = [ wand ]; + pillow = [ pillow ]; heif = [ pillow-heif ]; }; nativeCheckInputs = [ - numpy opencv4 pytestCheckHook - pillow - wand ] - ++ optional-dependencies.heif; + ++ lib.concatAttrValues optional-dependencies; meta = { description = "Python image library that sits on top of Pillow, Wand and OpenCV"; diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index f9ced2bd4b79..32eeb4a84227 100644 --- a/pkgs/development/rocm-modules/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${abseil-cpp}/include -I${hipblas-common}/include" + export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${lib.getInclude abseil-cpp}/include -I${hipblas-common}/include" patchShebangs tools # `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]` diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix index 048621e7d083..66b929b8df57 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix @@ -710,9 +710,9 @@ }; pgn = { - version = "1.4.2"; + version = "1.4.3"; url = "github:rolandwalker/tree-sitter-pgn"; - hash = "sha256-pGUSsmm+YUvfvt5c4tPs6tmEcFh3DZoDtVf+EpFhOo0="; + hash = "sha256-7N0irNJt/tiKywUSZAIVt/E1urNXDMG+hYvu+EPpfXA="; meta = { license = lib.licenses.bsd2; }; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 4fdf68a3451f..8be7e4f132b1 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cryptodev-linux"; - version = "1.14"; + version = "1.14-unstable-2025-11-04"; src = fetchFromGitHub { owner = "cryptodev-linux"; repo = "cryptodev-linux"; - rev = "cryptodev-linux-${finalAttrs.version}"; - hash = "sha256-N7fGOMEWrb/gm1MDiJgq2QyTOni6n9w2H52baXmRA1g="; + rev = "08644db02d43478f802755903212f5ee506af73b"; + hash = "sha256-tYTiyysofO23ApXQbnJF5muTTLv1kKu/nLggGv3ntr4="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix index 3be4293ce018..39c870f29cd5 100644 --- a/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ipu6-drivers"; - version = "unstable-2025-09-16"; + version = "unstable-2025-11-12"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-drivers"; - rev = "69b2fde9edcbc24128b91541fdf2791fbd4bf7a4"; - hash = "sha256-uiRbbSw7tQ3Fn297D1I7i7hyaNtpOWER4lvPMSTpwpk="; + tag = "20251104_0740_359"; # Released on 2025-11-12 + hash = "sha256-TiuMzG9VgoJb013hvZHZ4uPMBNvT/tmK1V8SYBwJYB4="; }; patches = [ diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 1d98124cfc82..5cb786e4c85b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.19-rc5", - "hash": "sha256:1kwyxmykzy7z7kp80c85b17wrgqn7jjjvbpic9jgk5ps27zbzvdk", + "version": "6.19-rc6", + "hash": "sha256:0cpdgpvs2j7i42196z65kdqr13cvr86f19is95919w73vjb47pd9", "lts": false }, "6.1": { @@ -10,13 +10,13 @@ "lts": true }, "5.15": { - "version": "5.15.197", - "hash": "sha256:12k6c09lgs4ahmxbrg8g3q1ngldajmzyz7y2nr1l8yhhwbw8s8gx", + "version": "5.15.198", + "hash": "sha256:0hwpwbvjh6y4dhbpp34x9j25nc6x48fbiz65zzavplqdb2a0jk2x", "lts": true }, "5.10": { - "version": "5.10.247", - "hash": "sha256:037yv5lryfanpfbk3z60yfsx14nskgf386b6cfkbzn7wl5xvij3h", + "version": "5.10.248", + "hash": "sha256:01g05n856c9q7m46dmn48pq7hfph4b1kpvrjvrykg8q4z7qy9rmm", "lts": true }, "6.6": { diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 11541f3fe178..17106c049143 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.32.1"; + version = "2.33.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-eval-jobs"; tag = "v${version}"; - hash = "sha256-hA+NOH8KDcsuvH7vJqSwk74PyZP3MtvI/l+CggZcnTc="; + hash = "sha256-i68miKHGdueWggcDAF+Kca9g6S3ipkW629XbMpQYfn0="; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08fe2d05b58c..968a10fcad00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1485,16 +1485,19 @@ with pkgs; amule-daemon = amule.override { monolithic = false; enableDaemon = true; + mainProgram = "amuled"; }; amule-gui = amule.override { monolithic = false; client = true; + mainProgram = "amulegui"; }; amule-web = amule.override { monolithic = false; httpServer = true; + mainProgram = "amuleweb"; }; inherit (callPackages ../tools/security/bitwarden-directory-connector { }) @@ -13427,7 +13430,7 @@ with pkgs; ); nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nixComponents = nixVersions.nixComponents_2_32; + nixComponents = nixVersions.nixComponents_2_33; }; nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 030e753f7a4a..e04c0669a928 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5948,7 +5948,7 @@ self: super: with self; { gcsfs = callPackage ../development/python-modules/gcsfs { }; - gdal = toPythonModule (pkgs.gdal.override { python3 = python; }); + gdal = toPythonModule (pkgs.gdal.override { python3Packages = self; }); gdata = callPackage ../development/python-modules/gdata { };