diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4fb866922936..97dd67dc0acf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11373,6 +11373,12 @@ github = "josephsurin"; githubId = 14977484; }; + joshainglis = { + name = "Josha Inglis"; + email = "joshainglis@gmail.com"; + github = "joshainglis"; + githubId = 1281131; + }; joshniemela = { name = "Joshua Niemelä"; email = "josh@jniemela.dk"; diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 3f4566872946..e60a7778bb02 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -139,6 +139,8 @@ - [PowerStation](https://github.com/ShadowBlip/PowerStation/), an open source TDP control and performance daemon with DBus interface for Linux. Available as [services.powerstation](#opt-services.powerstation.enable). +- [`g3proxy`](https://github.com/bytedance/g3), an open source enterprise forward proxy from ByteDance, similar to Squid or tinyproxy. Available as [services.g3proxy](#opt-services.g3proxy.enable). + - [echoip](https://github.com/mpolden/echoip), a simple service for looking up your IP address. Available as [services.echoip](#opt-services.echoip.enable). - [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 05418ae2764e..2367ba3ba7d7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1267,6 +1267,7 @@ ./services/networking/spacecookie.nix ./services/networking/spiped.nix ./services/networking/squid.nix + ./services/networking/g3proxy.nix ./services/networking/ssh/sshd.nix ./services/networking/sslh.nix ./services/networking/strongswan-swanctl/module.nix diff --git a/nixos/modules/services/networking/g3proxy.nix b/nixos/modules/services/networking/g3proxy.nix new file mode 100644 index 000000000000..6df4f37b1123 --- /dev/null +++ b/nixos/modules/services/networking/g3proxy.nix @@ -0,0 +1,92 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.g3proxy; + + inherit (lib) + mkPackageOption + mkEnableOption + mkOption + mkIf + literalExpression + ; + + settingsFormat = pkgs.formats.yaml { }; +in +{ + options.services.g3proxy = { + enable = mkEnableOption "g3proxy, a generic purpose forward proxy"; + + package = mkPackageOption pkgs "g3proxy" { }; + + settings = mkOption { + type = settingsFormat.type; + default = { }; + example = literalExpression '' + { + server = [{ + name = "test"; + escaper = "default"; + type = "socks_proxy"; + listen = { + address = "[::]:10086"; + }; + }]; + } + ''; + description = '' + Settings of g3proxy. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.g3proxy = { + description = "g3proxy server"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = + let + g3proxy-yaml = settingsFormat.generate "g3proxy.yaml" cfg.settings; + in + "${lib.getExe cfg.package} --config-file ${g3proxy-yaml}"; + + WorkingDirectory = "/var/lib/g3proxy"; + StateDirectory = "g3proxy"; + RuntimeDirectory = "g3proxy"; + DynamicUser = true; + + RuntimeDirectoryMode = "0755"; + PrivateTmp = true; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateUsers = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectSystem = "strict"; + ProcSubset = "pid"; + RestrictNamespaces = true; + RestrictRealtime = true; + RemoveIPC = true; + SystemCallArchitectures = "native"; + UMask = "0077"; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + RestrictSUIDSGID = true; + }; + }; + }; +} diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix index bd3f2175b128..4d72229573ee 100644 --- a/nixos/modules/services/system/userborn.nix +++ b/nixos/modules/services/system/userborn.nix @@ -141,7 +141,7 @@ in ExecStart = "${lib.getExe cfg.package} ${userbornConfigJson} ${cfg.passwordFilesLocation}"; ExecStartPre = lib.mkMerge [ - (lib.mkIf (!config.system.etc.overlay.mutable) [ + (lib.mkIf (cfg.passwordFilesLocation != "/etc") [ "${pkgs.coreutils}/bin/mkdir -p ${cfg.passwordFilesLocation}" ]) diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index a1aae7e31844..e9b0d00bf64f 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -131,7 +131,7 @@ in }; webserver = mkOption { - type = types.enum [ "nginx" "caddy" "none"]; + type = types.enum [ "nginx" "caddy" ]; default = "nginx"; description = '' Whether to use nginx or caddy for virtual host management. diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index b5627ec8e571..fa2884d08708 100755 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -69,7 +69,8 @@ fi chown -f 0:30000 /nix/store chmod -f 1775 /nix/store if [ -n "@readOnlyNixStore@" ]; then - if ! [[ "$(findmnt --noheadings --output OPTIONS /nix/store)" =~ ro(,|$) ]]; then + # #375257: Ensure that we pick the "top" (i.e. last) mount so we don't get a false positive for a lower mount. + if ! [[ "$(findmnt --direction backward --first-only --noheadings --output OPTIONS /nix/store)" =~ (^|,)ro(,|$) ]]; then if [ -z "$container" ]; then mount --bind /nix/store /nix/store else diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 9e04467fd802..9fbfda5814d5 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -194,9 +194,14 @@ in default = "+${toString config.uid}"; type = lib.types.str; description = '' - User name of created file. - Only takes effect when the file is copied (that is, the mode is not 'symlink'). - Changing this option takes precedence over `uid`. + User name of file owner. + + Only takes effect when the file is copied (that is, the + mode is not `symlink`). + + When `services.userborn.enable`, this option has no effect. + You have to assign a `uid` instead. Otherwise this option + takes precedence over `uid`. ''; }; @@ -204,9 +209,14 @@ in default = "+${toString config.gid}"; type = lib.types.str; description = '' - Group name of created file. - Only takes effect when the file is copied (that is, the mode is not 'symlink'). - Changing this option takes precedence over `gid`. + Group name of file owner. + + Only takes effect when the file is copied (that is, the + mode is not `symlink`). + + When `services.userborn.enable`, this option has no effect. + You have to assign a `gid` instead. Otherwise this option + takes precedence over `gid`. ''; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2255c2f5eacc..cb7f599eb6ea 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -165,6 +165,7 @@ in { boot = handleTestOn ["x86_64-linux" "aarch64-linux"] ./boot.nix {}; bootspec = handleTestOn ["x86_64-linux"] ./bootspec.nix {}; boot-stage1 = handleTest ./boot-stage1.nix {}; + boot-stage2 = handleTest ./boot-stage2.nix {}; borgbackup = handleTest ./borgbackup.nix {}; borgmatic = handleTest ./borgmatic.nix {}; botamusique = handleTest ./botamusique.nix {}; diff --git a/nixos/tests/boot-stage2.nix b/nixos/tests/boot-stage2.nix new file mode 100644 index 000000000000..90f0ac01207c --- /dev/null +++ b/nixos/tests/boot-stage2.nix @@ -0,0 +1,73 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + { + name = "boot-stage2"; + + nodes.machine = + { + config, + pkgs, + lib, + ... + }: + { + virtualisation = { + emptyDiskImages = [ 256 ]; + + # Mount an ext4 as the upper layer of the Nix store. + fileSystems = { + "/nix/store" = lib.mkForce { + device = "/dev/vdb"; # the above disk image + fsType = "ext4"; + + # data=journal always displays after errors=remount-ro; this is only needed because of the overlay + # and #375257 will trigger with `errors=remount-ro` on a non-overlaid store: + # see ordering in https://github.com/torvalds/linux/blob/v6.12/fs/ext4/super.c#L2974 + options = [ + "defaults" + "errors=remount-ro" + "data=journal" + ]; + }; + }; + }; + + boot = { + initrd = { + # Format the upper Nix store. + postDeviceCommands = '' + ${pkgs.e2fsprogs}/bin/mkfs.ext4 /dev/vdb + ''; + + # Overlay the RO store onto it. + # Note that bug #375257 can be triggered without an overlay, + # using the errors=remount-ro option (or similar) or with an overlay where any of the + # paths ends in 'ro'. The offending mountpoint also has to be the last (top) one + # if an option ending in 'ro' is the last in the list, so test both cases here. + postMountCommands = '' + mkdir -p /mnt-root/nix/store/ro /mnt-root/nix/store/rw /mnt-root/nix/store/work + mount --bind /mnt-root/nix/.ro-store /mnt-root/nix/store/ro + mount -t overlay overlay \ + -o lowerdir=/mnt-root/nix/store/ro,upperdir=/mnt-root/nix/store/rw,workdir=/mnt-root/nix/store/work \ + /mnt-root/nix/store + ''; + + kernelModules = [ "overlay" ]; + }; + + postBootCommands = '' + touch /etc/post-boot-ran + mount + ''; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.succeed("test /etc/post-boot-ran") + machine.fail("touch /nix/store/should-not-work"); + ''; + + meta.maintainers = with pkgs.lib.maintainers; [ numinit ]; + } +) diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 13fa5dacbd92..75035c5b9f65 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -192,15 +192,15 @@ import ./make-test-python.nix ( machine.screenshot("sway_exit") swaymsg("exec swaylock") - machine.wait_until_succeeds("pgrep -x swaylock") + machine.wait_until_succeeds("pgrep -xf swaylock") machine.sleep(3) machine.send_chars("${nodes.machine.config.users.users.alice.password}") machine.send_key("ret") - machine.wait_until_fails("pgrep -x swaylock") + machine.wait_until_fails("pgrep -xf swaylock") # Exit Sway and verify process exit status 0: swaymsg("exit", succeed=False) - machine.wait_until_fails("pgrep -x sway") + machine.wait_until_fails("pgrep -xf sway") machine.wait_for_file("/tmp/sway-exit-ok") ''; } diff --git a/nixos/tests/swayfx.nix b/nixos/tests/swayfx.nix index ba8408e20460..7fa5c602f520 100644 --- a/nixos/tests/swayfx.nix +++ b/nixos/tests/swayfx.nix @@ -190,15 +190,15 @@ import ./make-test-python.nix ( machine.screenshot("sway_exit") swaymsg("exec swaylock") - machine.wait_until_succeeds("pgrep -x swaylock") + machine.wait_until_succeeds("pgrep -xf swaylock") machine.sleep(3) machine.send_chars("${nodes.machine.users.users.alice.password}") machine.send_key("ret") - machine.wait_until_fails("pgrep -x swaylock") + machine.wait_until_fails("pgrep -xf swaylock") # Exit Sway and verify process exit status 0: swaymsg("exit", succeed=False) - machine.wait_until_fails("pgrep -x sway") + machine.wait_until_fails("pgrep -xf sway") machine.wait_for_file("/tmp/sway-exit-ok") ''; } diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 1fac4d32b846..d06ce837c0a3 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,17 +12,17 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-L26jzAn8vwnw9kFd6ciyYS/OLEFTbN8doNKy3P8qKRE="; + hash = "sha256-Xo7aqP4tIh/kYthPucscxnl+ZtVioEja4TTFdH0Q350="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dqVnIiaGXnoKLvwQm/aiwSptKksikNGgAOu704rhDPA="; + cargoHash = "sha256-wDEtVsgkddGv89tTy96wYzNWVicn34Gxi+YAo7yAfQA="; # needed for librocksdb-sys nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix index 206aea51f263..82137b30e24c 100644 --- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix @@ -60,7 +60,7 @@ buildDotnetModule ( installPhase = '' runHook preInstall - dotnet tool install --tool-path $out/lib/${pname} ${nugetName} + dotnet tool install --tool-path $out/lib/${pname} ${nugetName} --version ${version} # remove files that contain nix store paths to temp nuget sources we made find $out -name 'project.assets.json' -delete diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix index c1fc73369299..7abdd26b6435 100644 --- a/pkgs/by-name/ac/act/package.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.2.71"; + version = "0.2.72"; in buildGoModule { pname = "act"; @@ -18,10 +18,10 @@ buildGoModule { owner = "nektos"; repo = "act"; tag = "v${version}"; - hash = "sha256-ykZ6n9v56G5PZNTYdkGp8xveA7gzYhICkBoCCx3s0ew="; + hash = "sha256-7tllNoloKlwBYL4TQY0o2ojbCtT0zG9GrU3xeRJu298="; }; - vendorHash = "sha256-zCiqIl08s00U/DQkUhbb/qrjWof9xzBf4EznuvE4rlE="; + vendorHash = "sha256-Px+pftEqpf/JhN11vNxYWIKVhUsrtd+XLIDaEAJHkX0="; doCheck = false; diff --git a/pkgs/by-name/ar/argo-rollouts/package.nix b/pkgs/by-name/ar/argo-rollouts/package.nix index db941e105191..83d21dce64bc 100644 --- a/pkgs/by-name/ar/argo-rollouts/package.nix +++ b/pkgs/by-name/ar/argo-rollouts/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-KljhBI7vNqQVV0UeFRXfdan1gEiwS1CwokgWnJ1RR5Q="; + sha256 = "sha256-PjtuUlZ+qAnmXo4QDfgi8onJ6QVBHIj/wTothma5H88="; }; - vendorHash = "sha256-38BLPNc6en70+UxlldmrwtRTMRLh/fCPL6FtuA2ODGM="; + vendorHash = "sha256-ypx5DF24CQNHLAVlw59bSHK++LMyNgcXMn0qkTUh/qs="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index 0af1d26d98e8..400aa112808a 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.27.2"; + version = "5.27.3"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-WdIXakivkeg98c3zDKUBlFIRcFo8iFHgFZVMIbkrR0g="; + sha256 = "sha256-/602rIjPZ6b9bMTpfjKz+XWpAlKoTHyCKUyGIA9qpto="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 94aef5ecbcb4..310be9e15d2d 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "deck"; - version = "1.42.1"; + version = "1.43.1"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${version}"; - hash = "sha256-+HXTBTE8oEvyEwzwJbM0snVV0sKcKFHFnHB1iJ+4LJc="; + hash = "sha256-6GzO3FyrVyhggjPPOsdX7gnOddYpthNbxQPa8t8gvbM="; }; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +27,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-YFEiv+mbU8ZE9u1lL4cZUo+7sVSu9P1UEkuKyAGwlkg="; + vendorHash = "sha256-b1c6bazXENCsphxasKfS3pPhuYkZBXywxopWUiyxXeY="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index 317500b7fb0e..80a957991a90 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -25,18 +25,18 @@ stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; tag = version; - hash = "sha256-jk2Pn/kqjMx5reMkIL8nLMWMZylwdoVq4FmnzaohnjU="; + hash = "sha256-PD76zxgQJ332MVu5LL9SNDrf66xmE/td4uDv/FYq0aU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-WiFW+xz5kxFKe9y8vHaFD9xW7f9iHc9hyCBWW4uMquU="; + hash = "sha256-3+UTN0KKnbpPm948XW4NSZkMYJUv974VtTqtG8orR/E="; }; nativeBuildInputs = [ @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { }; meta = { - changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.tag}/CHANGELOG.md"; description = "Travel with all your train information in one place. Also known as Railway"; homepage = "https://gitlab.com/schmiddi-on-mobile/railway"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/by-name/ea/easyrsa/package.nix b/pkgs/by-name/ea/easyrsa/package.nix index 2305745bd28f..96d3a0fe49dd 100644 --- a/pkgs/by-name/ea/easyrsa/package.nix +++ b/pkgs/by-name/ea/easyrsa/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "easyrsa"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - hash = "sha256-/c2Redb6whfM2D8hHBrcSaQ3YsBESLjeoKFb5a2lFbQ="; + hash = "sha256-gNuVijMAHVKEHU0Z6INKUZt68qSg5ssxSaXOH/+MU1I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 2839811d1ed7..260effa1a4e7 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -1,11 +1,12 @@ { fetchgit, - installShellFiles, lib, libftdi1, libgpiod, libjaylink, libusb1, + meson, + ninja, pciutils, pkg-config, stdenv, @@ -24,9 +25,11 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - installShellFiles + meson + ninja pkg-config ]; + buildInputs = [ libftdi1 @@ -42,21 +45,6 @@ stdenv.mkDerivation (finalAttrs: { libgpiod ]; - makeFlags = - let - yesNo = flag: if flag then "yes" else "no"; - in - [ - "libinstall" - "PREFIX=$(out)" - "CONFIG_JLINK_SPI=${yesNo withJlink}" - "CONFIG_LINUX_GPIO_SPI=${yesNo withGpio}" - "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=${yesNo (!stdenv.hostPlatform.isDarwin)}" - "CONFIG_INTERNAL_X86=${yesNo (!(stdenv.hostPlatform.isDarwin) && stdenv.hostPlatform.isx86_64)}" - "CONFIG_INTERNAL_DMI=${yesNo (!(stdenv.hostPlatform.isDarwin) && stdenv.hostPlatform.isx86_64)}" - "CONFIG_RAYER_SPI=${yesNo (!(stdenv.hostPlatform.isDarwin) && stdenv.hostPlatform.isx86_64)}" - ]; - meta = with lib; { homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index cd6479686710..590a483444a0 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -79,7 +79,7 @@ python.pkgs.buildPythonApplication rec { substituteInPlace frigate/detectors/detector_config.py \ --replace-fail "/labelmap.txt" "${placeholder "out"}/share/frigate/labelmap.txt" - substituteInPlace frigate/output/birdseye.py \ + substituteInPlace frigate/output/birdseye.py frigate/api/media.py \ --replace-fail "/opt/frigate/" "${placeholder "out"}/${python.sitePackages}/" # work around onvif-zeep idiosyncrasy diff --git a/pkgs/by-name/g3/g3proxy/package.nix b/pkgs/by-name/g3/g3proxy/package.nix new file mode 100644 index 000000000000..638806304fce --- /dev/null +++ b/pkgs/by-name/g3/g3proxy/package.nix @@ -0,0 +1,63 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + stdenv, + darwin, + c-ares, + python3, + lua5_4, + capnproto, + cmake, +}: + +rustPlatform.buildRustPackage rec { + pname = "g3"; + version = "v1.10.4"; + + src = fetchFromGitHub { + owner = "bytedance"; + repo = "g3"; + tag = "g3proxy-${version}"; + hash = "sha256-uafKYyzjGdtC+oMJG1wWOvgkSht/wTOzyODcPoTfOnU="; + }; + + cargoHash = "sha256-NbrJGGnpZkF7ZX3MqrMsZ03tWkN/nqWahh00O3IJGOw="; + useFetchCargoVendor = true; + + # TODO: can we unvendor AWS LC somehow? + buildFeatures = [ + "vendored-aws-lc" + "rustls-aws-lc" + ]; + + # aws-lc/crypto compilation will trigger `strictoverflow` errors. + hardeningDisable = [ "strictoverflow" ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + python3 + capnproto + cmake + ]; + + buildInputs = + [ + c-ares + lua5_4 + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = { + description = "Enterprise-oriented Generic Proxy Solutions"; + homepage = "https://github.com/bytedance/g3"; + changelog = "https://github.com/bytedance/g3/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ raitobezarius ]; + mainProgram = "g3proxy"; + }; +} diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index bb4ee81811bc..7506d33e295f 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -1,65 +1,76 @@ { lib, - fetchurl, - stdenv, + fetchFromGitHub, + flutter324, autoPatchelfHook, - dpkg, - makeWrapper, - wrapGAppsHook3, + buildGoModule, libayatana-appindicator, - libayatana-indicator, - libdbusmenu, - ayatana-ido, - zenity, }: -stdenv.mkDerivation rec { - pname = "gopeed"; - version = "1.6.6"; - src = fetchurl { - url = "https://github.com/GopeedLab/gopeed/releases/download/v${version}/Gopeed-v${version}-linux-amd64.deb"; - hash = "sha256-Q2eCOah5Pz5kOiHjvB0CzC0iL8m4XAjAJzYxQ+YyBoY="; +let + version = "1.6.8"; + + src = fetchFromGitHub { + owner = "GopeedLab"; + repo = "gopeed"; + tag = "v${version}"; + hash = "sha256-Z6t652m420FcCK4V9sG9I+Dzc2OTyXwWunBhVSreyac="; }; - nativeBuildInputs = [ - dpkg - autoPatchelfHook - wrapGAppsHook3 - makeWrapper - ]; - - buildInputs = [ - libayatana-appindicator - libayatana-indicator - libdbusmenu - ayatana-ido - ]; - - installPhase = '' - runHook preInstall - - mkdir $out - cp -r opt $out/app - cp -r usr/share $out/share - - runHook postInstall - ''; - - dontWrapGApps = true; - - preFixup = '' - makeWrapper $out/app/gopeed/gopeed $out/bin/gopeed \ - "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath [ zenity ]} - ''; - - meta = { - homepage = "https://gopeed.com"; - description = "Modern download manager that supports all platforms. Built with Golang and Flutter"; - mainProgram = "gopeed"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + metaCommon = { + description = "Modern download manager that supports all platforms"; + homepage = "https://github.com/GopeedLab/gopeed"; license = with lib.licenses; [ gpl3Plus ]; maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; + }; + + libgopeed = buildGoModule { + inherit version src; + pname = "libgopeed"; + + vendorHash = "sha256-rJriTQF4tf7sZXcEDS6yZXk3xUI8Cav8OC7o4egpfIw="; + + buildPhase = '' + runHook preBuild + + mkdir -p $out/lib + go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=v${version}" -buildmode=c-shared -o $out/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop + + runHook postBuild + ''; + + meta = metaCommon; + }; +in +flutter324.buildFlutterApplication { + inherit version src libgopeed; + pname = "gopeed"; + + sourceRoot = "${src.name}/ui/flutter"; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes.permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA="; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ libayatana-appindicator ]; + + preBuild = '' + mkdir -p linux/bundle/lib + cp ${libgopeed}/lib/libgopeed.so linux/bundle/lib/libgopeed.so + ''; + + postInstall = '' + install -Dm644 linux/assets/com.gopeed.Gopeed.desktop $out/share/applications/gopeed.desktop + install -Dm644 assets/icon/icon_512.png $out/share/icons/hicolor/512x512/apps/com.gopeed.Gopeed.png + install -Dm644 assets/icon/icon_1024.png $out/share/icons/hicolor/1024x1024/apps/com.gopeed.Gopeed.png + ''; + + passthru.updateScript = ./update.sh; + + meta = metaCommon // { + mainProgram = "gopeed"; }; } diff --git a/pkgs/by-name/go/gopeed/pubspec.lock.json b/pkgs/by-name/go/gopeed/pubspec.lock.json new file mode 100644 index 000000000000..62e21f14af5c --- /dev/null +++ b/pkgs/by-name/go/gopeed/pubspec.lock.json @@ -0,0 +1,1735 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "72.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "after_layout": { + "dependency": "transitive", + "description": { + "name": "after_layout", + "sha256": "95a1cb2ca1464f44f14769329fbf15987d20ab6c88f8fc5d359bd362be625f29", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.7.0" + }, + "animations": { + "dependency": "transitive", + "description": { + "name": "animations", + "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.11" + }, + "app_links": { + "dependency": "direct main", + "description": { + "name": "app_links", + "sha256": "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.3" + }, + "app_links_linux": { + "dependency": "transitive", + "description": { + "name": "app_links_linux", + "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "app_links_platform_interface": { + "dependency": "transitive", + "description": { + "name": "app_links_platform_interface", + "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "app_links_web": { + "dependency": "transitive", + "description": { + "name": "app_links_web", + "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "badges": { + "dependency": "direct main", + "description": { + "name": "badges", + "sha256": "a7b6bbd60dce418df0db3058b53f9d083c22cdb5132a052145dc267494df0b84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.13" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "checkable_treeview": { + "dependency": "direct main", + "description": { + "name": "checkable_treeview", + "sha256": "3d7543e2c93a968864a57ca0666fc3b5827d89d13b22cb637a427596032f9272", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "contentsize_tabbarview": { + "dependency": "direct main", + "description": { + "name": "contentsize_tabbarview", + "sha256": "4a3cf5e3a17bb5ebe5ee56d55c518f4dde7db639334b79f874f03ecea4755b22", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2" + }, + "context_menus": { + "dependency": "direct main", + "description": { + "name": "context_menus", + "sha256": "3b4f846a7a7dcb8cc76bb0c8c1b3915501f5f7370c524e3aa00ab4cc048f08db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "contextmenu_plus": { + "dependency": "direct main", + "description": { + "name": "contextmenu_plus", + "sha256": "c4c3a11633ba98b6e325e80942cd6ca29269b246e307b0a43514ae4f9c8bcc7f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7" + }, + "desktop_drop": { + "dependency": "direct main", + "description": { + "name": "desktop_drop", + "sha256": "d55a010fe46c8e8fcff4ea4b451a9ff84a162217bdb3b2a0aa1479776205e15d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.4" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "c4af09051b4f0508f6c1dc0a5c085bf014d5c9a4a0678ce1799c2b4d716387a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.1.0" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.7.0" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "expandable_page_view": { + "dependency": "transitive", + "description": { + "name": "expandable_page_view", + "sha256": "210dc6961cfc29f7ed42867824eb699c9a4b9b198a7c04b8bdc1c05844969dc6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.17" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "ffigen": { + "dependency": "direct dev", + "description": { + "name": "ffigen", + "sha256": "d3e76c2ad48a4e7f93a29a162006f00eba46ce7c08194a77bb5c5e97d1b5ff0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.2" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.4" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.2" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "fluent_ui": { + "dependency": "direct main", + "description": { + "name": "fluent_ui", + "sha256": "e7804bf3bbb3ecf9e77d5498181dc36375f5ca736ccfb3862fea17c50050eb89", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.2" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_foreground_task": { + "dependency": "direct main", + "description": { + "name": "flutter_foreground_task", + "sha256": "294280d8055af5628a8085bb765ba442561eaab3d5bcdf2eea4f20614f18618f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.2.0" + }, + "flutter_form_builder": { + "dependency": "direct main", + "description": { + "name": "flutter_form_builder", + "sha256": "c278ef69b08957d484f83413f0e77b656a39b7a7bb4eb8a295da3a820ecc6545", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.5.0" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.23" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "form_builder_validators": { + "dependency": "direct main", + "description": { + "name": "form_builder_validators", + "sha256": "c61ed7b1deecf0e1ebe49e2fa79e3283937c5a21c7e48e3ed9856a4a14e1191a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.0.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "get": { + "dependency": "direct main", + "description": { + "name": "get", + "sha256": "e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.6.6" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "gtk": { + "dependency": "transitive", + "description": { + "name": "gtk", + "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "hive": { + "dependency": "direct main", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "intl": { + "dependency": "transitive", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.8.0" + }, + "launch_at_startup": { + "dependency": "direct main", + "description": { + "name": "launch_at_startup", + "sha256": "1f8a75520913d1038630049e6c44a2575a23ffd28cc8b14fdf37401d1d21de84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lecle_downloads_path_provider": { + "dependency": "direct main", + "description": { + "name": "lecle_downloads_path_provider", + "sha256": "111f6d6d21e18acddda515eba8fd445658aa14defcbd59513d6d1b02b9ed47a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2+8" + }, + "lint": { + "dependency": "transitive", + "description": { + "name": "lint", + "sha256": "4a539aa34ec5721a2c7574ae2ca0336738ea4adc2a34887d54b7596310b33c85", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "7ad7215c15420a102ec687bb320a7312afd449bac63bfb1c60d9787c27b9767f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "math_expressions": { + "dependency": "transitive", + "description": { + "name": "math_expressions", + "sha256": "e32d803d758ace61cc6c4bdfed1226ff60a6a23646b35685670d28b5616139f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "menu_base": { + "dependency": "transitive", + "description": { + "name": "menu_base", + "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "open_filex": { + "dependency": "direct main", + "description": { + "name": "open_filex", + "sha256": "ba425ea49affd0a98a234aa9344b9ea5d4c4f7625a1377961eae9fe194c3d523", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.12" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.13" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.5" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+5" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.3" + }, + "permission_handler_windows": { + "dependency": "direct overridden", + "description": { + "path": "permission_handler_windows", + "ref": "35fc72c30262b9b49e1965b48a7524b44ba9daa7", + "resolved-ref": "35fc72c30262b9b49e1965b48a7524b44ba9daa7", + "url": "https://github.com/monkeyWie/flutter-permission-handler.git" + }, + "source": "git", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "rounded_loading_button_plus": { + "dependency": "direct main", + "description": { + "name": "rounded_loading_button_plus", + "sha256": "8baad9b66c4a81b02b597edf7691cf78f7267a999c08a68937e391af7b2da653", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "scroll_pos": { + "dependency": "transitive", + "description": { + "name": "scroll_pos", + "sha256": "cebf602b2dd939de6832bb902ffefb574608d1b84f420b82b381a4007d3c1e1b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "share_handler": { + "dependency": "direct main", + "description": { + "name": "share_handler", + "sha256": "76575533be04df3fecbebd3c5b5325a8271b5973131f8b8b0ab8490c395a5d37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.22" + }, + "share_handler_android": { + "dependency": "transitive", + "description": { + "name": "share_handler_android", + "sha256": "124dcc914fb7ecd89076d3dc28435b98fe2129a988bf7742f7a01dcb66a95667", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.9" + }, + "share_handler_ios": { + "dependency": "transitive", + "description": { + "name": "share_handler_ios", + "sha256": "cdc21f88f336a944157a8e9ceb191525cee3b082d6eb6c2082488e4f09dc3ece", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.15" + }, + "share_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_handler_platform_interface", + "sha256": "7a4df95a87b326b2f07458d937f2281874567c364b7b7ebe4e7d50efaae5f106", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.6" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "334fcdf0ef9c0df0e3b428faebcac9568f35c747d59831474b2fc56e156d244e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.0" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.1" + }, + "shared_preferences": { + "dependency": "transitive", + "description": { + "name": "shared_preferences", + "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "shortid": { + "dependency": "transitive", + "description": { + "name": "shortid", + "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.4" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "styled_widget": { + "dependency": "direct main", + "description": { + "name": "styled_widget", + "sha256": "4d439802919b6ccf10d1488798656da8804633b03012682dd1c8ca70a084aa84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "toggle_switch": { + "dependency": "direct main", + "description": { + "name": "toggle_switch", + "sha256": "dca04512d7c23ed320d6c5ede1211a404f177d54d353bf785b07d15546a86ce5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "tray_manager": { + "dependency": "direct main", + "description": { + "name": "tray_manager", + "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.4" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "uri_to_file": { + "dependency": "direct main", + "description": { + "name": "uri_to_file", + "sha256": "cbbb38f975d22311efacc9a53cdcb806708606666d8092314b81c5cb7983b700", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.12" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "2294c64768987ea280b43a3d8357d42d5679f3e2b5b69b602be45b2abbd165b0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.6.1" + }, + "win32_registry": { + "dependency": "direct main", + "description": { + "name": "win32_registry", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.0" + } +} diff --git a/pkgs/by-name/go/gopeed/update.sh b/pkgs/by-name/go/gopeed/update.sh new file mode 100755 index 000000000000..1bdf16913950 --- /dev/null +++ b/pkgs/by-name/go/gopeed/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" + +latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/GopeedLab/gopeed/releases/latest | jq --raw-output .tag_name) +latestVersion=$(echo "$latestTag" | sed 's/^v//') + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; gopeed.version or (lib.getVersion gopeed)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +nix-update gopeed.libgopeed + +curl https://raw.githubusercontent.com/GopeedLab/gopeed/${latestTag}/ui/flutter/pubspec.lock | yq . >$ROOT/pubspec.lock.json diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 6d2a6e825e01..6b77d91ae55f 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-phwFwrRuMPWPaPKi41G/YQfiRWFfNCir9478VrGckWI="; + hash = "sha256-UzsRiEYDKvOQR1jlD5KVZlJjhqzF1Digii85HI3vuOc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sbEky7mRPq7p9W+TXYE+3vGoZXP4NuC9dec3rTIxBPI="; + cargoHash = "sha256-TrABsTBO0Tn7V6Ev2GDsHguB792S7FSK3bBoi0JbhcI="; meta = { description = "Grammar Checker for Developers"; diff --git a/pkgs/by-name/hy/hyprdim/package.nix b/pkgs/by-name/hy/hyprdim/package.nix index e2ee3d908230..895d25fbfe9a 100644 --- a/pkgs/by-name/hy/hyprdim/package.nix +++ b/pkgs/by-name/hy/hyprdim/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "hyprdim"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "donovanglover"; repo = "hyprdim"; rev = version; - hash = "sha256-+nzIDtRLVA6CgCtbyeR+TU5euSZQb7wi2187IxLrAmQ="; + hash = "sha256-o06HnN/E8QWRFOqd9Sxolm4g/fI5+6hYITptnRNAFag="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4EMzl0KGpDBGfHpHVx+7YwEti+DLUjPEipkRmzK+dyM="; + cargoHash = "sha256-8xbmVQHMXs9rq4iP5Svx2Zdg/B9WuZuq+hKsokk2m78="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 942daa22e053..32a0404a26a5 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.47.1-b", - "commit_hash": "75dff7205f6d2bd437abfb4196f700abee92581a", - "commit_message": "version: bump to 0.47.1", - "date": "2025-01-29", - "tag": "v0.47.1" + "branch": "v0.47.2-b", + "commit_hash": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", + "commit_message": "version: bump to 0.47.2", + "date": "2025-02-02", + "tag": "v0.47.2" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 96493d63a36f..eca4e58f5761 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -86,14 +86,14 @@ assert assertMsg (!hidpiXWayland) customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.47.1"; + version = "0.47.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-374Ul6LCnuDdZ7o1xl2lDxTfmwt46K6csf6eniqFRYA="; + hash = "sha256-dSKR1VpjpdJVZ5dmLgIvAu3K+DYrSbohZkqxSQhjw8U="; }; postPatch = '' diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index faa881f229a5..fee0f352c735 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -4,7 +4,6 @@ cargo, cmake, fetchFromGitHub, - fetchpatch, go, lib, libcap, @@ -23,27 +22,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.24.3"; + version = "2.25.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-GRt0diDt8bEeMfDwiEtYyR+20/bJAVcDal9eGfvk340="; + hash = "sha256-XunvADSdLA6jFVjXTAtmYvC1i5ZE7WYaCTvlAd8C1ko="; }; - patches = [ - # Fix build errors from deprecated `QByteArray::count()`, `QVariant::type()`, `QEventPoint::pos()` (#9961) - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/b4077b9927d9208118e81694dce490dac2f0e76f.patch"; - hash = "sha256-Vx7aHEBxubthqsmH37ZZDJDPI9jE9vS/p+JNJP6eUlI="; - }) - # Re:#9966 Fix Crash in MZFlickable - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9984/commits/485a2ad8feab6b1dee7c672ce03736d819fd9d37.patch"; - includes = [ "nebula/ui/components/MZFlickable.qml" ]; - hash = "sha256-fnOXBTsuQC3kqAvHgoJ7rRGX5ra0R/MO8M9Ysys/l7Q="; - }) - ]; + patches = [ ]; netfilter = buildGoModule { pname = "${finalAttrs.pname}-netfilter"; @@ -58,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-EUD6eAhe5Qjom60EZ9LTRmBsfDyIJV1Kx7PBU4ikR0w="; + hash = "sha256-HaOqhjDodn9z0XQMsxJAMKrs1s7l2cJCIzHECjwnA5A="; }; buildInputs = [ @@ -89,13 +76,18 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' + substituteInPlace scripts/cmake/addons.cmake \ + --replace-fail 'set(ADDON_BUILD_ARGS ' 'set(ADDON_BUILD_ARGS -q ${qt6.qttools.dev}/bin ' + substituteInPlace src/cmake/linux.cmake \ - --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ - --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ - --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" + --replace-fail '/usr/share/dbus-1' "$out/share/dbus-1" \ + --replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" substituteInPlace extension/CMakeLists.txt \ - --replace '/etc' "$out/etc" + --replace-fail '/etc' "$out/etc" + + substituteInPlace extension/socks5proxy/bin/CMakeLists.txt \ + --replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" ln -s '${finalAttrs.netfilter.goModules}' linux/netfilter/vendor ''; diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index 70cbbb7c22b7..47e63c090ae5 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "19.0.3"; + version = "20.0.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-aNb/zM/KF46XDV0GjQfm2XvkbToJZf6ZdwK1E1ShA+o="; + sha256 = "sha256-+j6Y1Z17fJkH4KQyC1gjZeWhFRwHpCGcLQC2hOmIZ2A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index cb829dd1e7f8..a6042b18ed2a 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation rec { - version = "2024-10-01"; + version = "2025-01-30"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "f4423ebd09fbc7670815c3c20cc86c81b7319e5f"; - sha256 = "sha256-JlYgWssS1DT1/Jlk6fOZqyEr6ta3ky6tlDqDZbJ1A9k="; + rev = "1c34b0e67d4f1dff36a079f31d7dafe8bcf92f6e"; + sha256 = "sha256-+y8fN1A+wb24H4s/KJ8VpuauCvwoItoruDwXlIw8ed4="; }; strictDeps = true; diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 5202728adaa8..5b4ce545d1f4 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "39.137.1"; + version = "39.153.1"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-E3J+jEd21j5r4iaa4D2mNbWcwfwyzcaHTHiD3jBVXlQ="; + hash = "sha256-QKCUHwm6c50wTDFbmAqhh/tV8Lzx9HD4U9k7ke6t8OE="; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ljhRpFMafpB0xbmGVoh8Icwm0c0dr7JPqAA/6sln03w="; + hash = "sha256-MTkbRQnimEXP4XepJ+x2KGHtJTkqN9WBWvisAHH/j18="; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix index 6db87bd47e08..3d2a550ed790 100644 --- a/pkgs/by-name/st/stylelint/package.nix +++ b/pkgs/by-name/st/stylelint/package.nix @@ -3,22 +3,18 @@ fetchFromGitHub, lib, }: - -let - version = "16.14.0"; -in -buildNpmPackage { +buildNpmPackage rec { pname = "stylelint"; - inherit version; + version = "16.14.1"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; - rev = version; - hash = "sha256-AAlo8fGUH+jvUsB66cztLDyKA7j25ZWH0BIM7iiyp+c="; + tag = version; + hash = "sha256-VBr/16r/hpHRTMwndsklCo/9V8lb0NI/MSgOyEM7TYI="; }; - npmDepsHash = "sha256-FT6UctAsUP9KTSWENutibhyXjZHOT7t93z90XCAIuv4="; + npmDepsHash = "sha256-2D4uaZk3OAruFRucjSroMnGBWWnOxm+r7WndmPPbNv0="; dontNpmBuild = true; diff --git a/pkgs/by-name/sw/swaybg/package.nix b/pkgs/by-name/sw/swaybg/package.nix index 6536847abbe4..c65abd5bd7ca 100644 --- a/pkgs/by-name/sw/swaybg/package.nix +++ b/pkgs/by-name/sw/swaybg/package.nix @@ -1,7 +1,18 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc -, wayland, wayland-protocols, cairo, gdk-pixbuf -, wayland-scanner +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + scdoc, + wayland, + wayland-protocols, + cairo, + gdk-pixbuf, + wayland-scanner, + wrapGAppsNoGuiHook, + librsvg }: stdenv.mkDerivation rec { @@ -11,17 +22,32 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "swaywm"; repo = "swaybg"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-IJcPSBJErf8Dy9YhYAc9eg/llgaaLZCQSB0Brof+kpg="; }; strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + wrapGAppsNoGuiHook + gdk-pixbuf + ]; + buildInputs = [ + wayland + wayland-protocols + cairo + gdk-pixbuf + librsvg + ]; mesonFlags = [ - "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" ]; meta = with lib; { diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index f76f7cdbf0b4..b575c35be975 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -1,6 +1,20 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + scdoc, + wayland-scanner, + wayland, + wayland-protocols, + libxkbcommon, + cairo, + gdk-pixbuf, + pam, + wrapGAppsNoGuiHook, + librsvg }: stdenv.mkDerivation rec { @@ -10,17 +24,35 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-1+AXxw1gH0SKAxUa0JIhSzMbSmsfmBPCBY5IKaYtldg="; }; strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + wrapGAppsNoGuiHook + gdk-pixbuf + ]; + buildInputs = [ + wayland + wayland-protocols + libxkbcommon + cairo + gdk-pixbuf + pam + librsvg + ]; mesonFlags = [ - "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + "-Dpam=enabled" + "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" ]; meta = with lib; { diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 0ecfd9098802..a56794466c89 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.72.2"; + version = "0.72.6"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; tag = "v${version}"; - hash = "sha256-SX7y4YLKehyz0vutNDWCBF9w20xW1EuDBaAkqENNTJ0="; + hash = "sha256-dlEyeDh5OkERboEUPhe/jYYEc7jnGZL6PhW9Tu6vxcs="; }; nativeBuildInputs = [ go-mockery ]; @@ -22,7 +22,7 @@ buildGoModule rec { make generate-mocks ''; - vendorHash = "sha256-a+nsbgAUgC7d8Nqexzubbx9CqK3o+TJbO+FJH3Fr2Js="; + vendorHash = "sha256-hgjVmbM0qh8o1e2UaU9Q0GURzC8XPthLAuXZ+eCuflU="; doCheck = false; diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix index 0c2c6f74cc11..d8c28727e81f 100644 --- a/pkgs/by-name/va/vault-bin/package.nix +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.18.3"; + version = "1.18.4"; src = let @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-pELGadExnOMVC+BZMk6vmth6cN2f0DdVz8gQmaHDv8Y="; - aarch64-linux = "sha256-53LGpPcJUz+1Dw8UKE5tX6VGMJc4LfXw2MaiKKfYbvI="; - i686-linux = "sha256-3SEw3iOEYC/HopzvjJNXgtYZhpSag1lgsmsq7goyZDs="; - x86_64-darwin = "sha256-Bz0mhmFOfJL3m1qX7lmLHNGuZCkyKXu14X523M9Dp0Q="; - aarch64-darwin = "sha256-GM6pN4cngjt7dhF5mNqeoygS4+fkCjsCGyxo/IEaMWs="; + x86_64-linux = "sha256-rQXtyxaM1OOF54kIeIWHEwaXYbJyHhuruH+kOSZ/6zc="; + aarch64-linux = "sha256-Bqg3UE8CXplJiYK9YKwAy88unZWmWus5IgQS4Bh0ODA="; + i686-linux = "sha256-qVEueQ00gqAEbOI4ThcU7vZu8TL4oeBDarOtOkSaGvY="; + x86_64-darwin = "sha256-tCTnOHmLaa2uTOr9ju0QHN/LexAoBlCUMrEXPLc2LJ4="; + aarch64-darwin = "sha256-sbwVOxMNCq1wcAT4PcDlu9HEsrPphLE2L87zZqfAg8M="; }; in fetchzip { diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index 17f9a72decd3..c94630089594 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "vault"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-DwwKxTjwY6CKN4RPRJFxgdTdGYeG4A7lYk7iZFC9SbY="; + hash = "sha256-lGca4156jcAfm9ohTus/yhpu4XhGxKW5bZqZ3CCMY7o="; }; - vendorHash = "sha256-nrQIlenyXCCfjIyJT6whmWwzUmHl+rwFeyI2LiIxHkk="; + vendorHash = "sha256-KrfXM9jDRpJCzEsLXYCcKbQM4qnFQejslLdNmcvgDlg="; proxyVendor = true; diff --git a/pkgs/by-name/ye/yek/package.nix b/pkgs/by-name/ye/yek/package.nix new file mode 100644 index 000000000000..9c0f2b58df2c --- /dev/null +++ b/pkgs/by-name/ye/yek/package.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + nix-update-script, + versionCheckHook, +}: +let + version = "0.16.0"; +in +rustPlatform.buildRustPackage { + pname = "yek"; + version = version; + + src = fetchFromGitHub { + owner = "bodo-run"; + repo = "yek"; + tag = "v${version}"; + hash = "sha256-dboKZuY6mlFZu/xCoLXFJ4ARXyYs5/yOYeGkAnUKRX4="; + }; + cargoHash = "sha256-3+jTzYwu9eHji8o4abLiiJGXtZYPfXtXeiZEZajxrVo="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + env.OPENSSL_NO_VENDOR = 1; + + checkFlags = [ + # Tests with git fail + "--skip=e2e_tests::test_git_boost_config" + "--skip=e2e_tests::test_git_integration" + "--skip=lib_tests::test_serialize_repo_with_git" + "--skip=priority_tests::test_get_recent_commit_times_empty_repo" + "--skip=priority_tests::test_get_recent_commit_times_with_git" + "--skip=priority_tests::test_get_recent_commit_times_git_failure" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Serialize text files for LLM consumption"; + longDescription = '' + Tool to read text-based files, chunk them, and serialize them for LLM consumption. + ''; + homepage = "https://github.com/bodo-run/yek"; + changelog = "https://github.com/bodo-run/yek/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "yek"; + maintainers = with lib.maintainers; [ louis-thevenet ]; + }; +} diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index b8371f5690f1..e13019f528be 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -95,7 +95,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.171.4"; + version = "0.171.6"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-DeZHXU106uqCyqjdF+rMdnFifra9ug9Dzosg+PcD8Nw="; + hash = "sha256-OQE/6bNGogcDpZOEUXq33E98/t1HKelTTX48X4wo2MI="; }; patches = [ @@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-uB6CM3KSr57sfbh81rXBhNq8LChme5+WHVIjwZrSso4="; + cargoHash = "sha256-lucQTqTc63a3HvqwWVosqxMzy4TgC+Mj77rFzVbwBR8="; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4aea3d8fe5e8..e164efc9440b 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -207,10 +207,9 @@ in ... }@attrs: -assert (pyproject != null) -> (format == null); - let format' = + assert (pyproject != null) -> (format == null); if pyproject != null then if pyproject then "pyproject" else "other" else if format != null then @@ -276,6 +275,7 @@ let # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule ( stdenv.mkDerivation ( + finalAttrs: (cleanAttrs attrs) // { @@ -402,13 +402,12 @@ let { inherit disabled; } - // attrs.passthru or { } // { updateScript = let - filename = head (splitString ":" self.meta.position); + filename = head (splitString ":" finalAttrs.finalPackage.meta.position); in - attrs.passthru.updateScript or [ + [ update-python-libraries filename ]; @@ -421,7 +420,8 @@ let } // optionalAttrs (build-system != [ ]) { inherit build-system; - }; + } + // attrs.passthru or { }; meta = { # default to python's platforms diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 75e7dd83173a..02300531ef34 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.14.5"; + version = "6.14.6"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-jjrmagznL0N9vCtLN6tMeierIjI9Q5JGJLYIimQO3ts="; + hash = "sha256-A61X6WKrP7CVgcRyB6phrVQo/B9VESRo0xTZV49KA3M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index df952df2bd0a..a041d06a2711 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -39,7 +39,10 @@ buildPythonPackage rec { hash = "sha256-pZhHlNcQJLBww7ur2Z6Yb2IdbRsBtjzQAzfa4UzGKt4="; }; - pythonRelaxDeps = [ "pydantic" ]; + pythonRelaxDeps = [ + "pydantic" + "numpy" + ]; nativeBuildInputs = [ poetry-core diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix index afd87a2b2434..2cef0d7db511 100644 --- a/pkgs/development/python-modules/diffenator2/default.nix +++ b/pkgs/development/python-modules/diffenator2/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, pytestCheckHook, poetry-core, poetry-dynamic-versioning, @@ -43,6 +42,7 @@ buildPythonPackage rec { "protobuf" "python-bidi" "youseedee" + "unicodedata2" ]; build-system = [ diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 34bbf1bbb8c7..049aa3c53c74 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pytestCheckHook, fontmath, fonttools, @@ -26,6 +27,16 @@ buildPythonPackage rec { hash = "sha256-ZlK8QyZ5cIEphFiZXMV/Z5pL9H62X2UwLBtpwLGpUMQ="; }; + patches = [ + # Update to FontTools 4.55 and glyphsLib 6.9.5 + # https://github.com/googlefonts/fontmake/pull/1133 + (fetchpatch2 { + url = "https://github.com/googlefonts/fontmake/commit/ca96d25faa67638930ddc7f9bd1ab218a76caf22.patch"; + includes = [ "tests/test_main.py" ]; + hash = "sha256-vz+KeWiGCpUdX5HaXDdyyUCbuMkIylB364j6cD7xR1E="; + }) + ]; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 2492811b8ce7..38047d77638d 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -112,6 +112,10 @@ buildPythonPackage rec { dontBypassPoetryDynamicVersioning = true; env.POETRY_DYNAMIC_VERSIONING_BYPASS = lib.head (lib.strings.splitString "-" version); + pythonRelaxDeps = [ + "toolz" + ]; + dependencies = [ atpublic parsy diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix index 00c54bde3245..ddf33f5ef005 100644 --- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -25,9 +25,13 @@ buildPythonPackage rec { hash = "sha256-/3xRPrKzYAdSlY+sQxwCUzKhf3NJBSyWG2Q0ZKb6v3U="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "numpy" + ]; + + dependencies = [ dataprep-ml numpy pandas diff --git a/pkgs/development/python-modules/pint-xarray/default.nix b/pkgs/development/python-modules/pint-xarray/default.nix new file mode 100644 index 000000000000..5d38fa108940 --- /dev/null +++ b/pkgs/development/python-modules/pint-xarray/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + numpy, + pint, + xarray, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pint-xarray"; + version = "0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xarray-contrib"; + repo = "pint-xarray"; + tag = "v${version}"; + hash = "sha256-IFHSgrnqS7ZpNhRzzSgHPRUP90WNv84jBH4um/DRMCU="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + numpy + pint + xarray + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pint_xarray" + ]; + + meta = { + description = "Interface for using pint with xarray, providing convenience accessors"; + homepage = "https://github.com/xarray-contrib/pint-xarray"; + changelog = "https://github.com/xarray-contrib/pint-xarray/blob/v${version}/docs/whats-new.rst"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index b4e544a607ae..80bc703c8405 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "psutil" "py3langid" + "numpy" ]; build-system = [ poetry-core ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c305b363602d..b2cab540a8e5 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -18,20 +18,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.122.0"; + version = "1.123.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-pucGVKEjQNihlHmFxhgJSiX7sxpQYrCpSwhZByBtbe8="; + hash = "sha256-fbT0DMz6F76e/IRb0e1nFEOxmtIDQ53it8zi88jiUDU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-1BFVW89+1js5mn/EPxkuHaUfkFn/dNlMlH1pN2lDcwE="; + hash = "sha256-Lfs7myNxWoPZI4USoK+aaTPLjT2EoEvnVnXFwdcKofE="; }; postPatch = '' diff --git a/pkgs/servers/sql/postgresql/ext/default.nix b/pkgs/servers/sql/postgresql/ext/default.nix index 7c346fbfd0de..12793d40c49d 100644 --- a/pkgs/servers/sql/postgresql/ext/default.nix +++ b/pkgs/servers/sql/postgresql/ext/default.nix @@ -116,6 +116,8 @@ in { tsja = super.callPackage ./tsja.nix { }; wal2json = super.callPackage ./wal2json.nix { }; + + pgddl = super.callPackage ./pgddl.nix {}; } // lib.optionalAttrs config.allowAliases { pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)"; } diff --git a/pkgs/servers/sql/postgresql/ext/pgddl.nix b/pkgs/servers/sql/postgresql/ext/pgddl.nix new file mode 100644 index 000000000000..61ef2095ccdc --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgddl.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + postgresql, + buildPostgresqlExtension, + postgresqlTestExtension, + perl, +}: +buildPostgresqlExtension (finalAttrs: { + pname = "pgddl"; + version = "0.29"; + + src = fetchFromGitHub { + owner = "lacanoid"; + repo = "pgddl"; + tag = finalAttrs.version; + hash = "sha256-W3G6TGtkj+zXXdGZZR0bmZhsLuFJvuGTlDoo8kL8sf0="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + postgresql + perl + ]; + + preBuild = '' + patchShebangs --build ./bin/ ./docs + ''; + + passthru.tests.extension = postgresqlTestExtension { + inherit (finalAttrs) finalPackage; + sql = '' + CREATE EXTENSION ddlx; + + CREATE TABLE a(i int PRIMARY KEY, j int); + + SELECT ddlx_create('a'::regclass); + SELECT ddlx_drop('a'::regclass); + SELECT ddlx_script('a'::regclass); + ''; + }; + + meta = { + description = "DDL eXtractor functions for PostgreSQL"; + homepage = "https://github.com/lacanoid/pgddl"; + changelog = "https://github.com/lacanoid/pgddl/releases/tag/${finalAttrs.version}"; + platforms = postgresql.meta.platforms; + maintainers = [ lib.maintainers.joshainglis ]; + license = lib.licenses.postgresql; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3225fef4aaa2..ccdd8836c84b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10495,6 +10495,8 @@ self: super: with self; { pint-pandas = callPackage ../development/python-modules/pint-pandas { }; + pint-xarray = callPackage ../development/python-modules/pint-xarray { }; + pip = callPackage ../development/python-modules/pip { }; pipdate = callPackage ../development/python-modules/pipdate { };