diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 5a8f20eb711d..b3a85c297925 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -26,5 +26,6 @@ jobs: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + - run: nix --experimental-features 'nix-command flakes' flake check --all-systems --no-build # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/ci/OWNERS b/ci/OWNERS index 96ba4f85b0ef..4ab451624a9e 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -27,7 +27,7 @@ # Libraries /lib @infinisil -/lib/systems @alyssais @ericson2314 +/lib/systems @alyssais @ericson2314 @NixOS/stdenv /lib/generators.nix @infinisil @Profpatsch /lib/cli.nix @infinisil @Profpatsch /lib/debug.nix @infinisil @Profpatsch @@ -49,10 +49,10 @@ /pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314 /pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron -/pkgs/stdenv @philiptaron -/pkgs/stdenv/generic @Ericson2314 -/pkgs/stdenv/generic/check-meta.nix @Ericson2314 -/pkgs/stdenv/cross @Ericson2314 +/pkgs/stdenv @philiptaron @NixOS/stdenv +/pkgs/stdenv/generic @Ericson2314 @NixOS/stdenv +/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @NixOS/stdenv +/pkgs/stdenv/cross @Ericson2314 @NixOS/stdenv /pkgs/build-support @philiptaron /pkgs/build-support/cc-wrapper @Ericson2314 /pkgs/build-support/bintools-wrapper @Ericson2314 @@ -179,7 +179,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # C compilers /pkgs/development/compilers/gcc -/pkgs/development/compilers/llvm @alyssais @RossComputerGuy +/pkgs/development/compilers/llvm @alyssais @RossComputerGuy @NixOS/llvm /pkgs/development/compilers/emscripten @raitobezarius /doc/languages-frameworks/emscripten.section.md @raitobezarius diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 5a9144792d19..c79fd3a55df9 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -232,6 +232,19 @@ To add a new plugin, run `nix-shell -p vimPluginsUpdater --run 'vim-plugins-upda Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `vimPluginsUpdater` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim. +### Testing Neovim plugins {#testing-neovim-plugins} + +`nvimRequireCheck=MODULE` is a simple test which checks if Neovim can requires the lua module `MODULE` without errors. This is often enough to catch missing dependencies. + +This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). + +```nix + gitsigns-nvim = super.gitsigns-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + nvimRequireCheck = "gitsigns"; + }; +``` + ### Plugin optional configuration {#vim-plugin-required-snippet} Some plugins require specific configuration to work. We choose not to diff --git a/flake.nix b/flake.nix index 950eb2b5c4d1..9873c1c94971 100644 --- a/flake.nix +++ b/flake.nix @@ -80,8 +80,17 @@ checks = forAllSystems (system: { tarball = jobs.${system}.tarball; - # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 - } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.hostPlatform.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) { + } // lib.optionalAttrs + ( + self.legacyPackages.${system}.stdenv.hostPlatform.isLinux + # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 + && !self.legacyPackages.${system}.targetPlatform.isPower64 + # Exclude armv6l-linux due to "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')" + && system != "armv6l-linux" + # Exclude riscv64-linux due to "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')" + && system != "riscv64-linux" + ) + { # Test that ensures that the nixosSystem function can accept a lib argument # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.` @@ -111,10 +120,20 @@ }).nixos.manual; }; - devShells = forAllSystems (system: { - /** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */ - default = import ./shell.nix { inherit system; }; - }); + devShells = forAllSystems (system: + { } // lib.optionalAttrs + ( + # Exclude armv6l-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" + system != "armv6l-linux" + # Exclude riscv64-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" + && system != "riscv64-linux" + # Exclude FreeBSD because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" + && !self.legacyPackages.${system}.stdenv.hostPlatform.isFreeBSD + ) + { + /** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */ + default = import ./shell.nix { inherit system; }; + }); /** A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba6458af23e0..7c52cd1cb063 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1817,6 +1817,13 @@ githubId = 338268; name = "Alexei Robyn"; }; + artem = { + email = "a@pelenitsyn.top"; + github = "ulysses4ever"; + githubId = 6832600; + name = "Artem Pelenitsyn"; + matrix = "@artem.types:matrix.org"; + }; artemist = { email = "me@artem.ist"; github = "artemist"; @@ -8938,6 +8945,12 @@ githubId = 6109326; name = "David Hummel"; }; + husjon = { + name = "Jon Erling Hustadnes"; + email = "jonerling.hustadnes+nixpkgs@gmail.com"; + github = "husjon"; + githubId = 554229; + }; husky = { email = "husky@husky.sh"; github = "huskyistaken"; @@ -9480,6 +9493,12 @@ githubId = 1318743; name = "Ivar"; }; + ivyfanchiang = { + email = "dev@ivyfanchiang.ca"; + github = "hexadecimalDinosaur"; + githubId = 36890802; + name = "Ivy Fan-Chiang"; + }; iwanb = { email = "tracnar@gmail.com"; github = "iwanb"; @@ -18390,7 +18409,7 @@ }; rnhmjoj = { email = "rnhmjoj@inventati.org"; - matrix = "@rnhmjoj:maxwell.ydns.eu"; + matrix = "@rnhmjoj:eurofusion.eu"; github = "rnhmjoj"; githubId = 2817565; name = "Michele Guerini Rocco"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1821660a506d..9b6bcd5fb569 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -963,6 +963,21 @@ with lib.maintainers; shortName = "Serokell employees"; }; + stdenv = { + members = [ + artturin + emily + ericson2314 + philiptaron + reckenrode + RossComputerGuy + ]; + scope = "Maintain the standard environment and its surrounding logic."; + shortName = "stdenv"; + enableFeatureFreezePing = true; + githubTeams = [ "stdenv" ]; + }; + steam = { members = [ atemu diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 527922434033..d0c1e1af6f29 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -367,6 +367,11 @@ - `matrix-sliding-sync` was removed because it has been replaced by the simplified sliding sync functionality introduced in matrix-synapse 114.0. +- `nodePackages.coc-tslint`, `vimPlugins.coc-tslint`, `nodePackages.coc-tslint-plugin`, + and `vimPlugins.coc-tslint-plugin` were removed due to being deprecated upstream. The + `nodePackages.coc-eslint` and `vimPlugins.coc-eslint` packages offer comparable + features for `eslint`, which replaced `tslint`. + - `teleport` has been upgraded from major version 15 to major version 16. Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c00e31742f8f..e84580f8f0f1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1471,6 +1471,7 @@ ./services/web-apps/netbox.nix ./services/web-apps/nextcloud.nix ./services/web-apps/nextcloud-notify_push.nix + ./services/web-apps/nextcloud-whiteboard-server.nix ./services/web-apps/nextjs-ollama-llm-ui.nix ./services/web-apps/nexus.nix ./services/web-apps/nifi.nix diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index 450651e8b601..3538e52bda3b 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -78,6 +78,11 @@ }; config = lib.mkIf config.hardware.nvidia-container-toolkit.enable { + assertions = [ + { assertion = config.hardware.nvidia.datacenter.enable || lib.elem "nvidia" config.services.xserver.videoDrivers; + message = ''`nvidia-container-toolkit` requires nvidia datacenter or desktop drivers: set `hardware.nvidia.datacenter.enable` or add "nvidia" to `services.xserver.videoDrivers`''; + }]; + virtualisation.docker = { daemon.settings = lib.mkIf (lib.versionAtLeast config.virtualisation.docker.package.version "25") { @@ -130,9 +135,6 @@ ]); }; - services.xserver.videoDrivers = lib.mkIf - (!config.hardware.nvidia.datacenter.enable) [ "nvidia" ]; - systemd.services.nvidia-container-toolkit-cdi-generator = { description = "Container Device Interface (CDI) for Nvidia generator"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 99d5e3e1804a..76fc16020d32 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -96,7 +96,12 @@ in { extraConfig = lib.mkOption { description = '' - Docker extra registry configuration via environment variables. + Docker extra registry configuration. + ''; + example = lib.literalExpression '' + { + log.level = "debug"; + } ''; default = {}; type = lib.types.attrs; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index d9c314f5ec64..f96853939bd2 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -375,8 +375,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ - erictapen - nh2 - ]; + meta.maintainers = with lib.maintainers; [ nh2 ]; } diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index cf2fffac3f5d..845a6703dcfb 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -979,7 +979,6 @@ in }; meta.maintainers = with lib.maintainers; [ - erictapen Flakebi oddlama ]; diff --git a/nixos/modules/services/web-apps/nextcloud-whiteboard-server.nix b/nixos/modules/services/web-apps/nextcloud-whiteboard-server.nix new file mode 100644 index 000000000000..ff95f54506f5 --- /dev/null +++ b/nixos/modules/services/web-apps/nextcloud-whiteboard-server.nix @@ -0,0 +1,72 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + + inherit (lib) + mkIf + mkEnableOption + mkOption + types + literalExpression + ; + cfg = config.services.nextcloud-whiteboard-server; + +in +{ + options.services.nextcloud-whiteboard-server = { + + enable = mkEnableOption "Nextcloud backend server for the Whiteboard app"; + + settings = mkOption { + type = types.attrsOf types.str; + default = { }; + description = '' + Settings to configure backend server. Especially the Nextcloud host + url has to be set. The required environment variable `JWT_SECRET_KEY` + should be set via the secrets option. + ''; + example = literalExpression '' + { + NEXTCLOUD_URL = "https://nextcloud.example.org"; + } + ''; + }; + + secrets = lib.mkOption { + type = with types; listOf str; + description = '' + A list of files containing the various secrets. Should be in the + format expected by systemd's `EnvironmentFile` directory. + ''; + default = [ ]; + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.nextcloud-whiteboard-server = { + description = "Nextcloud backend server for the Whiteboard app"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + environment = cfg.settings; + serviceConfig = { + ExecStart = "${lib.getExe pkgs.nextcloud-whiteboard-server}"; + WorkingDirectory = "%S/whiteboard"; + StateDirectory = "whiteboard"; + EnvironmentFile = [ cfg.secrets ]; + DynamicUser = true; + }; + }; + + }; + + meta.maintainers = with lib.maintainers; [ onny ]; + +} diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index 35af8c26482c..89952f09c92e 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -22,7 +22,6 @@ let ] ++ finalPackage.optional-dependencies.redis ++ lib.optionals cfg.celery.enable [ celery ] - ++ lib.optionals (cfg.settings.database.backend == "mysql") finalPackage.optional-dependencies.mysql ++ lib.optionals (cfg.settings.database.backend == "postgresql") finalPackage.optional-dependencies.postgres; }; in @@ -184,6 +183,17 @@ in }; }; + files = { + upload_limit = lib.mkOption { + type = lib.types.ints.positive; + default = 10; + example = 50; + description = '' + Maximum file upload size in MiB. + ''; + }; + }; + filesystem = { data = lib.mkOption { type = lib.types.path; diff --git a/nixos/modules/services/web-apps/wakapi.nix b/nixos/modules/services/web-apps/wakapi.nix index ab322cad7aed..982b572fb2fa 100644 --- a/nixos/modules/services/web-apps/wakapi.nix +++ b/nixos/modules/services/web-apps/wakapi.nix @@ -182,21 +182,21 @@ in message = "Either `services.wakapi.passwordSalt` or `services.wakapi.passwordSaltFile` must be set."; } { - assertion = cfg.passwordSalt != null -> cfg.passwordSaltFile != null; + assertion = !(cfg.passwordSalt != null && cfg.passwordSaltFile != null); message = "Both `services.wakapi.passwordSalt` `services.wakapi.passwordSaltFile` should not be set at the same time."; } { - assertion = cfg.smtpPassword != null -> cfg.smtpPasswordFile != null; + assertion = !(cfg.smtpPassword != null && cfg.smtpPasswordFile != null); message = "Both `services.wakapi.smtpPassword` `services.wakapi.smtpPasswordFile` should not be set at the same time."; } { - assertion = cfg.db.createLocally -> cfg.db.dialect != null; + assertion = cfg.database.createLocally -> cfg.settings.db.dialect != null; message = "`services.wakapi.database.createLocally` is true, but a database dialect is not set!"; } ]; warnings = [ - (lib.optionalString (cfg.db.createLocall -> cfg.db.dialect != "postgres") '' + (lib.optionalString (cfg.database.createLocally -> cfg.settings.db.dialect != "postgres") '' You have enabled automatic database configuration, but the database dialect is not set to "posgres". The Wakapi module only supports for PostgreSQL. Please set `services.wakapi.database.createLocally` diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0934c25ff9d6..fb85df8808f1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1108,6 +1108,7 @@ in { vscode-remote-ssh = handleTestOn ["x86_64-linux"] ./vscode-remote-ssh.nix {}; vscodium = discoverTests (import ./vscodium.nix); vsftpd = handleTest ./vsftpd.nix {}; + wakapi = handleTest ./wakapi.nix {}; warzone2100 = handleTest ./warzone2100.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; wastebin = handleTest ./wastebin.nix {}; diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index 7e2fce20857a..5cb298fe9243 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "kanidm"; - meta.maintainers = with pkgs.lib.maintainers; [ erictapen Flakebi oddlama ]; + meta.maintainers = with pkgs.lib.maintainers; [ Flakebi oddlama ]; nodes.server = { pkgs, ... }: { services.kanidm = { diff --git a/nixos/tests/wakapi.nix b/nixos/tests/wakapi.nix new file mode 100644 index 000000000000..2e611a986e30 --- /dev/null +++ b/nixos/tests/wakapi.nix @@ -0,0 +1,40 @@ +import ./make-test-python.nix ( + { lib, ... }: + { + name = "Wakapi"; + + nodes.machine = { + services.wakapi = { + enable = true; + settings = { + server.port = 3000; # upstream default, set explicitly in case upstream changes it + + db = { + dialect = "postgres"; # `createLocally` only supports postgres + host = "/run/postgresql"; + port = 5432; # service will fail if port is not set + name = "wakapi"; + user = "wakapi"; + }; + }; + + database.createLocally = true; + + # Created with `cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1` + # Prefer passwordSaltFile in production. + passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI"; + }; + }; + + # Test that the service is running and that it is reachable. + # This is not very comprehensive for a test, but it should + # catch very basic mistakes in the module. + testScript = '' + machine.wait_for_unit("wakapi.service") + machine.wait_for_open_port(3000) + machine.succeed("curl --fail http://localhost:3000") + ''; + + meta.maintainers = [ lib.maintainers.NotAShelf ]; + } +) diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index 826433128e7d..032706e47f46 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -1,29 +1,33 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + dpkg, + alsa-lib, + freetype, + libglvnd, + curl, + libXcursor, + libXinerama, + libXrandr, + libXrender, + libjack2, }: stdenv.mkDerivation rec { pname = "tonelib-gfx"; - version = "4.7.8"; + version = "4.8.5"; src = fetchurl { - url = "https://tonelib.net/download/221222/ToneLib-GFX-amd64.deb"; - hash = "sha256-1sTwHqQYqNloZ3XSwhryqlW7b1FHh4ymtj3rKUcVZIo="; + url = "https://tonelib.vip/download/24-10-03/ToneLib-GFX-amd64.deb"; + hash = "sha256-RG5rliF4/9LDd07i5dSFQzTGPqyF6UmTfatKb59LZA4="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; buildInputs = [ stdenv.cc.cc.lib @@ -46,14 +50,18 @@ stdenv.mkDerivation rec { installPhase = '' mv usr $out substituteInPlace $out/share/applications/ToneLib-GFX.desktop --replace /usr/ $out/ - ''; + ''; meta = with lib; { description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass"; homepage = "https://tonelib.net/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ dan4ik605743 orivej ]; + maintainers = with maintainers; [ + dan4ik605743 + husjon + orivej + ]; platforms = [ "x86_64-linux" ]; mainProgram = "ToneLib-GFX"; }; diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index 18861f021431..b107cd237263 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , fetchFromGitHub -, fetchpatch2 , autoreconfHook , pkg-config , installShellFiles @@ -15,6 +14,7 @@ , miniupnpc , zeromq , zlib +, db53 , sqlite , qrencode , qtbase ? null @@ -33,23 +33,15 @@ let in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - version = "27.0"; + version = "28.0"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "0f6vi2k5xvjrhiazfjcd4aj246dfcg51xsnqb9wdjl41cg0ckwmf"; + sha256 = "0kl7nq62362clgzxwwd5c256xnaar4ilxcvbralazxg47zv95r11"; }; - patches = [ - # upnp: add compatibility for miniupnpc 2.2.8 - (fetchpatch2 { - url = "https://github.com/Groestlcoin/groestlcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1"; - hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] @@ -57,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ lib.optionals withWallet [ sqlite ] + ++ lib.optionals withWallet [ db53 sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 9a8aaeeb56c4..dc0140032066 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.5.1) + msgpack (1.7.2) multi_json (1.15.0) - neovim (0.9.0) + neovim (0.10.0) msgpack (~> 1.1) multi_json (~> 1.0) @@ -14,4 +14,4 @@ DEPENDENCIES neovim BUNDLED WITH - 2.1.4 + 2.3.27 diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index 1a4f517412fe..e2df8d535c47 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-fPWiGi0w4OFlMZOIf3gd21jyeYhg5t/VdLz7kK9fD8Q="; + sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; type = "gem"; }; - version = "1.5.1"; + version = "1.7.2"; }; multi_json = { groups = ["default"]; @@ -25,9 +25,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-hRI43XGHGeqxMvpFjp0o79GGReiLXTkhwh5LYq6AQL4="; + sha256 = "0gl34rriwwmj6p1s6ms0b311wmqaqiyc510svq31283jk0kp0qcd"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; } diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 60049e184ade..0913fa0a330f 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -107,7 +107,10 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - generatedWrapperArgs = + generatedWrapperArgs = let + binPath = lib.makeBinPath (lib.optional finalAttrs.withRuby rubyEnv ++ lib.optional finalAttrs.withNodeJs nodejs); + in + # vim accepts a limited number of commands so we join them all [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' @@ -116,10 +119,15 @@ let "--add-flags" ''--cmd "set packpath^=${finalPackdir}"'' "--add-flags" ''--cmd "set rtp^=${finalPackdir}"'' ] + ++ lib.optionals finalAttrs.withRuby [ + "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" + ] ++ lib.optionals (binPath != "") [ + "--suffix" "PATH" ":" binPath + ] ; providerLuaRc = neovimUtils.generateProviderRc { - inherit withPython3 withNodeJs withPerl; + inherit (finalAttrs) withPython3 withNodeJs withPerl; withRuby = rubyEnv != null; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d7d6593b8f67..c6a826f386b1 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9437,6 +9437,18 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; + nvim-treesitter-sexp = buildVimPlugin { + pname = "nvim-treesitter-sexp"; + version = "2024-06-07"; + src = fetchFromGitHub { + owner = "PaterJason"; + repo = "nvim-treesitter-sexp"; + rev = "32509f4071f9c8ba5655bf2e1ccf1f1cd8447da0"; + sha256 = "1mfayp49nglk4xv1zmzdc8d6dxkjn3dqlywhwwkcdnyqg6y4c6ks"; + }; + meta.homepage = "https://github.com/PaterJason/nvim-treesitter-sexp/"; + }; + nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; version = "2024-10-16"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a334c28d1ef8..d977d0ac9df1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1676,6 +1676,10 @@ in nvim-treesitter-parsers = lib.recurseIntoAttrs self.nvim-treesitter.grammarPlugins; + nvim-treesitter-sexp = super.nvim-treesitter-sexp.overrideAttrs { + nvimRequireCheck = "treesitter-sexp"; + }; + nvim-ufo = super.nvim-ufo.overrideAttrs { dependencies = with self; [ promise-async ]; nvimRequireCheck = "ufo"; @@ -2761,8 +2765,6 @@ in "coc-tabnine" "coc-texlab" "coc-toml" - "coc-tslint" - "coc-tslint-plugin" "coc-tsserver" "coc-ultisnips" "coc-vetur" diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c7c7e0925399..07f334bdaa7b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -792,6 +792,7 @@ https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, https://github.com/theHamsta/nvim-treesitter-pairs/,HEAD, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, +https://github.com/PaterJason/nvim-treesitter-sexp/,HEAD, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD, https://github.com/windwp/nvim-ts-autotag/,, diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix index 8c26be6bb2d4..092e86edcb66 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/applications/gis/gmt/dcw.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { for use by GMT, the Generic Mapping Tools. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; } diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 9eb1bde4266d..2f2528ff5bb9 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -106,7 +106,7 @@ in stdenv.mkDerivation (finalAttrs: { ''; platforms = lib.platforms.unix; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ tviti ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; }) diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/applications/gis/gmt/gshhg.nix index 62758c71d594..d51f1dbbcb5a 100644 --- a/pkgs/applications/gis/gmt/gshhg.nix +++ b/pkgs/applications/gis/gmt/gshhg.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { Mapping Tools. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8625f305689e..aa613ef09ae9 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ erictapen dotlambda rhendric ]; + maintainers = with maintainers; [ dotlambda rhendric ]; license = licenses.asl20; mainProgram = "magick"; }; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index a0c1776a6971..5b551da388dc 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -116,9 +116,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop application for creating diagrams"; homepage = "https://about.draw.io/"; - license = licenses.asl20; + license = licenses.unfree; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; - maintainers = with maintainers; [ qyliss darkonion0 ]; + maintainers = with maintainers; [ darkonion0 ]; platforms = platforms.darwin ++ platforms.linux; mainProgram = "drawio"; }; diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix index 1805ed8a5234..6af2b207ed41 100644 --- a/pkgs/applications/kde/cantor.nix +++ b/pkgs/applications/kde/cantor.nix @@ -1,46 +1,56 @@ -{ lib -, mkDerivation +{ + lib, + mkDerivation, -, cmake -, extra-cmake-modules -, makeWrapper -, shared-mime-info + cmake, + extra-cmake-modules, + makeWrapper, + shared-mime-info, -, qtbase -, qtsvg -, qttools -, qtwebengine -, qtxmlpatterns + fetchpatch, + qtbase, + qtsvg, + qttools, + qtwebengine, + qtxmlpatterns, -, poppler + poppler, -, karchive -, kcompletion -, kconfig -, kcoreaddons -, kcrash -, kdoctools -, ki18n -, kiconthemes -, kio -, knewstuff -, kparts -, kpty -, ktexteditor -, ktextwidgets -, kxmlgui -, syntax-highlighting + karchive, + kcompletion, + kconfig, + kcoreaddons, + kcrash, + kdoctools, + ki18n, + kiconthemes, + kio, + knewstuff, + kparts, + kpty, + ktexteditor, + ktextwidgets, + kxmlgui, + syntax-highlighting, -, libspectre + libspectre, -# Backends. Set to null if you want to omit from the build -, withAnalitza ? true, analitza -, wtihJulia ? true, julia -, withQalculate ? true, libqalculate -, withLua ? true, luajit -, withPython ? true, python3 -, withR ? true, R -, withSage ? true, sage, sage-with-env ? sage.with-env + # Backends. Set to null if you want to omit from the build + withAnalitza ? true, + analitza, + wtihJulia ? true, + julia, + withQalculate ? true, + libqalculate, + withLua ? true, + luajit, + withPython ? true, + python3, + withR ? true, + R, + withSage ? true, + sage, + sage-with-env ? sage.with-env, }: mkDerivation { @@ -54,42 +64,42 @@ mkDerivation { qttools ]; - buildInputs = [ - qtbase - qtsvg - qtwebengine - qtxmlpatterns + buildInputs = + [ + qtbase + qtsvg + qtwebengine + qtxmlpatterns - poppler + poppler - karchive - kcompletion - kconfig - kcoreaddons - kcrash - kdoctools - ki18n - kiconthemes - kio - knewstuff - kparts - kpty - ktexteditor - ktextwidgets - kxmlgui - syntax-highlighting + karchive + kcompletion + kconfig + kcoreaddons + kcrash + kdoctools + ki18n + kiconthemes + kio + knewstuff + kparts + kpty + ktexteditor + ktextwidgets + kxmlgui + syntax-highlighting - libspectre - ] - # backends - ++ lib.optional withAnalitza analitza - ++ lib.optional wtihJulia julia - ++ lib.optional withQalculate libqalculate - ++ lib.optional withLua luajit - ++ lib.optional withPython python3 - ++ lib.optional withR R - ++ lib.optional withSage sage-with-env - ; + libspectre + ] + # backends + ++ lib.optional withAnalitza analitza + ++ lib.optional wtihJulia julia + ++ lib.optional withQalculate libqalculate + ++ lib.optional withLua luajit + ++ lib.optional withPython python3 + ++ lib.optional withR R + ++ lib.optional withSage sage-with-env; qtWrapperArgs = [ "--prefix PATH : ${placeholder "out"}/bin" @@ -98,10 +108,24 @@ mkDerivation { # Causes failures on Hydra and ofborg from some reason enableParallelBuilding = false; - meta = with lib; { + patches = [ + # fix build for julia 1.1 from upstream + (fetchpatch { + url = "https://github.com/KDE/cantor/commit/ed9525ec7895c2251668d11218f16f186db48a59.patch?full_index=1"; + hash = "sha256-paq0e7Tl2aiUjBf1bDHLLUpShwdCQLICNTPNsXSoe5M="; + }) + ]; + + meta = { description = "Front end to powerful mathematics and statistics packages"; homepage = "https://cantor.kde.org/"; - license = with licenses; [ bsd3 cc0 gpl2Only gpl2Plus gpl3Only ]; - maintainers = with maintainers; [ hqurve ]; + license = with lib.licenses; [ + bsd3 + cc0 + gpl2Only + gpl2Plus + gpl3Only + ]; + maintainers = with lib.maintainers; [ hqurve ]; }; } diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 4cd54559fb05..4c56b05da462 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.9.1"; + version = "2024.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-PFe58tdLc6RtLFrGuL9y+FWNGIASXCDawxSG2He2IQ0="; + hash = "sha256-xCLLWe15+YmU3SyWkclzHBojHi32nUJGe4xY3NZC05M="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index b0219b25ca32..75fa02501c2b 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-router"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-Pm/CrB/RxCvEhNdCyfI7kF62cxpx96Cj2zWmW0wl5wM="; + hash = "sha256-ABSjF3Wd7Ue/c+j2BvjB0UgAMccGUgJsj33JHMG8ijs="; }; vendorHash = "sha256-sIWRODIV3iJ5FdVjVwesqfbYivOlqZAvPSYa38vhCMA="; diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 8cd6bed359fa..a4d74750fbd2 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240929"; + version = "20241021-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-OXn/RMc2v099S8/atQTYz1YwSH0sD7o7ZImlrBmUlSE="; + hash = "sha256-fO/GSnmXsB4YVnfBBh1IXai15JeRLcAiihufIouBpxw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix deleted file mode 100644 index c3a10cc39e9d..000000000000 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch, libxcrypt }: - -stdenv.mkDerivation rec { - pname = "epic5"; - version = "2.0.1"; - - src = fetchurl { - url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz"; - sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm"; - }; - - # Darwin needs libiconv, tcl; while Linux build don't - buildInputs = [ openssl ncurses libxcrypt ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv tcl ]; - - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/e/epic5/2.0.1-1/debian/patches/openssl-1.1.patch"; - sha256 = "03bpsyv1sr5icajs2qkdvv8nnn6rz6yvvj7pgiq8gz9sbp6siyfv"; - }) - ]; - - configureFlags = [ "--disable-debug" "--with-ipv6" ]; - - postConfigure = '' - substituteInPlace bsdinstall \ - --replace /bin/cp ${coreutils}/bin/cp \ - --replace /bin/rm ${coreutils}/bin/rm \ - --replace /bin/chmod ${coreutils}/bin/chmod \ - ''; - - meta = with lib; { - homepage = "http://epicsol.org"; - description = "IRC client that offers a great ircII interface"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} - - - diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 7029dd054165..2ee95b13dcbd 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -13,6 +13,7 @@ let python = python3; pythonDeps = with python.pkgs; [ + distutils flask flask-assets flask-login flask-sqlalchemy flask-migrate flask-seasurf flask-mail flask-session flask-session-captcha flask-sslify mysqlclient psycopg2 sqlalchemy certifi cffi configobj cryptography bcrypt requests python-ldap pyotp qrcode dnspython diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 576a92625d49..eb4c83535393 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "polymake"; - version = "4.12"; + version = "4.13"; src = fetchurl { # "The minimal version is a packager friendly version which omits # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; - sha256 = "sha256-vVpmf/ykv3641RE0Awzj3zsW3Z0OgA+v2xzoNYZ2QNk="; + sha256 = "sha256-862s0GO56mDV6cN8YYP127dFiwyzSR66Pvw48gxWXOs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index dfdcacc3b318..d33f1d276081 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -17,6 +17,8 @@ , vala , cmake , libmicrodns +, gtuber +, glib-networking }: stdenv.mkDerivation (finalAttrs: { @@ -49,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gtuber + glib-networking # for TLS support gtk4 libGL libadwaita diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 39904f829159..66e670d05343 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -71,7 +71,7 @@ mkDerivation rec { description = "Open source video mapping software"; homepage = "https://github.com/mapmapteam/mapmap"; license = licenses.gpl3; - maintainers = [ maintainers.erictapen ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "mapmap"; }; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index c36ed736176a..10168a6d75c5 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchgit +{ lib, rustPlatform, fetchgit, fetchpatch , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols , pkgsCross @@ -6,18 +6,27 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "128.1"; + version = "129.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "57702acf01cbd0e560e058dc97d22378d0c49ecc"; - hash = "sha256-lQStmmTxMC9Iq6vJxJMFIUUtaixJNGuBfAvBo9KKrjU="; + rev = "b7fd753b43baf2da422a1fe5e2c6d05180f7cd0b"; + hash = "sha256-y1PlqX6ghCet2SdtS/M2rXy58mHyHMLOxy3OrcoHSJk="; fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "cross-domain.patch"; + url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/60053cdf0b360a03084292b39120365fff65d410%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-U5eOxuAtVLjJ+8h16lmbJYNxsP/AOEv/1ec4WlUxP2E="; + }) + ]; + separateDebugInfo = true; - cargoHash = "sha256-qKCO9Rkk04HznExgYKJgpssZDjWfhsY2XOBifvtHFos="; + cargoHash = "sha256-zQ2Y0/xjnHN75nX0Awigrh9Cnuh8N47XwDhq+ZLITDg="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 62e195d3426f..92444d287478 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -p common-updater-scripts python3 +#! nix-shell -p common-updater-scripts nix-update python3 #! nix-shell -i python import csv @@ -52,3 +52,6 @@ with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+log # Update the version, git revision, and hash in crosvm's default.nix. subprocess.run(['update-source-version', 'crosvm', f'--rev={rev}', version]) + +# Update cargoHash. +subprocess.run(['nix-update', '--version=skip', 'crosvm']) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c5f1191605d9..396b10250ed7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -75,11 +75,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-gWtwIqi6fCrDDi4M+XPoJva8yFBTOWAyEsXt6OlNeDQ="; + hash = "sha256-fcD52lSR/0SVAPMxAGOja2GfI27kVwb9CEbrN9S7qIk="; }; depsBuildBuild = [ buildPlatformStdenv.cc ] diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index b60875c38129..4aad879e7da0 100644 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -12,7 +12,6 @@ , readline70 , xz , cups -, glibc , libaio , vulkan-loader , alsa-lib @@ -20,8 +19,7 @@ , libxcrypt-legacy , libGL , numactl -, libX11 -, libXi +, xorg , kmod , python3 , autoPatchelfHook @@ -29,48 +27,17 @@ , symlinkJoin , enableInstaller ? false, bzip2, sqlite , enableMacOSGuests ? false, fetchFromGitHub, unzip -, enableGuestTools ? true, }: let # base - versions - version = "17.5.2"; - build = "23775571"; + version = "17.6.1"; + build = "24319023"; baseUrl = "https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${version}/${build}/linux"; - # tools - versions - toolsVersion = "12.4.0"; - toolsBuild = "23259341"; - # macOS - versions - fusionVersion = "13.5.2"; - fusionBuild = "23775688"; unlockerVersion = "3.0.5"; - guestToolsSrc = - let - fetchComponent = (system: hash: fetchzip { - inherit hash; - url = "${baseUrl}/packages/vmware-tools-${system}-${toolsVersion}-${toolsBuild}.x86_64.component.tar"; - stripRoot = false; - } + "/vmware-tools-${system}-${toolsVersion}-${toolsBuild}.x86_64.component"); - in lib.mapAttrsToList fetchComponent { - linux = "sha256-vT08mR6cCXZjiQgb9jy+MaqYzS0hFbNUM7xGAHIJ8Ao="; - linuxPreGlibc25 = "sha256-BodN1lxuhxyLlxIQSlVhGKItJ10VPlti/sEyxcRF2SA="; - netware = "sha256-o/S4wAYLR782Fn20fTQ871+rzsa1twnAxb9laV16XIk="; - solaris = "sha256-3LdFoI4TD5zxlohDGR3DRGbF6jwDZAoSMEpHWU4vSGU="; - winPre2k = "sha256-+QcvWfY3aCDxUwAfSuj7Wf9sxIO+ztWBrRolMim8Dfw="; - winPreVista = "sha256-3NgO/GdRFTpKNo45TMet0msjzxduuoF4nVLtnOUTHUA="; - windows = "sha256-2F7UPjNvtibmWAJxpB8IOnol12aMOGMy+403WeCTXw8="; - }; - - # macOS - ISOs - darwinIsoSrc = fetchzip { - url = "https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${fusionVersion}/${fusionBuild}/universal/core/com.vmware.fusion.zip.tar"; - sha256 = "sha256-DDLRWAVRI3ZeXV5bUXWwput9mEC1qsJUsjojI0CJYMI="; - stripRoot = false; - } + "/com.vmware.fusion.zip"; - # macOS - Unlocker unlockerSrc = fetchFromGitHub { owner = "paolo-projects"; @@ -104,7 +71,6 @@ stdenv.mkDerivation rec { readline xz cups - glibc libaio vulkan-loader alsa-lib @@ -112,9 +78,21 @@ stdenv.mkDerivation rec { libxcrypt-legacy libGL numactl - libX11 - libXi - kmod + xorg.libX11 + xorg.libXau + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXdmcp + xorg.libXext + xorg.libXfixes + xorg.libXft + xorg.libXinerama + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst ]; nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ] @@ -123,23 +101,13 @@ stdenv.mkDerivation rec { src = fetchzip { url = "${baseUrl}/core/VMware-Workstation-${version}-${build}.x86_64.bundle.tar"; - sha256 = "sha256-5PZZpXN/V687TXjqeTm8MEays4/QTf02jVfdpi9C7GI="; + sha256 = "sha256-VzfiIawBDz0f1w3eynivW41Pn4SqvYf/8o9q14hln4s="; stripRoot = false; } + "/VMware-Workstation-${version}-${build}.x86_64.bundle"; - unpackPhase = let - guestTools = lib.optionalString enableGuestTools (lib.concatMapStringsSep " " (src: "--install-component ${src}") guestToolsSrc); - in + unpackPhase = '' - ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} ${guestTools} --extract unpacked" - - ${lib.optionalString enableMacOSGuests '' - mkdir -p fusion/ - unzip "${darwinIsoSrc}" \ - "payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwin.iso" \ - "payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwinPre15.iso" \ - -d fusion/ - ''} + ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked" ''; postPatch = lib.optionalString enableMacOSGuests '' @@ -258,8 +226,8 @@ stdenv.mkDerivation rec { --add-needed ${libpulseaudio}/lib/libpulse.so.0 \ --add-needed ${libGL}/lib/libEGL.so.1 \ --add-needed ${numactl}/lib/libnuma.so.1 \ - --add-needed ${libX11}/lib/libX11.so.6 \ - --add-needed ${libXi}/lib/libXi.so.6 \ + --add-needed ${xorg.libX11}/lib/libX11.so.6 \ + --add-needed ${xorg.libXi}/lib/libXi.so.6 \ --add-needed ${libGL}/lib/libGL.so.1 \ $out/lib/vmware/bin/$binary done @@ -282,28 +250,6 @@ stdenv.mkDerivation rec { unpacked="unpacked/vmware-network-editor" cp -r $unpacked/lib $out/lib/vmware/ - mkdir -p $out/lib/vmware/isoimages/ - - ${lib.optionalString enableGuestTools '' - echo "Installing VMware Tools" - cp unpacked/vmware-tools-linux/linux.iso \ - unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \ - unpacked/vmware-tools-netware/netware.iso \ - unpacked/vmware-tools-solaris/solaris.iso \ - unpacked/vmware-tools-winPre2k/winPre2k.iso \ - unpacked/vmware-tools-winPreVista/winPreVista.iso \ - unpacked/vmware-tools-windows/windows.iso \ - $out/lib/vmware/isoimages/ - ''} - - ${lib.optionalString enableMacOSGuests '' - echo "Installing VMWare Tools for MacOS" - cp -v \ - "fusion/payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwin.iso" \ - "fusion/payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwinPre15.iso" \ - $out/lib/vmware/isoimages/ - ''} - ## VMware Player Application echo "Installing VMware Player Application" unpacked="unpacked/vmware-player-app" @@ -408,6 +354,14 @@ stdenv.mkDerivation rec { rm $out/lib/vmware/bin/vmware-vmx ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx + # Remove shipped X11 libraries + for lib in $out/lib/vmware/lib/* $out/lib/vmware-ovftool/lib*.so*; do + lib_name="$(basename "$lib")" + if [[ "$lib_name" == libX* || "$lib_name" == libxcb* ]]; then + rm -rf "$lib" + fi + done + runHook postInstall ''; diff --git a/pkgs/build-support/node/import-npm-lock/default.nix b/pkgs/build-support/node/import-npm-lock/default.nix index 48057ec8891e..3c26b98d3992 100644 --- a/pkgs/build-support/node/import-npm-lock/default.nix +++ b/pkgs/build-support/node/import-npm-lock/default.nix @@ -72,6 +72,10 @@ lib.fix (self: { # Example: { "node_modules/axios" = { curlOptsList = [ "--verbose" ]; }; } # This will download the axios package with curl's verbose option. , fetcherOpts ? {} + # A map from node_module path to an alternative package to use instead of fetching the source in package-lock.json. + # Example: { "node_modules/axios" = stdenv.mkDerivation { ... }; } + # This is usefull if you want to inject custom sources for a specific package. + , packageSourceOverrides ? {} }: let mapLockDependencies = @@ -94,10 +98,10 @@ lib.fix (self: { mapAttrs (modulePath: module: let - src = fetchModule { + src = packageSourceOverrides.${modulePath} or (fetchModule { inherit module npmRoot; fetcherOpts = fetcherOpts.${modulePath} or {}; - }; + }); in cleanModule module // lib.optionalAttrs (src != null) { diff --git a/pkgs/by-name/al/albedo/package.nix b/pkgs/by-name/al/albedo/package.nix new file mode 100644 index 000000000000..7b63f9e7040f --- /dev/null +++ b/pkgs/by-name/al/albedo/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "albedo"; + version = "0.0.16"; + + src = fetchFromGitHub { + owner = "coreruleset"; + repo = "albedo"; + rev = "refs/tags/v${version}"; + hash = "sha256-HMW0SIcPDCy2QNfxpMke+/d1XCNpyx6RL6RCZAmU+WE="; + }; + + vendorHash = "sha256-3YBcu/GEonEoORbB7x6YGpIl7kEzUQ9PAZNFB8NKb+c="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "HTTP reflector and black hole"; + homepage = "https://github.com/coreruleset/albedo"; + changelog = "https://github.com/coreruleset/albedo/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "albedo"; + }; +} diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix new file mode 100644 index 000000000000..02bb4f39924a --- /dev/null +++ b/pkgs/by-name/al/alioth/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "alioth"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "alioth"; + rev = "refs/tags/v${version}"; + hash = "sha256-K0Hx6EJYyPJZA+FLIj44BtUuZZOqWW2DUJt1QbeZyu0="; + }; + + # Checks use `debug_assert_eq!` + checkType = "debug"; + + cargoHash = "sha256-J+1SXHQJJxT0qN/ELAvwQFnKCo13ZrQClpbfleM4PkA="; + + separateDebugInfo = true; + + meta = with lib; { + homepage = "https://github.com/google/alioth"; + description = "Experimental Type-2 Hypervisor in Rust implemented from scratch"; + license = licenses.asl20; + mainProgram = "alioth"; + maintainers = with maintainers; [ astro ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + }; +} diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index e24c5e30c75b..0a9958e92d2f 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -141,6 +141,12 @@ py.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d) ''; + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix index bf1bf61c73b1..6018719f2cab 100644 --- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation (finalAttrs: { '' # Uses pkg_get_variable, cannot substitute prefix with that substituteInPlace data/CMakeLists.txt \ - --replace "\''${SYSTEMD_USER_DIR}" "$out/lib/systemd/user" + --replace-fail "\''${SYSTEMD_USER_DIR}" "$out/lib/systemd/user" # Bad concatenation substituteInPlace libmessaging-menu/messaging-menu.pc.in \ - --replace "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \ - --replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@' + --replace-fail "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@' # Fix tests with gobject-introspection 1.80 not installing GLib introspection data substituteInPlace tests/CMakeLists.txt \ diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix new file mode 100644 index 000000000000..cc031c9aa7b5 --- /dev/null +++ b/pkgs/by-name/ba/basalt-monado/package.nix @@ -0,0 +1,78 @@ +{ + autoPatchelfHook, + boost, + bzip2, + cereal, + cmake, + eigen, + extra-cmake-modules, + fetchFromGitLab, + fmt, + freeglut, + glew, + lib, + libepoxy, + libGL, + lz4, + magic-enum, + nix-update-script, + opencv, + pkg-config, + stdenv, + tbb, + xorg, +}: +stdenv.mkDerivation { + pname = "basalt-monado"; + version = "0-unstable-2024-06-21"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mateosss"; + repo = "basalt"; + rev = "385c161f35720df3a6c606054565f9d49a1c5787"; + hash = "sha256-+2/pc2OWDwE04xPcfHL5GGyhQ1ZTN6o7cCNAilDgd2Y="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + boost + bzip2 + cereal + eigen + fmt + freeglut + glew + libepoxy + libGL + lz4 + magic-enum + opencv + tbb + xorg.libX11 + ]; + + cmakeFlags = [ + (lib.cmakeBool "BASALT_INSTANTIATIONS_DOUBLE" false) + (lib.cmakeBool "BUILD_TESTS" false) + (lib.cmakeFeature "EIGEN_ROOT" "${eigen}/include/eigen3") + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A fork of Basalt improved for tracking XR devices with Monado"; + homepage = "https://gitlab.freedesktop.org/mateosss/basalt"; + license = lib.licenses.bsd3; + mainProgram = "basalt_vio"; + maintainers = [ lib.maintainers.locochoco ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix index c5b777073078..2ed9fb52bad9 100644 --- a/pkgs/by-name/bu/bustools/package.nix +++ b/pkgs/by-name/bu/bustools/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "bustools"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "BUStools"; repo = "bustools"; rev = "v${version}"; - sha256 = "sha256-chdHwwnhHFGJLu4KZmFJp3SZ26GFnbelm3Qz0yeKoBs="; + sha256 = "sha256-0Y+9T9V+l20hqxpKbSWsEB0tt8A/ctYcoPN2n/roxvg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index bb8a4d98bdb7..adc180a4c1ce 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -1,19 +1,18 @@ -{ lib -, fetchFromGitHub -, stdenv -, cmake -, pkg-config -, installShellFiles -, libclang -, clang -, llvmPackages -, libllvm -, yaml-cpp -, elfutils -, libunwind -, enableLibcxx ? false -, debug ? false -, +{ + lib, + fetchFromGitHub, + stdenv, + cmake, + pkg-config, + installShellFiles, + libclang, + llvmPackages, + libllvm, + yaml-cpp, + elfutils, + libunwind, + enableLibcxx ? false, + debug ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "clang-uml"; @@ -26,17 +25,27 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-YzHlauVuFLT2PmfqJBNwqQ/P7d7tyl3brk7Vo/kTOF4="; }; - nativeBuildInputs = [ - cmake - pkg-config - installShellFiles - ] ++ (if debug then [ - elfutils - libunwind - ] else [ ]); + nativeBuildInputs = + [ + cmake + pkg-config + installShellFiles + ] + ++ ( + if debug then + [ + elfutils + libunwind + ] + else + [ ] + ); + + cmakeFlags = [ + "-DCUSTOM_COMPILE_OPTIONS=-Wno-error=sign-compare" + ]; buildInputs = [ - clang libclang libllvm yaml-cpp @@ -63,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = debug; dontStrip = debug; - meta = with lib; { + meta = { description = "Customizable automatic UML diagram generator for C++ based on Clang"; longDescription = '' clang-uml is an automatic C++ to UML class, sequence, package and include diagram generator, driven by YAML configuration files. @@ -71,9 +80,9 @@ stdenv.mkDerivation (finalAttrs: { The configuration file or files for clang-uml define the types and contents of each generated diagram. The diagrams can be generated in PlantUML, MermaidJS and JSON formats. ''; - maintainers = with maintainers; [ eymeric ]; + maintainers = with lib.maintainers; [ eymeric ]; homepage = "https://clang-uml.github.io/"; - license = licenses.asl20; - platforms = platforms.all; + license = lib.licenses.asl20; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch b/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch new file mode 100644 index 000000000000..4d4744d4d31b --- /dev/null +++ b/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch @@ -0,0 +1,44 @@ +diff --git a/XOptions/xoptions.cpp b/XOptions/xoptions.cpp +index ca5723e..30574a5 100755 +--- a/XOptions/xoptions.cpp ++++ b/XOptions/xoptions.cpp +@@ -1531,14 +1531,7 @@ bool XOptions::checkNative(const QString &sIniFileName) + #if defined(Q_OS_MAC) + bResult = true; + #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) +- QString sApplicationDirPath = qApp->applicationDirPath(); +- +- if ((sApplicationDirPath == "/bin") || (sApplicationDirPath == "/usr/bin") || (sApplicationDirPath == "/usr/local/bin") || +- (sApplicationDirPath.contains("/usr/local/bin$")) || isAppImage()) { +- bResult = true; +- } else { +- bResult = false; +- } ++ bResult = true; + #elif defined(Q_OS_WIN) + QString sApplicationDirPath = qApp->applicationDirPath(); + +@@ -1565,22 +1558,7 @@ QString XOptions::getApplicationDataPath() + #ifdef Q_OS_MAC + sResult = sApplicationDirPath + "/../Resources"; + #elif defined(Q_OS_LINUX) +- if (isNative()) { +- if (sApplicationDirPath.contains("/usr/local/bin$")) { +- QString sPrefix = sApplicationDirPath.section("/usr/local/bin", 0, 0); +- +- sResult += sPrefix + QString("/usr/local/lib/%1").arg(qApp->applicationName()); +- } else { +- if (sApplicationDirPath.contains("/tmp/.mount_")) // AppImage +- { +- sResult = sApplicationDirPath.section("/", 0, 2); +- } +- +- sResult += QString("/usr/lib/%1").arg(qApp->applicationName()); +- } +- } else { +- sResult = sApplicationDirPath; +- } ++ sResult = sApplicationDirPath + "/../lib/die"; + #elif defined(Q_OS_FREEBSD) + sResult = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).at(1) + QDir::separator() + qApp->applicationName(); + #else diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix new file mode 100644 index 000000000000..855095c3f448 --- /dev/null +++ b/pkgs/by-name/de/detect-it-easy/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, + freetype, + graphite2, + icu, + krb5, + systemdLibs, + imagemagick, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "detect-it-easy"; + version = "3.09"; + + src = fetchFromGitHub { + owner = "horsicq"; + repo = "DIE-engine"; + rev = finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-A9YZBlGf3j+uSefPiDhrS1Qtu6vaLm4Yodt7BioGD2Q="; + }; + + patches = [ ./0001-remove-hard-coded-paths-in-xoptions.patch ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qtscript + libsForQt5.qtsvg + graphite2 + freetype + icu + krb5 + systemdLibs + ]; + nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook + libsForQt5.qmake + imagemagick + ]; + + enableParallelBuilding = true; + + # work around wrongly created dirs in `install.sh` + # https://github.com/horsicq/DIE-engine/issues/110 + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/applications + mkdir -p $out/share/icons + ''; + + # clean up wrongly created dirs in `install.sh` and broken .desktop file + postInstall = '' + rm -r $out/lib/{bin,share} + grep -v "Version=#VERSION#" $src/LINUX/die.desktop > $out/share/applications/die.desktop + ''; + + meta = { + description = "Program for determining types of files for Windows, Linux and MacOS."; + mainProgram = "die"; + homepage = "https://github.com/horsicq/Detect-It-Easy"; + maintainers = with lib.maintainers; [ ivyfanchiang ]; + platforms = [ "x86_64-linux" ]; + license = lib.licenses.mit; + }; +}) diff --git a/pkgs/by-name/ep/epic5/package.nix b/pkgs/by-name/ep/epic5/package.nix new file mode 100644 index 000000000000..a73b64043b5c --- /dev/null +++ b/pkgs/by-name/ep/epic5/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + ruby, + fetchurl, + openssl, + ncurses, + libiconv, + tcl, + libxcrypt, + perl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "epic5"; + version = "3.0"; + + src = fetchurl { + url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz"; + hash = "sha256-ltRzUME6PZkBnaDmoEsMf4Datt26WQvMZ527iswXeaE="; + }; + + buildInputs = + [ + openssl + ncurses + libxcrypt + ruby + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + tcl + ]; + + configureFlags = [ + "--with-ipv6" + ]; + + nativeBuildInputs = [ + perl + ]; + + meta = { + homepage = "https://epicsol.org"; + description = "IRC client that offers a great ircII interface"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + mainProgram = "epic5"; + }; +}) diff --git a/pkgs/games/factorio/mods.nix b/pkgs/by-name/fa/factorio/mods.nix similarity index 100% rename from pkgs/games/factorio/mods.nix rename to pkgs/by-name/fa/factorio/mods.nix diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix new file mode 100644 index 000000000000..c9b30b31b461 --- /dev/null +++ b/pkgs/by-name/fa/factorio/package.nix @@ -0,0 +1,310 @@ +{ + lib, + alsa-lib, + factorio-utils, + fetchurl, + libGL, + libICE, + libSM, + libX11, + libXcursor, + libXext, + libXi, + libXinerama, + libXrandr, + libpulseaudio, + libxkbcommon, + makeDesktopItem, + makeWrapper, + releaseType, + stdenv, + wayland, + + mods-dat ? null, + versionsJson ? ./versions.json, + username ? "", + token ? "", # get/reset token at https://factorio.com/profile + experimental ? false, # true means to always use the latest branch + ... +}@args: + +assert + releaseType == "alpha" + || releaseType == "headless" + || releaseType == "demo" + || releaseType == "expansion"; + +let + + inherit (lib) importJSON; + + mods = args.mods or [ ]; + + helpMsg = '' + + ===FETCH FAILED=== + Please ensure you have set the username and token with config.nix, or + /etc/nix/nixpkgs-config.nix if on NixOS. + + Your token can be seen at https://factorio.com/profile (after logging in). It is + not as sensitive as your password, but should still be safeguarded. There is a + link on that page to revoke/invalidate the token, if you believe it has been + leaked or wish to take precautions. + + Example: + { + packageOverrides = pkgs: { + factorio = pkgs.factorio.override { + username = "FactorioPlayer1654"; + token = "d5ad5a8971267c895c0da598688761"; + }; + }; + } + + Alternatively, instead of providing the username+token, you may manually + download the release through https://factorio.com/download , then add it to + the store using e.g.: + + releaseType=alpha + version=0.17.74 + nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz + + Note the ultimate "_" is replaced with "-" in the --name arg! + ''; + + desktopItem = makeDesktopItem { + name = "factorio"; + desktopName = "Factorio"; + comment = "A game in which you build and maintain factories."; + exec = "factorio"; + icon = "factorio"; + categories = [ "Game" ]; + }; + + branch = if experimental then "experimental" else "stable"; + + # NB `experimental` directs us to take the latest build, regardless of its branch; + # hence the (stable, experimental) pairs may sometimes refer to the same distributable. + versions = importJSON versionsJson; + binDists = makeBinDists versions; + + actual = + binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} + or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download."); + + makeBinDists = + versions: + let + f = + path: name: value: + if builtins.isAttrs value then + if value ? "name" then makeBinDist value else builtins.mapAttrs (f (path ++ [ name ])) value + else + throw "expected attrset at ${toString path} - got ${toString value}"; + in + builtins.mapAttrs (f [ ]) versions; + makeBinDist = + { + name, + version, + tarDirectory, + url, + sha256, + needsAuth, + candidateHashFilenames ? [ ], + }: + { + inherit version tarDirectory; + src = + if !needsAuth then + fetchurl { inherit name url sha256; } + else + (lib.overrideDerivation + (fetchurl { + inherit name url sha256; + curlOptsList = [ + "--get" + "--data-urlencode" + "username@username" + "--data-urlencode" + "token@token" + ]; + }) + (_: { + # This preHook hides the credentials from /proc + preHook = + if username != "" && token != "" then + '' + echo -n "${username}" >username + echo -n "${token}" >token + '' + else + '' + # Deliberately failing since username/token was not provided, so we can't fetch. + # We can't use builtins.throw since we want the result to be used if the tar is in the store already. + exit 1 + ''; + failureHook = '' + cat < str: + if FLAGS.out: + return FLAGS.out + try_paths = ["pkgs/by-name/fa/factorio/versions.json", "versions.json"] + for path in try_paths: + if os.path.exists(path): + return path + raise Exception( + "Couldn't figure out where to write versions.json; try specifying --out" + ) + + +def fetch_versions() -> FactorioVersionsJSON: + return json.loads(requests.get(FACTORIO_RELEASES).text) + + +def fetch_hashes() -> FactorioHashes: + resp = requests.get(FACTORIO_HASHES) + resp.raise_for_status() + out = {} + for ln in resp.text.split("\n"): + ln = ln.strip() + if not ln: + continue + sha256, filename = ln.split() + out[filename] = sha256 + return out + + +def generate_our_versions(factorio_versions: FactorioVersionsJSON) -> OurVersionJSON: + def rec_dd(): + return defaultdict(rec_dd) + + output = rec_dd() + + # Deal with times where there's no experimental version + for rc in RELEASE_CHANNELS: + if rc.name not in factorio_versions or not factorio_versions[rc.name]: + factorio_versions[rc.name] = factorio_versions["stable"] + for rt in RELEASE_TYPES: + if ( + rt.name not in factorio_versions[rc.name] + or not factorio_versions[rc.name][rt.name] + ): + factorio_versions[rc.name][rt.name] = factorio_versions["stable"][ + rt.name + ] + + for system in SYSTEMS: + for release_type in RELEASE_TYPES: + for release_channel in RELEASE_CHANNELS: + version = factorio_versions[release_channel.name].get(release_type.name) + if version is None: + continue + this_release = { + "name": f"factorio_{release_type.name}_{system.tar_name}-{version}.tar.xz", + "url": f"https://factorio.com/get-download/{version}/{release_type.name}/{system.url_name}", + "version": version, + "needsAuth": release_type.needs_auth, + "candidateHashFilenames": [ + fmt.format(version=version) + for fmt in release_type.hash_filename_format + ], + "tarDirectory": system.tar_name, + } + output[system.nix_name][release_type.name][release_channel.name] = ( + this_release + ) + return output + + +def iter_version( + versions: OurVersionJSON, + it: Callable[[str, str, str, Dict[str, str]], Dict[str, str]], +) -> OurVersionJSON: + versions = copy.deepcopy(versions) + for system_name, system in versions.items(): + for release_type_name, release_type in system.items(): + for release_channel_name, release in release_type.items(): + release_type[release_channel_name] = it( + system_name, release_type_name, release_channel_name, dict(release) + ) + return versions + + +def merge_versions(old: OurVersionJSON, new: OurVersionJSON) -> OurVersionJSON: + """Copies already-known hashes from version.json to avoid having to re-fetch.""" + + def _merge_version( + system_name: str, + release_type_name: str, + release_channel_name: str, + release: Dict[str, str], + ) -> Dict[str, str]: + old_system = old.get(system_name, {}) + old_release_type = old_system.get(release_type_name, {}) + old_release = old_release_type.get(release_channel_name, {}) + if FLAGS.release_type and release_type_name not in FLAGS.release_type: + logging.info( + "%s/%s/%s: not in --release_type, not updating", + system_name, + release_type_name, + release_channel_name, + ) + return old_release + if FLAGS.release_channel and release_channel_name not in FLAGS.release_channel: + logging.info( + "%s/%s/%s: not in --release_channel, not updating", + system_name, + release_type_name, + release_channel_name, + ) + return old_release + if "sha256" not in old_release: + logging.info( + "%s/%s/%s: not copying sha256 since it's missing", + system_name, + release_type_name, + release_channel_name, + ) + return release + if not all( + old_release.get(k, None) == release[k] for k in ["name", "version", "url"] + ): + logging.info( + "%s/%s/%s: not copying sha256 due to mismatch", + system_name, + release_type_name, + release_channel_name, + ) + return release + release["sha256"] = old_release["sha256"] + return release + + return iter_version(new, _merge_version) + + +def fill_in_hash( + versions: OurVersionJSON, factorio_hashes: FactorioHashes +) -> OurVersionJSON: + """Fill in sha256 hashes for anything missing them.""" + + def _fill_in_hash( + system_name: str, + release_type_name: str, + release_channel_name: str, + release: Dict[str, str], + ) -> Dict[str, str]: + for candidate_filename in release["candidateHashFilenames"]: + if candidate_filename in factorio_hashes: + release["sha256"] = factorio_hashes[candidate_filename] + break + else: + logging.error( + "%s/%s/%s: failed to find any of %s in %s", + system_name, + release_type_name, + release_channel_name, + release["candidateHashFilenames"], + FACTORIO_HASHES, + ) + return release + if "sha256" in release: + logging.info( + "%s/%s/%s: skipping fetch, sha256 already present", + system_name, + release_type_name, + release_channel_name, + ) + return release + return release + + return iter_version(versions, _fill_in_hash) + + +def main(argv): + factorio_versions = fetch_versions() + factorio_hashes = fetch_hashes() + new_our_versions = generate_our_versions(factorio_versions) + old_our_versions = None + our_versions_path = find_versions_json() + if our_versions_path: + logging.info("Loading old versions.json from %s", our_versions_path) + with open(our_versions_path, "r") as f: + old_our_versions = json.load(f) + if old_our_versions: + logging.info("Merging in old hashes") + new_our_versions = merge_versions(old_our_versions, new_our_versions) + logging.info("Updating hashes from Factorio SHA256") + new_our_versions = fill_in_hash(new_our_versions, factorio_hashes) + with open(our_versions_path, "w") as f: + logging.info("Writing versions.json to %s", our_versions_path) + json.dump(new_our_versions, f, sort_keys=True, indent=2) + f.write("\n") + + +if __name__ == "__main__": + app.run(main) diff --git a/pkgs/games/factorio/utils.nix b/pkgs/by-name/fa/factorio/utils.nix similarity index 100% rename from pkgs/games/factorio/utils.nix rename to pkgs/by-name/fa/factorio/utils.nix diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json new file mode 100644 index 000000000000..273ba332e646 --- /dev/null +++ b/pkgs/by-name/fa/factorio/versions.json @@ -0,0 +1,102 @@ +{ + "x86_64-linux": { + "alpha": { + "experimental": { + "candidateHashFilenames": [ + "factorio_linux_2.0.9.tar.xz" + ], + "name": "factorio_alpha_x64-2.0.9.tar.xz", + "needsAuth": true, + "sha256": "34c21cd3cbe91b65483786ccb4467b5d4766c748cbbddd2ce3b30d319d163e3b", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.9/alpha/linux64", + "version": "2.0.9" + }, + "stable": { + "candidateHashFilenames": [ + "factorio_linux_2.0.8.tar.xz" + ], + "name": "factorio_alpha_x64-2.0.8.tar.xz", + "needsAuth": true, + "sha256": "94ea36a5b9103369df7158a8281039dd2f1d7fa7bb3a2d854c715250dd73e185", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.8/alpha/linux64", + "version": "2.0.8" + } + }, + "demo": { + "experimental": { + "candidateHashFilenames": [ + "factorio_demo_x64_1.1.110.tar.xz" + ], + "name": "factorio_demo_x64-1.1.110.tar.xz", + "needsAuth": false, + "sha256": "bddb91dcba9f300c25d590f861772eaf41f0b6ce8ae6b754de00d0e5f3eb5a35", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" + }, + "stable": { + "candidateHashFilenames": [ + "factorio_demo_x64_1.1.110.tar.xz" + ], + "name": "factorio_demo_x64-1.1.110.tar.xz", + "needsAuth": false, + "sha256": "bddb91dcba9f300c25d590f861772eaf41f0b6ce8ae6b754de00d0e5f3eb5a35", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" + } + }, + "expansion": { + "experimental": { + "candidateHashFilenames": [ + "factorio-space-age_linux_2.0.9.tar.xz" + ], + "name": "factorio_expansion_x64-2.0.9.tar.xz", + "needsAuth": true, + "sha256": "6369d23550a7a721d3de1d34253e8321ee601fa759d1fb5efac9abc28aa7509d", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.9/expansion/linux64", + "version": "2.0.9" + }, + "stable": { + "candidateHashFilenames": [ + "factorio-space-age_linux_2.0.8.tar.xz" + ], + "name": "factorio_expansion_x64-2.0.8.tar.xz", + "needsAuth": true, + "sha256": "408eae824daa761564b1ea7b81925efe05298cbaffd120eea235341ac05a6a60", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.8/expansion/linux64", + "version": "2.0.8" + } + }, + "headless": { + "experimental": { + "candidateHashFilenames": [ + "factorio-headless_linux_2.0.9.tar.xz", + "factorio_headless_x64_2.0.9.tar.xz" + ], + "name": "factorio_headless_x64-2.0.9.tar.xz", + "needsAuth": false, + "sha256": "f499077b3e2c1313452c350f1faf17db31cae2a0fa738f69166e97c3caa3c86d", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.9/headless/linux64", + "version": "2.0.9" + }, + "stable": { + "candidateHashFilenames": [ + "factorio-headless_linux_2.0.8.tar.xz", + "factorio_headless_x64_2.0.8.tar.xz" + ], + "name": "factorio_headless_x64-2.0.8.tar.xz", + "needsAuth": false, + "sha256": "d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.8/headless/linux64", + "version": "2.0.8" + } + } + } +} diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index 832b2d62cc07..d8699f481089 100644 --- a/pkgs/by-name/fd/fdroidserver/package.nix +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -48,7 +48,10 @@ python3Packages.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - build-system = with python3Packages; [ babel ]; + build-system = with python3Packages; [ + setuptools + babel + ]; dependencies = with python3Packages; [ androguard diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix index f3b2a4723da3..9519c7840eeb 100644 --- a/pkgs/by-name/gi/git-prole/package.nix +++ b/pkgs/by-name/gi/git-prole/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "0.1.1"; + version = "0.5.1"; in rustPlatform.buildRustPackage { pname = "git-prole"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "9999years"; repo = "git-prole"; rev = "refs/tags/v${version}"; - hash = "sha256-IJsNZt5eID1ghz5Rj53OfidgPoMS2qq+7qgqYEu4zPc="; + hash = "sha256-jJEskahZRCpM2WEH4myTLfowQxEJ4WCNXbTwGkwBHnY="; }; - cargoHash = "sha256-2z7UEHVomm2zuImdcQq0G9fEhKrHLrPNUhVrFugG3w4="; + cargoHash = "sha256-u4UJH+dIDI+I6fEQTRe3RRufYZwxBENxnwULSSCOZF8="; nativeCheckInputs = [ git diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index f54da3fdf7d4..60b1e35d709b 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, git, nix-update-script, + installShellFiles, }: buildGo123Module rec { @@ -22,6 +23,8 @@ buildGo123Module rec { subPackages = [ "." ]; + nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ git ]; buildInputs = [ git ]; @@ -40,6 +43,13 @@ buildGo123Module rec { rm testdata/script/branch_submit_multiple_pr_templates.txt ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd gs \ + --bash <($out/bin/gs shell completion bash) \ + --zsh <($out/bin/gs shell completion zsh) \ + --fish <($out/bin/gs shell completion fish) + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/gn/gnome-commander/package.nix b/pkgs/by-name/gn/gnome-commander/package.nix new file mode 100644 index 000000000000..4de7e5f1e051 --- /dev/null +++ b/pkgs/by-name/gn/gnome-commander/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + flex, + itstool, + rustPlatform, + rustc, + cargo, + wrapGAppsHook4, + desktop-file-utils, + exiv2, + libgsf, + taglib, + poppler, + samba, + gtest, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-commander"; + version = "1.18.1-unstable-2024-10-18"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-commander"; + rev = "28dadb1ef9342bb1a5f9a65b1a5bf3bd80e3d30a"; + hash = "sha256-DxsZJht+PD3vY5vc1vzpRD8FHBPKcjK4qfke5nhvHS0="; + }; + + # hard-coded schema paths + postPatch = '' + substituteInPlace src/gnome-cmd-data.cc plugins/fileroller/file-roller-plugin.cc \ + --replace-fail \ + '/share/glib-2.0/schemas' \ + '/share/gsettings-schemas/${finalAttrs.finalPackage.name}/glib-2.0/schemas' + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname version src; + hash = "sha256-Nx/e2H9NxCTj62xVDlKTpPdjlxAx2YAcQJh1kHByrd4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + flex + itstool + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + exiv2 + libgsf + taglib + poppler + samba + gtest + ]; + + meta = { + description = "Fast and powerful twin-panel file manager for the Linux desktop"; + homepage = "https://gcmd.github.io"; + license = lib.licenses.gpl2Plus; + mainProgram = "gnome-commander"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/gr/graphpython/package.nix b/pkgs/by-name/gr/graphpython/package.nix new file mode 100644 index 000000000000..f9c583d48745 --- /dev/null +++ b/pkgs/by-name/gr/graphpython/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "graphpython"; + version = "1.0-unstable-2024-07-28"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mlcsec"; + repo = "Graphpython"; + # https://github.com/mlcsec/Graphpython/issues/1 + rev = "ee7dbda7fe881a9a207ca8661d42c505b8491ea3"; + hash = "sha256-64M/Cc49mlceY5roBVuSsDIcbDx+lrX6oSjPAu9YDwA="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + beautifulsoup4 + cryptography + dnspython + pyjwt + requests + tabulate + termcolor + tqdm + ]; + + pythonImportsCheck = [ "Graphpython" ]; + + # Project has no tests + doCheck = false; + + meta = { + description = "Microsoft Graph API (Entra, o365, and Intune) enumeration and exploitation toolkit"; + homepage = "https://github.com/mlcsec/Graphpython"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "graphpython"; + }; +} diff --git a/pkgs/by-name/gt/gtuber/package.nix b/pkgs/by-name/gt/gtuber/package.nix new file mode 100644 index 000000000000..71e504cb8e5f --- /dev/null +++ b/pkgs/by-name/gt/gtuber/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + vala, + glib, + libsoup_3, + json-glib, + libxml2, + gst_all_1, + unstableGitUpdater, +}: + +stdenv.mkDerivation { + pname = "gtuber"; + version = "0-unstable-2024-10-11"; + + src = fetchFromGitHub { + owner = "Rafostar"; + repo = "gtuber"; + rev = "468bf02a8adcf69b1bd6dd7b5dbcdcc0bfdb6922"; + hash = "sha256-pEiHqcxkrxZRD9xW/R9DNDdp5foxaHK2SAuzmPNegaY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection # For g-ir-scanner + vala # For vapigen + ]; + buildInputs = [ + glib + libsoup_3 + json-glib + libxml2 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = { + description = "GStreamer plugin for streaming videos from websites"; + homepage = "https://rafostar.github.io/gtuber/"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ chuangzhu ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 9eea79c6b46a..9c7799fa9dc7 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -1,25 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, wayland -, wayland-protocols -, wayland-scanner -, hyprlang -, sdbus-cpp -, systemd +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + cmake, + hyprutils, + wayland, + wayland-protocols, + wayland-scanner, + hyprlang, + sdbus-cpp, + systemd, }: stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hypridle"; rev = "v${finalAttrs.version}"; - hash = "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII="; + hash = "sha256-4EgQyprji92cmhGaQQsw6eN6cmEkQKs0+MeD7YLgHlg="; }; nativeBuildInputs = [ @@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ hyprlang + hyprutils sdbus-cpp systemd wayland @@ -42,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ iogamaster ]; mainProgram = "hypridle"; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index ac691786cd1f..7a744ea14456 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -9,6 +9,8 @@ hyprlang, hyprutils, pam, + sdbus-cpp_2, + systemdLibs, wayland, wayland-protocols, wayland-scanner, @@ -24,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-w+AyYuqlZ/uWEimiptlHjtDFECm/JlUOD2ciCw8/+/8="; + hash = "sha256-sUIsjWpZLplSJXWyJcDZdvDweksXLH5r9GSkwg0kgBw="; }; strictDeps = true; @@ -54,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: { mesa pam pango + sdbus-cpp_2 + systemdLibs wayland wayland-protocols ]; diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index a68b155a6a21..9e996b621a78 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }: buildGoModule rec { pname = "immich-go"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; rev = "${version}"; - hash = "sha256-dSyVn7CQqZ/tCxF/Yl12eubWkZrV5FM8uRexCjZILbw="; + hash = "sha256-6bLjHKkEghbY+UQFrgbfeHwOjtks1HjXbDXEr7DuJbU="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index cfa9e43ba7ff..c2972b0778ed 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -131,6 +131,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kanidm/kanidm"; license = licenses.mpl20; platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens erictapen Flakebi ]; + maintainers = with maintainers; [ adamcstephens Flakebi ]; }; } diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index 59e3da8c08d1..fdf4420f1a81 100644 --- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks-gtk"; - version = "0-unstable-2024-09-30"; + version = "0-unstable-2024-10-20"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks-gtk"; - rev = "19ae222b6bab778d0f8a900d39c25ab020e33631"; - hash = "sha256-coA8gU2AKeHs6OENxBWholk5sEL/oketxNFLd8M1kTM="; + rev = "c3f83aabb6dca20fd3c2304db15da2e68d027d3e"; + hash = "sha256-1gzo9KMDHg5ZFMo5CpP36A5tomr2DFoU8UEwx7ik5F8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix index c8699987f4b9..2f686571d802 100644 --- a/pkgs/by-name/mi/mixxc/package.nix +++ b/pkgs/by-name/mi/mixxc/package.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "mixxc"; - version = "0.2.2"; + version = "0.2.3"; src = fetchCrate { pname = "mixxc"; inherit version; - hash = "sha256-Y/9l8t6Vz7yq9T1AyoHnWmIcju1rfcV0S74hiK1fEjo="; + hash = "sha256-d/bMDqDR+sBtsI3ToCcByDxqd+aE6rDPRvGBcodU6iA="; }; - cargoHash = "sha256-l9inqqUiLObrqd/8pNobwBbLaiPJD39YK/38CWfDh+Q="; + cargoHash = "sha256-RoVqQaSlIvAb8mWJNOyALjCHejFEfxjJADQfHZ5EiOs="; cargoBuildFlags = [ "--locked" ]; diff --git a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix new file mode 100644 index 000000000000..f8cf00516c22 --- /dev/null +++ b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + stdenv, + makeWrapper, + nodejs, +}: +buildNpmPackage rec { + pname = "nextcloud-whiteboard-server"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "nextcloud"; + repo = "whiteboard"; + rev = "refs/tags/v${version}"; + hash = "sha256-27w8FZz9PbVdYV7yR5iRXi5edw7U/3bLVYfdRa8yPzo="; + }; + + npmDepsHash = "sha256-SwFQRDRo7Q8+0zYWx5szahJzDSoxkkJDPQ3qEdNLVaE="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + makeWrapper ${lib.getExe nodejs} "$out/bin/nextcloud-whiteboard-server" \ + --add-flags "$out/lib/node_modules/whiteboard/websocket_server/main.js" + ''; + + meta = { + description = "Backend server for the Nextcloud Whiteboard app"; + homepage = "https://apps.nextcloud.com/apps/whiteboard"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix index 8faaeec11a0f..eb574a043940 100644 --- a/pkgs/by-name/nv/nvrh/package.nix +++ b/pkgs/by-name/nv/nvrh/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nvrh"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "mikew"; repo = "nvrh"; rev = "refs/tags/v${version}"; - hash = "sha256-fVoyxq2iCUANEsq+mCaQnBV9kQ59PZsGi9r7bSwStwQ="; + hash = "sha256-ff+ZdUScgAaNHASYAASQ/lfkCyX600kNw2Rjpr3TbBc="; }; postPatch = '' diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index e9c53a53e203..6f501da7d319 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "ovn"; - version = "24.09.0"; + version = "24.09.1"; src = fetchFromGitHub { owner = "ovn-org"; repo = "ovn"; rev = "refs/tags/v${version}"; - hash = "sha256-0KXr9oxZqIhPD0HIkDUECCjfEK50JkkJxx8xsZIoAnc="; + hash = "sha256-Fz/YNEbMZ2mB4Fv1nKE3H3XrihehYP7j0N3clnTJ5x8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 0ee1f4f1c8cc..73bf7b1a7947 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -28,6 +28,7 @@ python.pkgs.buildPythonApplication rec { "sqlalchemy-utils" "sqlalchemy" "pycognito" + "qrcode" "urllib3" ]; diff --git a/pkgs/by-name/pd/pdftitle/package.nix b/pkgs/by-name/pd/pdftitle/package.nix index 29bd775f6665..10504f4ad0e4 100644 --- a/pkgs/by-name/pd/pdftitle/package.nix +++ b/pkgs/by-name/pd/pdftitle/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "pdftitle"; - version = "0.14"; + version = "0.15"; pyproject = true; src = fetchFromGitHub { owner = "metebalci"; repo = "pdftitle"; rev = "v${version}"; - hash = "sha256-7tIvvRlaKRC3/eRUS8F3d3qiJnCU0Z14Pj9E4v0X4+o="; + hash = "sha256-IEctzvNHlGYUMl3jfTVNinmfMviVQ9q15OZtRN1mhZc="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 0abf3996cb58..c0b5c56fbc23 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -11,6 +11,8 @@ let python = python3.override { self = python; packageOverrides = final: prev: { + django = prev.django_5; + django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec { version = "3.0.0"; src = oldAttrs.src.override { @@ -26,16 +28,22 @@ let # fails with some assertions doCheck = false; }); + + django-extensions = prev.django-extensions.overridePythonAttrs { + # Compat issues with Django 5.1 + # https://github.com/django-extensions/django-extensions/issues/1885 + doCheck = false; + }; }; }; - version = "2024.2.1"; + version = "2024.3.0"; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx"; rev = "v${version}"; - hash = "sha256-D0ju9aOVy/new9GWqyFalZYCisdmM7irWSbn2TVCJYQ="; + hash = "sha256-Xv3VwYrwCGgOUf1ilD58ATj+bkehF9+im4124ivCaEU="; }; meta = with lib; { @@ -54,7 +62,7 @@ let sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor"; - npmDepsHash = "sha256-EAdeXdcC3gHun6BOHzvqpzv9+oDl1b/VTeNkYLiD+hA="; + npmDepsHash = "sha256-i7awRuR7NxhpxN2IZuI01PsN6FjXht7BxTbB1k039HA="; npmBuildScript = "build"; @@ -146,9 +154,6 @@ python.pkgs.buildPythonApplication rec { ++ plugins; optional-dependencies = { - mysql = with python.pkgs; [ - mysqlclient - ]; postgres = with python.pkgs; [ psycopg2 ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/downstream.nix b/pkgs/by-name/pr/pretalx/plugins/downstream.nix index ab94b50ac767..dd1465777ac2 100644 --- a/pkgs/by-name/pr/pretalx/plugins/downstream.nix +++ b/pkgs/by-name/pr/pretalx/plugins/downstream.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-downstream"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-downstream"; rev = "v${version}"; - hash = "sha256-xpacfU655vg6g1rD4uteeizj+Bll4fgI0AEddaGiCLE="; + hash = "sha256-Q9519jNKQUeNCHg3ivjYyQm1ePMxp/bhtcJAselQiiM="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix index 82bcf966e7d7..c240be878ad1 100644 --- a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix +++ b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-media-ccc-de"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-media-ccc-de"; rev = "v${version}"; - hash = "sha256-Cr9qbkb1VOH2EtDLSA5jmLiCnn1ICdvHnmTugCvHLc0="; + hash = "sha256-U+26hit4xXUzN8JT3WL+iGohqomX1ENb+ihM9IT1XWQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/pages.nix b/pkgs/by-name/pr/pretalx/plugins/pages.nix index 67310f5387e5..76395ed666d2 100644 --- a/pkgs/by-name/pr/pretalx/plugins/pages.nix +++ b/pkgs/by-name/pr/pretalx/plugins/pages.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-pages"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-pages"; rev = "v${version}"; - hash = "sha256-wLMl+2hAJQksCyeBnXxMIFh1/Qkosm7PqByW6QxMsyg="; + hash = "sha256-9ZJSW6kdxpwHd25CuGTE4MMXylXaZKL3eAEKKdYiuXs="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix index 0d66725c72f4..993bfd6def88 100644 --- a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix +++ b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-public-voting"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-public-voting"; rev = "v${version}"; - hash = "sha256-1zxJ1b2CHfV2AVAneUJxurZ0L3QoMzuBf8c2wrj7yBA="; + hash = "sha256-ei6GgPPEXv9WVhh+4U+WDFCMsT4bND9O85cPLpPWMhQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/venueless.nix b/pkgs/by-name/pr/pretalx/plugins/venueless.nix index 12f98f174977..7c138f07f651 100644 --- a/pkgs/by-name/pr/pretalx/plugins/venueless.nix +++ b/pkgs/by-name/pr/pretalx/plugins/venueless.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pretalx-venueless"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-venueless"; rev = "v${version}"; - hash = "sha256-llgRa18hxVoRSwU5UH6w4sE2W5ozCZm4Btbia2y0LbE="; + hash = "sha256-1YWkyTaImnlGXZWrborvJrx8zc1FOZD/ugOik7S+fC8="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix index a9a3d7903f78..a6037ca3e8fa 100644 --- a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix +++ b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-vimeo"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-vimeo"; rev = "v${version}"; - hash = "sha256-ZlF/wWD5FaC4CfYIYvcbykPajoCOotmmaY+rQ0sGAo8="; + hash = "sha256-MwAKmPQif2wLy03II1t87lIdIf2th4BteaAo5pACjLE="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/youtube.nix b/pkgs/by-name/pr/pretalx/plugins/youtube.nix index 8d9d008c9837..b2b89acbd6a9 100644 --- a/pkgs/by-name/pr/pretalx/plugins/youtube.nix +++ b/pkgs/by-name/pr/pretalx/plugins/youtube.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-youtube"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-youtube"; rev = "v${version}"; - hash = "sha256-cTxkFSK84NRn7Z2uWYBJ2NvQ3pOsUbdZDg6XE5yswPg="; + hash = "sha256-5vQPFW0qABKQjFUvjMrtmIGEpMzLLbAOBA4GFqqBNw0="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index ec6a4fc70f18..66540cdfff2a 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -98,6 +98,7 @@ python.pkgs.buildPythonApplication rec { "protobuf" "pyjwt" "python-bidi" + "qrcode" "requests" "sentry-sdk" ]; diff --git a/pkgs/by-name/ry/rye/Cargo.lock b/pkgs/by-name/ry/rye/Cargo.lock index 615c6cb0f08b..d2a1fc0559ea 100644 --- a/pkgs/by-name/ry/rye/Cargo.lock +++ b/pkgs/by-name/ry/rye/Cargo.lock @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.41.0" +version = "0.42.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/by-name/ry/rye/package.nix b/pkgs/by-name/ry/rye/package.nix index e85172823324..529342dbe583 100644 --- a/pkgs/by-name/ry/rye/package.nix +++ b/pkgs/by-name/ry/rye/package.nix @@ -12,21 +12,21 @@ stdenv, darwin, + versionCheckHook, + # passthru nix-update-script, - testers, - rye, }: rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-JpCa+7SwShfVM4Z+uPo7W2bCEf1QYHxClE/LgGSyFY0="; + hash = "sha256-f+yVuyoer0bn38iYR94TUKRT5VzQHDZQyowtas+QOK0="; }; cargoLock = { @@ -99,9 +99,14 @@ rustPlatform.buildRustPackage rec { "--skip=test_version" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = rye; }; }; meta = { diff --git a/pkgs/by-name/sh/shanggu-fonts/package.nix b/pkgs/by-name/sh/shanggu-fonts/package.nix index 1702dddba5ce..96d366dedf1f 100644 --- a/pkgs/by-name/sh/shanggu-fonts/package.nix +++ b/pkgs/by-name/sh/shanggu-fonts/package.nix @@ -23,12 +23,14 @@ let Sans = "sha256-x5z6GYsfQ+8a8W0djJTY8iutuLNYvaemIpdYh94krk0="; Serif = "sha256-3WK7vty3zZFNKkwViEsozU3qa+5hymYwXk6ta9AxmNM="; }; + + extraOutputs = builtins.attrNames source; in stdenvNoCC.mkDerivation { pname = "shanggu-fonts"; inherit version; - outputs = [ "out" ] ++ builtins.attrNames source; + outputs = [ "out" ] ++ extraOutputs; nativeBuildInputs = [ p7zip ]; @@ -49,13 +51,10 @@ stdenvNoCC.mkDerivation { mkdir -p $out/share/fonts/truetype '' + lib.strings.concatLines ( - lib.lists.forEach (builtins.attrNames source) ( - name: ('' - install -Dm444 ${name}/*.ttc -t $'' + name + ''/share/fonts/truetype - ln -s $'' + name + ''/share/fonts/truetype/*.ttc $out/share/fonts/truetype - '' - ) - ) + lib.lists.forEach extraOutputs (name: '' + install -Dm444 ${name}/*.ttc -t ${placeholder name}/share/fonts/truetype + ln -s "${placeholder name}" /share/fonts/truetype/*.ttc $out/share/fonts/truetype + '') ) + '' runHook postInstall ''; diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix index dff8f754b3f0..2d251ea39e6e 100644 --- a/pkgs/by-name/sp/spirit/package.nix +++ b/pkgs/by-name/sp/spirit/package.nix @@ -1,24 +1,28 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "spirit"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cashapp"; repo = "spirit"; rev = "v${version}-prerelease"; - hash = "sha256-e0Eu7BeOwZA8UKwonuuOde1idzaIMtprWya7nxgqyjs="; + hash = "sha256-mI4nO/yQdCrqxCDyOYQPQ905EVreYPEiupe+F4RjIqw="; }; vendorHash = "sha256-es1PGgLoE3DklnQziRjWmY7f6NNVd24L2JiuLkol6HI="; subPackages = [ "cmd/spirit" ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { homepage = "https://github.com/cashapp/spirit"; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index bb8a0859230a..28a2d452c96c 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -25,7 +25,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.10.3"; + version = "0.10.5"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "refs/tags/v${version}"; - hash = "sha256-xpNSMZWWiFU6OOooAD7ENzOggqYHdU88baPsXnovpXU="; + hash = "sha256-MD9zAWeitP3cXxzR4znqL551AGFbOcRzhV3goY6l/iY="; fetchSubmodules = true; }; - cargoHash = "sha256-qiKfHrxQ4TSSomDLlPJ2+GOEri/ZuMCvUNdxRVoplgg="; + cargoHash = "sha256-ug49H6RWLlDdJNVW/BJcqNsG/NDNgWiqR8GiZ/HVrvY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/by-name/ta/tailscale/package.nix similarity index 98% rename from pkgs/servers/tailscale/default.nix rename to pkgs/by-name/ta/tailscale/package.nix index 466e4b93c63a..5e1b6a9babe8 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoModule +, buildGo123Module , fetchFromGitHub , fetchpatch , makeWrapper @@ -17,7 +17,7 @@ let version = "1.76.1"; in -buildGoModule { +buildGo123Module { pname = "tailscale"; inherit version; diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix index 2a13821d7297..cad53fe14515 100644 --- a/pkgs/by-name/te/tex-fmt/package.nix +++ b/pkgs/by-name/te/tex-fmt/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tex-fmt"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "WGUNDERWOOD"; repo = "tex-fmt"; rev = "refs/tags/v${version}"; - hash = "sha256-o8TlD0qxz/0sS45tnBNXYNDzp+VAhH3Ym1odSleD/uw="; + hash = "sha256-Ii/z9ZmsWCHxxqUbkcu7HRBuN2LiLCxzUvqRexwQ/Co="; }; - cargoHash = "sha256-N3kCeBisjeOAG45QPQhplGRAvj5kebEX4U9pisM/GUQ="; + cargoHash = "sha256-2vPxsXKInH18h/AoOWfl0VteUBmxWDzZa6AtpKfY5Hs="; meta = { description = "LaTeX formatter written in Rust"; diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index 1dc3a8db3c07..9a11200fb9a6 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.11.4"; + version = "0.12.6"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; rev = version; - hash = "sha256-b4uSztroeOKPOyPwxVB3ofkAmDpWFstHDQX2IwQwG/4="; + hash = "sha256-v7+WDxGUWCrZMhm0TXMIZTQZTzHYNauX2LIOV3zz+9A="; }; - vendorHash = "sha256-B+SmzNLAXIjkUO1JGpD1eqa52Z1zOdPiG8urvLFXf88="; + vendorHash = "sha256-wmyaTZX181w4Kiiw1sZ4NeIDY63PwW+ayvtwrLSiF24="; nativeBuildInputs = [ openssl ]; diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index 506fb781ebd4..9c7fb11aa345 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "tradingview"; - version = "2.9.2"; - revision = "59"; + version = "2.9.3"; + revision = "60"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap"; - hash = "sha256-qGQZKl8h23H8npdIBeVw3aCZPZiCfPsawzQxUY31Ujs="; + hash = "sha256-Oa3YfmXDiqKxEMJloTu6ihJ6LKoz2XwQ0su1KrlSaYo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tu/turbo-unwrapped/enable-lazy_cell.patch b/pkgs/by-name/tu/turbo-unwrapped/enable-lazy_cell.patch deleted file mode 100644 index c6e933687411..000000000000 --- a/pkgs/by-name/tu/turbo-unwrapped/enable-lazy_cell.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/crates/turborepo-lib/src/lib.rs b/crates/turborepo-lib/src/lib.rs -index e8d41933da..26b8c7c92f 100644 ---- a/crates/turborepo-lib/src/lib.rs -+++ b/crates/turborepo-lib/src/lib.rs -@@ -2,6 +2,7 @@ - #![feature(box_patterns)] - #![feature(error_generic_member_access)] - #![feature(hash_extract_if)] -+#![feature(lazy_cell)] - #![feature(option_get_or_insert_default)] - #![feature(once_cell_try)] - #![feature(panic_info_message)] diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index f9228f310cc1..d4c20bb38ba1 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -18,21 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "turbo-unwrapped"; - version = "2.0.12"; + version = "2.2.3"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; - rev = "v${version}"; - hash = "sha256-rh9BX8M3Kgu07Pz4G3AM6S9zeK3Bb6CzOpcYo7rQgIw="; + rev = "refs/tags/v${version}"; + hash = "sha256-MDvwitzZVPVjdIVEAV1aKMAVeLSTMM2owH5RSfVg+rU="; }; - patches = [ - # upstream uses nightly where lazy_cell is stable - ./enable-lazy_cell.patch - ]; - - cargoHash = "sha256-oZHSoPrPCUwXSrxEASm4LuYO+XHyNDRRl38Q7U7F/lk="; + cargoHash = "sha256-XBI/eiOyKk80ZDFLD2HCTFYRWvC7qtzQY/zFCmKdKSM="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 5bcf16fdd8aa..19dbe22d987f 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -4,9 +4,11 @@ rustPlatform, fetchFromGitHub, pkg-config, - audioSupport ? true, + darwin, + audioSupport ? true, alsa-lib, + webcamSupport ? false, # passthru.tests.run runCommand, @@ -30,7 +32,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4XHKcmOeaeSGfl7uvQQdhm29DBWEdZLX021d9+Ebrww="; nativeBuildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ] + lib.optionals (webcamSupport || stdenv.hostPlatform.isDarwin) [ rustPlatform.bindgenHook ] ++ lib.optionals audioSupport [ pkg-config ]; buildInputs = @@ -41,7 +43,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (audioSupport && stdenv.hostPlatform.isDarwin) [ AudioUnit ] ++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ]; - buildFeatures = lib.optional audioSupport "audio"; + buildFeatures = lib.optional audioSupport "audio" ++ lib.optional webcamSupport "webcam"; passthru.updateScript = ./update.sh; passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } '' diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 590eb84c8e88..066981fdff1d 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -4,19 +4,13 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -89,9 +83,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "arrayref" @@ -160,9 +154,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.13" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" +checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" dependencies = [ "bzip2", "flate2", @@ -229,9 +223,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axoasset" @@ -314,7 +308,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -407,9 +401,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "byteorder" @@ -425,9 +419,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bzip2" @@ -499,9 +493,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.19" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ "jobserver", "libc", @@ -559,9 +553,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -569,9 +563,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -582,9 +576,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.26" +version = "4.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" +checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb" dependencies = [ "clap", ] @@ -602,9 +596,9 @@ dependencies = [ [[package]] name = "clap_complete_nushell" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe32110e006bccf720f8c9af3fee1ba7db290c724eab61544e1d3295be3a40e" +checksum = "315902e790cc6e5ddd20cbd313c1d0d49db77f191e149f96397230fb82a17677" dependencies = [ "clap", "clap_complete", @@ -847,7 +841,7 @@ version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.29.0", + "nix", "windows-sys 0.59.0", ] @@ -1052,9 +1046,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] @@ -1085,7 +1079,7 @@ checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "libz-ng-sys", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1290,9 +1284,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -1411,12 +1405,12 @@ dependencies = [ [[package]] name = "homedir" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bed305c13ce3829a09d627f5d43ff738482a09361ae4eb8039993b55fb10e5e" +checksum = "5bdbbd5bc8c5749697ccaa352fa45aff8730cf21c68029c0eef1ffed7c3d6ba2" dependencies = [ "cfg-if", - "nix 0.26.4", + "nix", "widestring", "windows 0.57.0", ] @@ -1466,15 +1460,15 @@ dependencies = [ [[package]] name = "http-content-range" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0d1a8ef218a86416107794b34cc446958d9203556c312bb41eab4c924c1d2e" +checksum = "aa7929c876417cd3ece616950474c7dff5b0150a2b53bd7e7fda55afa086c22b" [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1484,9 +1478,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -1644,9 +1638,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -1747,9 +1741,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1806,9 +1800,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libmimalloc-sys" @@ -1828,7 +1822,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", ] [[package]] @@ -1945,15 +1939,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "miette" version = "7.2.0" @@ -2008,16 +1993,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2025,6 +2000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -2077,19 +2053,6 @@ dependencies = [ "rand", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", - "pin-utils", -] - [[package]] name = "nix" version = "0.29.0" @@ -2154,18 +2117,18 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.20.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -2246,7 +2209,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -2265,9 +2228,9 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "percent-encoding" @@ -2277,9 +2240,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -2288,9 +2251,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -2298,9 +2261,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", @@ -2311,9 +2274,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -2338,18 +2301,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", @@ -2376,9 +2339,9 @@ checksum = "d15b6607fa632996eb8a17c9041cb6071cb75ac057abd45dece578723ea8c7c0" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plain" @@ -2398,15 +2361,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide", ] [[package]] @@ -2420,9 +2383,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "ppv-lite86" @@ -2475,9 +2438,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560bcab673ff7f6ca9e270c17bf3affd8a05e3bd9207f123b0d45076fd8197e8" +checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" dependencies = [ "autocfg", "equivalent", @@ -2486,9 +2449,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -2516,7 +2479,7 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=388685a8711092971930986644cfed152d1a1f6c#388685a8711092971930986644cfed152d1a1f6c" +source = "git+https://github.com/astral-sh/pubgrub?rev=7243f4faf8e54837aa8a401a18406e7173de4ad5#7243f4faf8e54837aa8a401a18406e7173de4ad5" dependencies = [ "indexmap", "log", @@ -2673,9 +2636,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -2748,9 +2711,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c1f1959e4db12c985c0283656be0925f1539549db1e47c4bd0b8b599e1ef7" +checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215" dependencies = [ "bytecheck", ] @@ -2767,6 +2730,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", + "h2", "http", "http-body", "http-body-util", @@ -2807,7 +2771,7 @@ dependencies = [ [[package]] name = "reqwest-middleware" version = "0.3.3" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" +source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121" dependencies = [ "anyhow", "async-trait", @@ -2821,7 +2785,7 @@ dependencies = [ [[package]] name = "reqwest-retry" version = "0.7.1" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" +source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121" dependencies = [ "anyhow", "async-trait", @@ -2974,8 +2938,7 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rust-netrc" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32662f97cbfdbad9d5f78f1338116f06871e7dae4fd37e9f59a0f57cf2044868" +source = "git+https://github.com/gribouille/netrc?rev=544f3890b621f0dc30fcefb4f804269c160ce2e9#544f3890b621f0dc30fcefb4f804269c160ce2e9" dependencies = [ "thiserror", ] @@ -3007,9 +2970,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ "once_cell", "ring", @@ -3034,19 +2997,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" @@ -3092,9 +3054,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -3171,9 +3133,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -3229,9 +3191,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -3241,9 +3203,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3309,9 +3271,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" @@ -3460,9 +3422,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -3975,9 +3937,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicase" @@ -3990,9 +3952,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" @@ -4026,18 +3988,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-vo" @@ -4047,9 +4009,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unscanny" @@ -4128,13 +4090,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uv" -version = "0.4.20" +version = "0.4.25" dependencies = [ "anstream", "anyhow", @@ -4144,6 +4106,7 @@ dependencies = [ "base64 0.22.1", "byteorder", "clap", + "console", "ctrlc", "etcetera", "filetime", @@ -4187,6 +4150,7 @@ dependencies = [ "uv-cli", "uv-client", "uv-configuration", + "uv-console", "uv-dispatch", "uv-distribution", "uv-distribution-filename", @@ -4210,8 +4174,10 @@ dependencies = [ "uv-scripts", "uv-settings", "uv-shell", + "uv-static", "uv-tool", "uv-types", + "uv-version", "uv-virtualenv", "uv-warnings", "uv-workspace", @@ -4240,6 +4206,7 @@ dependencies = [ "url", "urlencoding", "uv-once-map", + "uv-static", "wiremock", ] @@ -4294,7 +4261,6 @@ dependencies = [ "uv-pep508", "uv-pubgrub", "uv-pypi-types", - "uv-version", "uv-warnings", "walkdir", "zip", @@ -4321,12 +4287,14 @@ dependencies = [ "toml_edit", "tracing", "uv-configuration", + "uv-distribution", "uv-distribution-types", "uv-fs", "uv-pep440", "uv-pep508", "uv-pypi-types", "uv-python", + "uv-static", "uv-types", "uv-virtualenv", ] @@ -4352,6 +4320,7 @@ dependencies = [ "uv-fs", "uv-normalize", "uv-pypi-types", + "uv-static", "walkdir", ] @@ -4399,6 +4368,7 @@ dependencies = [ "uv-python", "uv-resolver", "uv-settings", + "uv-static", "uv-version", "uv-warnings", ] @@ -4450,6 +4420,7 @@ dependencies = [ "uv-pep508", "uv-platform-tags", "uv-pypi-types", + "uv-static", "uv-version", "uv-warnings", ] @@ -4478,6 +4449,7 @@ dependencies = [ "uv-pep508", "uv-platform-tags", "uv-pypi-types", + "uv-static", "which", ] @@ -4525,6 +4497,7 @@ dependencies = [ "uv-pypi-types", "uv-python", "uv-settings", + "uv-static", "uv-workspace", "walkdir", ] @@ -4618,6 +4591,7 @@ name = "uv-distribution-types" version = "0.0.1" dependencies = [ "anyhow", + "bitflags 2.6.0", "fs-err", "itertools 0.13.0", "jiff", @@ -4630,6 +4604,7 @@ dependencies = [ "tracing", "url", "urlencoding", + "uv-auth", "uv-cache-info", "uv-cache-key", "uv-distribution-filename", @@ -4707,6 +4682,8 @@ dependencies = [ "uv-auth", "uv-cache-key", "uv-fs", + "uv-static", + "which", ] [[package]] @@ -4777,6 +4754,7 @@ dependencies = [ "uv-platform-tags", "uv-pypi-types", "uv-python", + "uv-static", "uv-types", "uv-warnings", "walkdir", @@ -4937,6 +4915,7 @@ dependencies = [ "uv-fs", "uv-metadata", "uv-pypi-types", + "uv-static", "uv-warnings", ] @@ -5010,6 +4989,7 @@ dependencies = [ "uv-platform-tags", "uv-pypi-types", "uv-state", + "uv-static", "uv-warnings", "which", "windows-registry", @@ -5128,6 +5108,7 @@ dependencies = [ "uv-pypi-types", "uv-python", "uv-requirements-txt", + "uv-static", "uv-types", "uv-warnings", "uv-workspace", @@ -5143,6 +5124,7 @@ dependencies = [ "serde", "thiserror", "toml", + "uv-distribution-types", "uv-pep440", "uv-pep508", "uv-pypi-types", @@ -5176,6 +5158,7 @@ dependencies = [ "uv-pypi-types", "uv-python", "uv-resolver", + "uv-static", "uv-warnings", ] @@ -5188,6 +5171,7 @@ dependencies = [ "same-file", "tracing", "uv-fs", + "uv-static", "winreg", ] @@ -5201,6 +5185,10 @@ dependencies = [ "tempfile", ] +[[package]] +name = "uv-static" +version = "0.0.1" + [[package]] name = "uv-tool" version = "0.0.1" @@ -5223,6 +5211,7 @@ dependencies = [ "uv-python", "uv-settings", "uv-state", + "uv-static", "uv-virtualenv", ] @@ -5248,7 +5237,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.4.20" +version = "0.4.25" [[package]] name = "uv-virtualenv" @@ -5292,7 +5281,6 @@ dependencies = [ "same-file", "schemars", "serde", - "serde-untagged", "tempfile", "thiserror", "tokio", @@ -5300,6 +5288,7 @@ dependencies = [ "toml_edit", "tracing", "url", + "uv-distribution-types", "uv-fs", "uv-git", "uv-macros", @@ -5308,6 +5297,7 @@ dependencies = [ "uv-pep440", "uv-pep508", "uv-pypi-types", + "uv-static", "uv-warnings", ] @@ -5359,9 +5349,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -5370,9 +5360,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -5385,9 +5375,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -5397,9 +5387,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5407,9 +5397,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -5420,15 +5410,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -5454,9 +5444,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -5464,9 +5454,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -5518,7 +5508,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -5805,9 +5795,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 9ac434f41c54..90da34f6d6d7 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -15,22 +15,23 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.20"; + version = "0.4.25"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-PfjYGCPPRZVm4H9oxkWdjW7kHu4CqdkenFgL61dOU5k="; + hash = "sha256-qAfM9I2NboYkUukWnOjuGcdjp8IONAI6Qwwg1r9kCGg="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss="; - "pubgrub-0.2.1" = "sha256-pU+F6hwqy+r6tz5OBoB6gU0+vdH6F3ikUaPrcvYRX2c="; - "reqwest-middleware-0.3.3" = "sha256-csQN7jZTifliSTsOm6YrjPVgsXBOfelY7LkHD1HkNGQ="; + "pubgrub-0.2.1" = "sha256-mSpRBdQJWtKKD1zHkV7vuyfKTDY6Ejgjll5q5ryCfmY="; + "reqwest-middleware-0.3.3" = "sha256-KjyXB65a7SAfwmxokH2PQFFcJc6io0xuIBQ/yZELJzM="; + "rust-netrc-0.1.1" = "sha256-DeDAm2k4/2A9Nw8zXeKOMdxhbseGIrRXH0KgGf2shOc="; "tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ="; }; }; diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 9d13d24abdc8..7f762178a93c 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -33,7 +33,7 @@ let pname = "waveterm"; - version = "0.8.10"; + version = "0.8.12"; src = let @@ -46,10 +46,10 @@ let aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; }; hash = selectSystem { - x86_64-linux = "sha256-jhXHuzHMwo9U5B+FA2xAreOYRVroMCXqDo+9pjAyh0Q="; - aarch64-linux = "sha256-JnKkjG67uvYNod+uosJ+svTAm9bulJzTpza3jQie1yQ="; - x86_64-darwin = "sha256-Dk/pKZrqkjKc7WEGkrLdZdgUEaz8ndXjZuINyVNxEa8="; - aarch64-darwin = "sha256-FgBbUrp+Z9K4gmM4mew0NQ2yIjuC+cgYrrYkjv0Ohhg="; + x86_64-linux = "sha256-lk+YBlsgS2kOsaesKJ0XMCnbxq5iza/0xG6qWjHLZA8="; + aarch64-linux = "sha256-57j5qp/1jGiqJP6Qmfw5XkoyXkNpnaTepfhSzlISExM="; + x86_64-darwin = "sha256-jBFkBC4PcWSQNw8A2w+2iUnSLoRvXQ3A0CVqkqfx4dI="; + aarch64-darwin = "sha256-pQ3TXKhiCI164qmmDkDFb3WUjd/lX1MnAOWqsQICHR4="; }; in fetchurl { diff --git a/pkgs/by-name/wa/waveterm/update.sh b/pkgs/by-name/wa/waveterm/update.sh index 7950a65e8dfa..d56927f60bb0 100755 --- a/pkgs/by-name/wa/waveterm/update.sh +++ b/pkgs/by-name/wa/waveterm/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts +#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts latestTag=$(curl https://api.github.com/repos/wavetermdev/waveterm/releases/latest | jq -r ".tag_name") latestVersion="$(expr "$latestTag" : 'v\(.*\)')" @@ -19,7 +19,6 @@ for i in \ "aarch64-darwin Wave-darwin-arm64"; do set -- $i prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/$2-$latestVersion.zip") - hash=$(nix-hash --type sha256 --to-sri $prefetch) - + hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) update-source-version waveterm $latestVersion $hash --system=$1 --ignore-same-version done diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 690eba3a3b28..88133c882c42 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -44,8 +44,12 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y="; }; - # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7 - pythonRelaxDeps = [ "rapidfuzz" ]; + pythonRelaxDeps = [ + # https://github.com/WeblateOrg/weblate/commit/9695f912b0d24ae999d9442bb49719b4bb552696 + "qrcode" + # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7 + "rapidfuzz" + ]; patches = [ # FIXME This shouldn't be necessary and probably has to do with some dependency mismatch. diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix index aad6ed2b4018..dde65d9f9fbc 100644 --- a/pkgs/by-name/wh/whatsie/package.nix +++ b/pkgs/by-name/wh/whatsie/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "whatsie"; - version = "4.16.0"; + version = "4.16.1"; src = fetchFromGitHub { owner = "keshavbhatt"; repo = "whatsie"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-+sbnpaR+pR5aKbGUIVM3yRpco7/jE9LkCbQKrgFDYwM="; + hash = "sha256-9G+2yYc5Lcmw5NvLnn7jVZ4Fw79L29KbhiE2CYh6SLM="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/by-name/xc/xchm/package.nix similarity index 90% rename from pkgs/applications/misc/xchm/default.nix rename to pkgs/by-name/xc/xchm/package.nix index 33f8978820e6..fe94ac94ba41 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/by-name/xc/xchm/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.36"; + version = "1.37"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "sha256-+RbFE/jOD8sofHMCFgTIfgokrXYqDbCSSnN6SdEZ/b0="; + sha256 = "sha256-UMn8ds4nheuYSu0PesxdGoyxyn5AcKq9WByeRUxxx3k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 1bf147df8373..4d5110d28939 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-W5qZHPNfRe9RmsmRzA8xGPvLl6JCoVJ59N87p2ZnXGo="; + hash = "sha256-HZA4olgHYTlPnTZNGxQNQlGX//XgqslHOMOil5G76xs="; }; - cargoHash = "sha256-ofmTDO11hqr95vSKRtJgMZL2BeA4AkCRNLknzr4n88I="; + cargoHash = "sha256-l66vRrFxwxVThBy98RWIpUi6SJkPH6VZLd5fkq5AStU="; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index b6dfe89c8088..3f1b836dac0c 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.10.7"; + version = "2024.10.22"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-C68atRfJdI1+M3ztkcVUPDb8FiRqnr7awy6/IMGZjOs="; + hash = "sha256-R7gqH9IkEbXJXvLwoa4a9Obf1zbqmf2yoOpBRFq8Yro="; }; build-system = with python3Packages; [ diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index a312c0040e99..3bb9389c1e25 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,6 +1,5 @@ { lib , mkXfceDerivation -, fetchpatch2 , gobject-introspection , glib , gtk3 @@ -15,19 +14,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.6.2"; + version = "0.6.3"; odd-unstable = false; - sha256 = "sha256-A4siNxbTf9ObJJg8inPuH7Lo4dckLbFljV6aPFQxRto="; - - patches = [ - # shortcuts-plugin: Fix shortcuts-editor include - # https://gitlab.xfce.org/apps/mousepad/-/merge_requests/131 - (fetchpatch2 { - url = "https://gitlab.xfce.org/apps/mousepad/-/commit/d2eb43ae4d692cc4753647111eb3deebfa26abbb.patch"; - hash = "sha256-Ldn0ZVmCzqG8lOkeaazkodEMip3lTm/lJEhfsL8TyT8="; - }) - ]; + sha256 = "sha256-L1txMS86lOEE9tOPTIOr1Gh4lwH7krnAeq4f3yS5kN0="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f4ab8b8e20a9..960d784c07df 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -170,6 +170,11 @@ package-maintainers: - hnix - hnix-store-core - hnix-store-remote + artem: + - BNFC-meta + - alex-meta + - happy-meta + - vector-hashtables arturcygan: - hevm athas: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fb3f1d3598c6..540563af0030 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1369,6 +1369,7 @@ self: { ]; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.artem ]; }) {}; "BPS" = callPackage @@ -28261,6 +28262,7 @@ self: { libraryToolDepends = [ alex happy ]; description = "Quasi-quoter for Alex lexers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "alex-prelude" = callPackage @@ -138764,6 +138766,7 @@ self: { libraryToolDepends = [ happy ]; description = "Quasi-quoter for Happy parsers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "happybara" = callPackage @@ -325767,6 +325770,7 @@ self: { ]; description = "Efficient vector-based mutable hashtables implementation"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "vector-heterogenous" = callPackage diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 8b9e889d3e2b..4130c54eba3d 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Library to read and manipulate EXIF data in digital photographs"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libjodycode/default.nix b/pkgs/development/libraries/libjodycode/default.nix index 28a564c9bc91..acac78266f88 100644 --- a/pkgs/development/libraries/libjodycode/default.nix +++ b/pkgs/development/libraries/libjodycode/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://codeberg.org/jbruchon/libjodycode"; changelog = "https://codeberg.org/jbruchon/libjodycode/src/branch/master/CHANGES.txt"; license = lib.licenses.mit; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pbsds ]; }; }) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 8eeec2dbfe0c..8330b34f4c87 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { hash = "sha256-Q74t00na/+AW3RQAxdEShYKMIv6jXKUQnyHz7VBgUIA="; }; + patches = [ + # Drop use of deprecated libxml2 HTTP API. + # From: https://www.gaia-gis.it/fossil/libspatialite/info/7c452740fe + # see also: https://github.com/NixOS/nixpkgs/issues/347085 + ./xmlNanoHTTPCleanup.patch + ]; + nativeBuildInputs = [ pkg-config validatePkgConfig @@ -35,7 +42,7 @@ stdenv.mkDerivation rec { freexl geos librttopo - (libxml2.override { enableHttp = true; }) + libxml2 minizip proj sqlite diff --git a/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch b/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch new file mode 100644 index 000000000000..75ec36a0fe54 --- /dev/null +++ b/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch @@ -0,0 +1,26 @@ +diff --git a/src/wfs/wfs_in.c b/src/wfs/wfs_in.c +index fe07a0d..7f2557d 100644 +--- a/src/wfs/wfs_in.c ++++ b/src/wfs/wfs_in.c +@@ -76,7 +76,10 @@ Regione Toscana - Settore Sistema Informativo Territoriale ed Ambientale + #ifdef ENABLE_LIBXML2 /* LIBXML2 enabled: supporting XML documents */ + + #include +-#include ++ ++#ifdef LIBXML_HTTP_ENABLED ++ #include ++#endif + + #define MAX_GTYPES 28 + +@@ -4637,7 +4640,9 @@ SPATIALITE_DECLARE void + reset_wfs_http_connection (void) + { + /* Resets the libxml2 "nano HTTP": useful when changing the HTTP_PROXY settings */ ++#ifdef LIBXML_HTTP_ENABLED + xmlNanoHTTPCleanup (); ++#endif + } + + #else /* LIBXML2 isn't enabled */ \ No newline at end of file diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/development/libraries/quantlib/default.nix index f38d560a8e68..aad65c6045db 100644 --- a/pkgs/development/libraries/quantlib/default.nix +++ b/pkgs/development/libraries/quantlib/default.nix @@ -2,12 +2,12 @@ , stdenv , fetchFromGitHub , cmake -, boost +, boost186 # (boost181) breaks on darwin }: stdenv.mkDerivation (finalAttrs: { pname = "quantlib"; - version = "1.35"; + version = "1.36"; outputs = [ "out" "dev" ]; @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "lballabio"; repo = "QuantLib"; rev = "v${finalAttrs.version}"; - hash = "sha256-L0cdfrVZTwyRcDnYhbmRbH53+mBt6AnrKm+in++du2M="; + hash = "sha256-u1ePmtgv+kAvH2/yTuxJFcafbfULZ8daHj4gKmKzV78="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; + buildInputs = [ boost186 ]; # Required by RQuantLib, may be beneficial for others too cmakeFlags = [ "-DQL_HIGH_RESOLUTION_DATE=ON" ]; @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Free/open-source library for quantitative finance"; homepage = "https://quantlib.org"; + changelog = "https://github.com/lballabio/QuantLib/releases/tag/v${finalAttrs.version}"; platforms = platforms.unix; license = licenses.bsd3; maintainers = [ maintainers.kupac ]; diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index 16e9b4772659..94f56bd914f4 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -1,53 +1,71 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, expat -, pkg-config -, systemd +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + expat, + pkg-config, + systemdLibs, }: +let + generic = + { + version, + rev ? "v${version}", + hash, + }: + stdenv.mkDerivation (finalAttrs: { + pname = "sdbus-cpp"; + inherit version; -stdenv.mkDerivation rec { - pname = "sdbus-cpp"; - version = "1.5.0"; + src = fetchFromGitHub { + owner = "kistler-group"; + repo = "sdbus-cpp"; + inherit rev hash; + }; - src = fetchFromGitHub { - owner = "kistler-group"; - repo = "sdbus-cpp"; - rev = "v${version}"; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + expat + systemdLibs + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_CODE_GEN" true) + ]; + + meta = { + homepage = "https://github.com/Kistler-Group/sdbus-cpp"; + changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog"; + description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API"; + longDescription = '' + sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide + expressive, easy-to-use API in modern C++. + It adds another layer of abstraction on top of sd-bus, a nice, fresh C + D-Bus implementation by systemd. + It's been written primarily as a replacement of dbus-c++, which currently + suffers from a number of (unresolved) bugs, concurrency issues and + inherent design complexities and limitations. + ''; + license = lib.licenses.lgpl2Only; + maintainers = [ ]; + platforms = lib.platforms.linux; + mainProgram = "sdbus-c++-xml2cpp"; + }; + }); +in +{ + sdbus-cpp = generic { + version = "1.5.0"; hash = "sha256-oO8QNffwNI245AEPdutOGqxj4qyusZYK3bZWLh2Lcag="; }; - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - expat - systemd - ]; - - cmakeFlags = [ - "-DBUILD_CODE_GEN=ON" - ]; - - meta = { - homepage = "https://github.com/Kistler-Group/sdbus-cpp"; - changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog"; - description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API"; - longDescription = '' - sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide - expressive, easy-to-use API in modern C++. - It adds another layer of abstraction on top of sd-bus, a nice, fresh C - D-Bus implementation by systemd. - It's been written primarily as a replacement of dbus-c++, which currently - suffers from a number of (unresolved) bugs, concurrency issues and - inherent design complexities and limitations. - ''; - license = lib.licenses.lgpl2Only; - maintainers = [ ]; - platforms = lib.platforms.linux; - mainProgram = "sdbus-c++-xml2cpp"; + sdbus-cpp_2 = generic { + version = "2.0.0"; + hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g="; }; } diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index c0ac63577954..566a3ff6582e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -76,6 +76,8 @@ mapAliases { inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 + coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 + coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 446c0d4fe6cb..aa5f90bb265a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -60,8 +60,6 @@ , "coc-tabnine" , "coc-texlab" , "coc-toml" -, "coc-tslint" -, "coc-tslint-plugin" , "coc-tsserver" , "coc-ultisnips" , "coc-vetur" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 0d5ce792d47b..c3d77b4cdc01 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -61714,102 +61714,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-tslint = nodeEnv.buildNodePackage { - name = "coc-tslint"; - packageName = "coc-tslint"; - version = "1.0.17"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-tslint/-/coc-tslint-1.0.17.tgz"; - sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; - }; - dependencies = [ - sources."@babel/code-frame-7.24.7" - sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/highlight-7.24.7" - sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."builtin-modules-1.1.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-2.20.3" - sources."concat-map-0.0.1" - sources."diff-4.0.2" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."glob-7.2.3" - sources."has-flag-3.0.0" - sources."hasown-2.0.2" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-core-module-2.15.1" - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."picocolors-1.1.0" - sources."resolve-1.22.8" - sources."semver-5.7.2" - sources."sprintf-js-1.0.3" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tslib-1.14.1" - sources."tslint-5.20.1" - sources."tsutils-2.29.0" - sources."typescript-3.9.10" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "tslint extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-tslint#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - coc-tslint-plugin = nodeEnv.buildNodePackage { - name = "coc-tslint-plugin"; - packageName = "coc-tslint-plugin"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.2.0.tgz"; - sha512 = "WEl0FM8ui0Oip6YqyOYApf8vErXFudj2ftjSYqm5WNLNuPq53JSNi+5w+WNqHwX2UWE8MOB2mQszqwU2fyE8Ag=="; - }; - dependencies = [ - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" - sources."get-caller-file-1.0.3" - sources."minimatch-3.1.2" - sources."mock-require-3.0.3" - sources."normalize-path-2.1.1" - sources."remove-trailing-separator-1.1.0" - sources."typescript-tslint-plugin-0.5.4" - sources."vscode-jsonrpc-4.0.0" - sources."vscode-languageserver-5.2.1" - sources."vscode-languageserver-protocol-3.14.1" - sources."vscode-languageserver-types-3.14.0" - sources."vscode-uri-1.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "TSLint extension for coc.nvim as tsserver plugin"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index c038eb46668a..11492f912a75 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -7,14 +7,15 @@ cargo, rustPlatform, rustc, + setuptools, setuptools-rust, libiconv, }: buildPythonPackage rec { pname = "cryptg"; - version = "0.4"; - format = "setuptools"; + version = "0.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,16 +23,20 @@ buildPythonPackage rec { owner = "cher-nov"; repo = pname; rev = "v${version}"; - hash = "sha256-2HP1mKGPr8wOL5B0APJks3EVBicX2iMFI7vLJGTa1PM="; + hash = "sha256-uJfMetplTyRT95P/8ljz4H4ASYMXEM7jROWSpjftKjU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-AqSVFOB9Lfvk9h3GtoYlEOXBEt7YZYLhCDNKM9upQ2U="; + hash = "sha256-HDMztt7/ZpPlpy0IMGuWGGo4vwKhraFTmTTPr9tC+Ok="; }; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-rust + ]; + + nativeBuildInputs = [ rustPlatform.cargoSetupHook rustc cargo @@ -44,6 +49,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "cryptg" ]; + postPatch = '' + substituteInPlace pyproject.toml --replace-fail "setuptools[core]" "setuptools" + ''; + meta = with lib; { description = "Official Telethon extension to provide much faster cryptography for Telegram API requests"; homepage = "https://github.com/cher-nov/cryptg"; diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index 1a35580d19e5..91c78393be57 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -29,13 +29,14 @@ buildPythonPackage rec { hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE="; }; - nativeBuildInputs = [ - setuptools-scm + build-system = [ setuptools-scm ]; + + pythonRelaxDeps = [ + "django-phonenumber-field" + "qrcode" ]; - pythonRelaxDeps = [ "django-phonenumber-field" ]; - - propagatedBuildInputs = [ + dependencies = [ django django-formtools django-otp diff --git a/pkgs/development/python-modules/djangorestframework-csv/default.nix b/pkgs/development/python-modules/djangorestframework-csv/default.nix new file mode 100644 index 000000000000..a7aa1abbd6f8 --- /dev/null +++ b/pkgs/development/python-modules/djangorestframework-csv/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + pythonOlder, + djangorestframework, + pytestCheckHook, + pytest-django, + python, +}: + +buildPythonPackage rec { + pname = "djangorestframework-csv"; + version = "3.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "mjumbewu"; + repo = "django-rest-framework-csv"; + rev = "refs/tags/${version}"; + hash = "sha256-XtMkSucB7+foRpTaRfGF1Co0n3ONNGyzex6MXR4xM5c="; + }; + + dependencies = [ + django + djangorestframework + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} manage.py test + runHook postCheck + ''; + + pythonImportsCheck = [ "rest_framework_csv" ]; + + meta = { + description = "CSV Tools for Django REST Framework"; + homepage = "https://github.com/mjumbewu/django-rest-framework-csv"; + changelog = "https://github.com/mjumbewu/django-rest-framework-csv/releases/tag/${version}"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/dncil/default.nix b/pkgs/development/python-modules/dncil/default.nix new file mode 100644 index 000000000000..d57e491a7876 --- /dev/null +++ b/pkgs/development/python-modules/dncil/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "dncil"; + version = "1.0.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "mandiant"; + repo = "dncil"; + rev = "refs/tags/v${version}"; + hash = "sha256-bndkiXkIYTd071J+mgkmJmA+9J5yJ+9/oDfAypN7wYo="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "dncil" ]; + + meta = { + description = "Module to disassemble Common Intermediate Language (CIL) instructions"; + homepage = "https://github.com/mandiant/dncil"; + changelog = "https://github.com/mandiant/dncil/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 9d1b21213c1d..cc13fa17e153 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.17"; + version = "1.7.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-QBRlJoAOUMNCUQnb4yzU0g/RN0FkX4+swcdxyKROZTE="; + hash = "sha256-CJG/cKgqdUrJcYV5pgGjrnoXzRAj3xya7LwvchNGrPU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 7857ff562737..d35a99194358 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cookiecutter" "packaging" + "qrcode" "watchdog" "websockets" ]; diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 841be6b86865..07b255e804fc 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "6.1.6"; + version = "6.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-dVpPq2TJsR+0VWfup2SNLsnBP2j/HUQsoxJebNkD8Sw="; + hash = "sha256-424PRKjQnpb6fH+iSAqkoOhlvugW7W3wjUxCHTc/A20="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index e830e78dd09d..384dcd6d0edd 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.15.7"; + version = "3.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; inherit version; - hash = "sha256-GLarRvI2eud/iNwj7ujZwIpK/b0ClhO0XUdBi4J9Lp0="; + hash = "sha256-EyYdNDLDmIPyBZ9zYLASahS0gUrJ9SXhdjokKKWZ4lU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 22389251e06c..7e71adc6791d 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.26.0"; + version = "2.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_storage"; inherit version; - hash = "sha256-hAJ1vQpLIHwKyCG8xnQUBv+zte+UD6BQiakOtEA0U/o="; + hash = "sha256-Ui+rqaaL6n6YVwccM/r85e5SC3sXXaAEiQFyQq3o7Cc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 386b240f6b1f..25b517fef06a 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.51.0"; + version = "2.52.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-q1F+/uzyVY10pP/XrF1sL0+6o7uKfITSuZTc+NqA/Zw="; + hash = "sha256-ei+sdoCmpbsndrSUof0eLmTkk1ZDsqAfuTu40btzsO8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 56e898a15bfd..503cb06d33f8 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -16,14 +16,15 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.11.0"; + version = "1.11.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-+oeVT/ag00BEObbqzkC/EazEwnrWvRURnz3gnCBbn4k="; + pname = "google_cloud_error_reporting"; + inherit version; + hash = "sha256-1ir8o3jwzmfi7E8QPTn3E6RGtTOL9KM05NRaMRYzh5A="; }; build-system = [ setuptools ]; @@ -38,8 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 5387654ffc7c..8164ebb27137 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.17.2"; + version = "2.18.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_texttospeech"; inherit version; - hash = "sha256-hRzD46MqUA/edzeEBh6c6l6ZYKxXaIOid19w1hNZhQo="; + hash = "sha256-jR91d6b4btSDNeEIFGgCYeKXbaVIiMih1YYETuGRlvQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 32024f892556..deff078edf85 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ha-mqtt-discoverable"; - version = "0.14.0"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "unixorn"; repo = "ha-mqtt-discoverable"; rev = "refs/tags/v${version}"; - hash = "sha256-vL4EzeU+8nUPyLR22MJtLhknWF4DWMo49EKvkIqIWhA="; + hash = "sha256-IdyrcqRX5YXS6tx5qP7vOnAJpvy5sOsCwFpWMdyYaeI="; }; pythonRelaxDeps = [ "pyaml" ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index bf63055df896..56458ceee14d 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.58"; + version = "0.59"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-qsBKUdYZLSxWAGExydOO37IWqEOrYdlRnE/MJmz7Nr8="; + hash = "sha256-g7ldsWqVWM1FtOB2gFrCuATD5PthZhbelKT4NV6Rovg="; }; build-system = [ diff --git a/pkgs/development/python-modules/httpx-ws/default.nix b/pkgs/development/python-modules/httpx-ws/default.nix index b2aca0e00a94..6150c2d09b54 100644 --- a/pkgs/development/python-modules/httpx-ws/default.nix +++ b/pkgs/development/python-modules/httpx-ws/default.nix @@ -1,31 +1,31 @@ { lib, + anyio, buildPythonPackage, fetchFromGitHub, - pythonOlder, hatchling, - anyio, httpcore, httpx, - wsproto, pytestCheckHook, + pythonOlder, starlette, trio, uvicorn, + wsproto, }: buildPythonPackage rec { pname = "httpx-ws"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "frankie567"; repo = "httpx-ws"; rev = "refs/tags/v${version}"; - hash = "sha256-mynr07px+rQb7x8GepQoUgBbh0720S0K2RJrboOoJXA="; + hash = "sha256-VsIYOGNEdX4rxjEa01M77arA3ddJS3cPFxXlf13QTuE="; }; # we don't need to use the hatch-regex-commit plugin @@ -46,8 +46,6 @@ buildPythonPackage rec { wsproto ]; - pythonImportsCheck = [ "httpx_ws" ]; - nativeCheckInputs = [ pytestCheckHook starlette @@ -55,6 +53,8 @@ buildPythonPackage rec { uvicorn ]; + pythonImportsCheck = [ "httpx_ws" ]; + disabledTestPaths = [ # hang "tests/test_api.py" @@ -63,6 +63,8 @@ buildPythonPackage rec { meta = with lib; { description = "WebSocket support for HTTPX"; homepage = "https://github.com/frankie567/httpx-ws"; + changelog = "https://github.com/frankie567/httpx-ws/releases/tag/v${version}"; license = licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 6d8e4af86d2c..4c2a46563665 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.25.2"; + version = "0.26.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-wUZkh8ti35F8bGtEKJZGSRySLvCkIWEFajQNWo/WCys="; + hash = "sha256-tro4Cvjyjc1vfAvYnfeKjh8ej83Z8l4cKe8SqIBVLXg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 9360f6d78010..712be1f3410a 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.46.0"; + version = "1.47.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-oq6VXsCizqs7ZGocFWvD6SK1HRgQerlAEDW6+SBoM+A="; + hash = "sha256-1QWy+mdVttowdbIBmtW6gYwkJ4p9sL0D+DxsHk3xgvc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jupyter-console/default.nix b/pkgs/development/python-modules/jupyter-console/default.nix index 5ae844ad91ed..e699d4d25187 100644 --- a/pkgs/development/python-modules/jupyter-console/default.nix +++ b/pkgs/development/python-modules/jupyter-console/default.nix @@ -1,11 +1,13 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, + + # build-system hatchling, + + # dependencies ipykernel, - exceptiongroup, ipython, jupyter-client, jupyter-core, @@ -13,6 +15,8 @@ pygments, pyzmq, traitlets, + + # tests flaky, pexpect, pytestCheckHook, @@ -21,27 +25,29 @@ buildPythonPackage rec { pname = "jupyter-console"; version = "6.6.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "jupyter_console"; - inherit version; - hash = "sha256-VmpL8xyHrb+t8izfhG4wabWace1dpx1rpNiqrRSlNTk="; + src = fetchFromGitHub { + owner = "jupyter"; + repo = "jupyter_console"; + rev = "refs/tags/v${version}"; + hash = "sha256-jdSeZCspcjEQVBpJyxVnwJ5SAq+SS1bW9kqp/F/zwCQ="; }; - nativeBuildInputs = [ hatchling ]; + postPatch = + # Use wrapped executable in tests + let + binPath = "${placeholder "out"}/bin/jupyter-console"; + in + '' + substituteInPlace jupyter_console/tests/test_console.py \ + --replace-fail "'-m', 'jupyter_console', " "" \ + --replace-fail "sys.executable" "'${binPath}'" + ''; - postPatch = '' - # use wrapped executable in tests - substituteInPlace jupyter_console/tests/test_console.py \ - --replace "args = ['-m', 'jupyter_console', '--colors=NoColor']" "args = ['--colors=NoColor']" \ - --replace "cmd = sys.executable" "cmd = '${placeholder "out"}/bin/jupyter-console'" \ - --replace "check_output([sys.executable, '-m', 'jupyter_console'," "check_output(['${placeholder "out"}/bin/jupyter-console'," - ''; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ ipykernel ipython jupyter-client @@ -50,7 +56,7 @@ buildPythonPackage rec { pygments pyzmq traitlets - ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; + ]; pythonImportsCheck = [ "jupyter_console" ]; @@ -64,6 +70,14 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; + disabledTests = [ + # Flaky: pexpect.exceptions.TIMEOUT: Timeout exceeded + "test_console_starts" + "test_display_text" + ]; + + __darwinAllowLocalNetworking = true; + meta = { description = "Jupyter terminal console"; mainProgram = "jupyter-console"; diff --git a/pkgs/development/python-modules/lcd-i2c/default.nix b/pkgs/development/python-modules/lcd-i2c/default.nix index 27d9716cd128..554b30b9bfd0 100644 --- a/pkgs/development/python-modules/lcd-i2c/default.nix +++ b/pkgs/development/python-modules/lcd-i2c/default.nix @@ -1,9 +1,10 @@ { lib, - fetchPypi, buildPythonPackage, - smbus2, + fetchPypi, poetry-core, + pythonOlder, + smbus2, }: buildPythonPackage rec { @@ -11,14 +12,24 @@ buildPythonPackage rec { version = "0.2.3"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; hash = "sha256-NYBaCXBmuTziT0WYEqrW10HRmRy3jpjH3YWQh5Y/TdQ="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "smbus2" ]; - propagatedBuildInputs = [ smbus2 ]; + build-system = [ poetry-core ]; + + dependencies = [ smbus2 ]; + + # Module has no tests + doCheck = false; + + # Needs /dev/i2c-1 + # pythonImportsCheck = [ "lcd_i2c" ]; meta = with lib; { description = "Library for interacting with an I2C LCD screen through Python"; diff --git a/pkgs/development/python-modules/nebula3-python/default.nix b/pkgs/development/python-modules/nebula3-python/default.nix index c746e8c52180..3f208bd9f359 100644 --- a/pkgs/development/python-modules/nebula3-python/default.nix +++ b/pkgs/development/python-modules/nebula3-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nebula3-python"; - version = "3.8.2"; + version = "3.8.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vesoft-inc"; repo = "nebula-python"; rev = "refs/tags/v${version}"; - hash = "sha256-XwrrT5Vuwqw57u3Xt9nS4NjmFG2VD62gWSVfeek2478="; + hash = "sha256-p2dXpcOwVKbdfRKKTAc4LhaNuTjvPd8BBBI8aUivaZ4="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix index fa22c3e35574..7be8de78302f 100644 --- a/pkgs/development/python-modules/nitrokey/default.nix +++ b/pkgs/development/python-modules/nitrokey/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "nitrokey"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-oWfhy7Mj1UnrC70G7fpkl4q4uG0CdvO0BHwfJYszR30="; + hash = "sha256-Hn/CYvuPRkT9NYzfB8skN3Z732xfmHu6xDTVI/nDbqU="; }; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix index d9c9002b8998..fd90c13e6c2a 100644 --- a/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/pkgs/development/python-modules/open-clip-torch/default.nix @@ -29,14 +29,14 @@ }: buildPythonPackage rec { pname = "open-clip-torch"; - version = "2.27.1"; + version = "2.28.0"; pyproject = true; src = fetchFromGitHub { owner = "mlfoundations"; repo = "open_clip"; rev = "refs/tags/v${version}"; - hash = "sha256-1wOxnpNEipA0N6o4b5JCsrAtBnGP7x+MPXmVIjfDmLI="; + hash = "sha256-wHqSADiKlRyJXf3CCrXlSj6tpVVSdO8GVsKInl+OMrc="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index f979e9b7510b..a372d124ac3a 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -8,15 +8,15 @@ pdoc-pyo3-sample-library, pygments, markupsafe, - astunparse, pytestCheckHook, hypothesis, + nix-update-script, }: buildPythonPackage rec { pname = "pdoc"; - version = "14.7.0"; - disabled = pythonOlder "3.8"; + version = "15.0.0"; + disabled = pythonOlder "3.9"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-U6gLEuyKvGGP5yKXb+bWDGJqmHTdPYLLPgHLVySAJ6I="; + hash = "sha256-6XEcHhaKkxY/FU748f+OsTcSgrM4iQTmJAL8rJ3EqnY="; }; nativeBuildInputs = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { jinja2 pygments markupsafe - ] ++ lib.optional (pythonOlder "3.9") astunparse; + ]; nativeCheckInputs = [ pytestCheckHook @@ -54,6 +54,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pdoc" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { changelog = "https://github.com/mitmproxy/pdoc/blob/${src.rev}/CHANGELOG.md"; homepage = "https://pdoc.dev/"; diff --git a/pkgs/development/python-modules/pesq/default.nix b/pkgs/development/python-modules/pesq/default.nix new file mode 100644 index 000000000000..d8111f3a4531 --- /dev/null +++ b/pkgs/development/python-modules/pesq/default.nix @@ -0,0 +1,77 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + numpy, + setuptools, + + # tests + pytestCheckHook, + scipy, +}: + +buildPythonPackage rec { + pname = "pesq"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ludlows"; + repo = "PESQ"; + rev = "refs/tags/v${version}"; + hash = "sha256-JuwZ+trFKGMetS3cC3pEQsV+wbj6+klFnC3THOd8bPE="; + }; + + postPatch = + # pythonRemoveDeps does not work for removing pytest-runner + '' + substituteInPlace setup.py \ + --replace-fail ", 'pytest-runner'" "" + '' + # Flaky tests: numerical equality is not satisfied on ARM platforms + + '' + substituteInPlace tests/test_pesq.py \ + --replace-fail \ + "assert score == 1.6072081327438354" \ + "assert abs(score - 1.6072081327438354) < 1e-5" \ + --replace-fail \ + "assert score == [1.6072081327438354]" \ + "assert np.allclose(np.array(score), np.array([1.6072081327438354]))" + ''; + + build-system = [ + cython + setuptools + numpy + ]; + + dependencies = [ + numpy + ]; + + pythonImportsCheck = [ + "pesq" + "pesq.cypesq" + ]; + + # Prevents importing the `pesq` module from the source files (which lack the cypesq extension) + preCheck = '' + rm -rf pesq + ''; + + nativeCheckInputs = [ + pytestCheckHook + scipy + ]; + + meta = { + description = "PESQ (Perceptual Evaluation of Speech Quality) Wrapper for Python Users"; + homepage = "https://github.com/ludlows/PESQ"; + changelog = "https://github.com/ludlows/PESQ/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 58afee646cc8..5cf06d322fd1 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.26.1"; + version = "1.26.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-zVwsRTsxic0/K6HyTLVRYCnBpSIF9Ly0TRJS90nADTg="; + hash = "sha256-JSgWOHMwjxStwMxRe4sFYLeRRgOkfWXlIpqeDfGDSNQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 64065cc4cdb0..8acdc7ca2112 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "lock_api" @@ -235,16 +235,16 @@ checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.10.3" +version = "0.10.4" dependencies = [ "pyo3", "yrs", @@ -365,9 +365,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -392,9 +392,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index cfaae0cc4cd7..37730c78fb84 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; - rev = "refs/tags/v${version}"; - hash = "sha256-Z7u0ix9IjXaq0OKgH3Yvt5cAmAYSCyHT/ZcPLANuVzU="; + rev = "refs/tags/${version}"; + hash = "sha256-nKjXEXvEIGtwbSoabz7UBsx4nfsCgUXm+JdSL5Z/b38="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index a5850801030e..73960fec7b17 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; - maintainers = with maintainers; [ sikmir ]; + maintainers = with maintainers; teams.geospatial.members; }; } diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index bb46fdeb5d37..7c5b303c70a8 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.48.2"; + version = "0.50.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-5hoV7tM02dLrGvZ47ReVITayLFf2ceRVXOKbNa2t9iM="; + hash = "sha256-GA5BioH1z8N6I65q+7vSHM/eetN5dXSMZZ2hoQ8+0QA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 65c469091eea..73973a6ad989 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -13,21 +13,21 @@ buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.23"; + version = "0.2.25"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Julius2342"; repo = "pyvlx"; rev = "refs/tags/${version}"; - hash = "sha256-J+oJQHsULrJQNdZqYsl2hufNubMwV1KtG10jZH0jbU4="; + hash = "sha256-c0HlmqLvpIn2GXorOArBKJ0YzvWz1spmhWwm6Gow2iU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml typing-extensions zeroconf @@ -45,7 +45,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/Julius2342/pyvlx"; changelog = "https://github.com/Julius2342/pyvlx/releases/tag/${version}"; - license = with licenses; [ lgpl2Only ]; + license = licenses.lgpl2Only; maintainers = with maintainers; [ fab ]; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index e14d4ab416fc..5099900a29a1 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -2,42 +2,47 @@ lib, buildPythonPackage, fetchPypi, - mock, + pythonAtLeast, + + # build-system + poetry-core, + + # dependencies pillow, pypng, + + # tests + mock, pytestCheckHook, - pythonAtLeast, qrcode, - setuptools, testers, - typing-extensions, }: buildPythonPackage rec { pname = "qrcode"; - version = "7.4.2"; + version = "8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ndlpRUgn4Sfb2TaWsgdHI55tVA4IKTfJDxSslbMPWEU="; + hash = "sha256-AlzisVD3/kKW0Rbum61FWmZDq09ufc5UFhOkdYy840c="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - typing-extensions - pypng - # imports pkg_resouces in console_scripts.py - setuptools - ]; - - optional-dependencies.pil = [ pillow ]; + optional-dependencies = { + pil = [ pillow ]; + png = [ pypng ]; + all = [ + pypng + pillow + ]; + }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ optional-dependencies.pil; + ] ++ lib.flatten (lib.attrValues optional-dependencies); passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index fb458d9d0626..e8fb3446dd95 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -13,33 +14,31 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.6.2"; + version = "1.7.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "sensorpush-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-IZ2QSAHRdpDKFQYfqkcUm1o+7GaI8e50gEFRK3BV3s8="; + hash = "sha256-etsrXJn6n9yL0vhiZNnTepCcau50X0t2wPrhZ9R7XL4="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=sensorpush_ble --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "sensorpush_ble" ]; diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index c70ea216cd42..895b71d8cabe 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-T9y+usEOqz53Wv5gObD5o3gAlABHM3apoq/ySD5ynVg="; + hash = "sha256-5N5yObR3+3eV65ojFJFhzDbqtjNi/U2IhHlAaKttcVI="; }; build-system = [ setuptools ]; @@ -65,11 +65,16 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_cmnrl_same_grad" + "test_forward" + "test_initialization_with_embedding_dim" + "test_initialization_with_embedding_weights" "test_LabelAccuracyEvaluator" "test_model_card_reuse" "test_paraphrase_mining" "test_ParaphraseMiningEvaluator" + "test_save_and_load" "test_simple_encode" + "test_tokenize" "test_trainer" "test_trainer_invalid_column_names" "test_trainer_multi_dataset_errors" diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix index f88d43362d58..e1a87118ab81 100644 --- a/pkgs/development/python-modules/smbus2/default.nix +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "smbus2"; - version = "0.4.3"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kplindegaard"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tjJurJzDn0ATiYY3Xo66lwUs98/7ZLG3d4+h1prVHAI="; + hash = "sha256-3ZAjviVLO/c27NzrPcWf6RlZYclYkmUmOskTP9TVbNM="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index f0ff72b8b785..2e264d7756f0 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "survey"; - version = "5.4.0"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JT0tcNBReNdfbZrwSgv0OFcBz9Hp1N5JF4nP9oXfTJs="; + hash = "sha256-4vnjtSbw2y/o+fSWDl/CqTEZkl0jULGOLURdZ0BpKvY="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 8208f626622c..0631b8fc6da3 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1252"; + version = "3.0.1253"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-syJOzoaCB1opTN3IRQE7hXe+2G6gm8IxV3KA/3HTFME="; + hash = "sha256-UQeh2VTIIuTvvJ3+GfY0pfSFLyc2KCg0i5qlglhBAJY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix index ed3bbdc73569..80286ff1a950 100644 --- a/pkgs/development/python-modules/torch-geometric/default.nix +++ b/pkgs/development/python-modules/torch-geometric/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -153,21 +154,27 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - disabledTests = [ - # TODO: try to re-enable when triton will have been updated to 3.0 - # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: - # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler' - "test_compile_hetero_conv_graph_breaks" - "test_compile_multi_aggr_sage_conv" + disabledTests = + [ + # TODO: try to re-enable when triton will have been updated to 3.0 + # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: + # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler' + "test_compile_hetero_conv_graph_breaks" + "test_compile_multi_aggr_sage_conv" - # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL. - # PyTorch built with MKL has better support for addmm with sparse CPU tensors. - "test_asap" - "test_graph_unet" + # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL. + # PyTorch built with MKL has better support for addmm with sparse CPU tensors. + "test_asap" + "test_graph_unet" - # AttributeError: type object 'Any' has no attribute '_name' - "test_type_repr" - ]; + # AttributeError: type object 'Any' has no attribute '_name' + "test_type_repr" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # This test uses `torch.jit` which might not be working on darwin: + # RuntimeError: required keyword attribute 'value' has the wrong type + "test_traceable_my_conv_with_self_loops" + ]; meta = { description = "Graph Neural Network Library for PyTorch"; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index b6092e2138e6..730156a52731 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.5.0"; + version = "4.5.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/EnZ+8KeJQF3daAk5d+A9iXJ3dv5gs4+pdNEUHCVBCU="; + hash = "sha256-LoUXn9vuHocqoA1CpbKGBaBTApaIV6gyGk36Q5ByWxw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index a053c5313997..1be46ecf5656 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,13 +1,14 @@ { lib, - bleak, bleak-retry-connector, + bleak, bluetooth-data-tools, bluetooth-sensor-state-data, buildPythonPackage, cryptography, fetchFromGitHub, home-assistant-bluetooth, + orjson, poetry-core, pycryptodomex, pytestCheckHook, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.32.0"; + version = "0.33.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-dZJsB40BMPo0tOFq0vLILrwfezf5dnspFK/aZWOV4uc="; + hash = "sha256-7/4Ea8IiRPxhgMiazSylYZAmznqIula2yCEUAyIHBBg="; }; postPatch = '' @@ -46,6 +47,7 @@ buildPythonPackage rec { bluetooth-sensor-state-data cryptography home-assistant-bluetooth + orjson pycryptodomex sensor-state-data ]; diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 2db5d880138f..9fc8d9bc2858 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.30.0"; + version = "2.31.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-jYdinK7it2MDwrWZmxPHR5YqZhhVIo2vMZDCX38+igU="; + hash = "sha256-rhuIf+lwxw55SscOmtCsbrcIdjpTTM9joQbMbx8G0Uw="; }; dontConfigure = true; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 49557a4a1c39..af7420b7f4f5 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.267"; + version = "3.2.269"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-9xAWk5RFpm4sD77exdc3kjXyvW0OR/2gv2Ox+lAONoA="; + hash = "sha256-bpXKSyuPhKby8pCQUrH6H9H5za5R8FsKnoqsm8P4zek="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/misc/rustywind/default.nix b/pkgs/development/tools/misc/rustywind/default.nix index 12d3e2aa7f4c..98ae24be7fb3 100644 --- a/pkgs/development/tools/misc/rustywind/default.nix +++ b/pkgs/development/tools/misc/rustywind/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rustywind"; - version = "0.22.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; rev = "v${version}"; - hash = "sha256-dK8tO7rIsu1zVmA2reduBe8vM6L6oesig1tE+ajGSXM="; + hash = "sha256-NRIWjmKjteJibqnOjkkUY9eKIM65H7NaRX8rn1MdXmY="; }; - cargoHash = "sha256-yZQSY2zqVpmhMd6+Avg2vBh0WQB2FJ2fiMuy5x9Zl9U="; + cargoHash = "sha256-yUODUAhWtRGCj3U9nBlw3+5dNv6vGHXmJzUd8hGKnu0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 8e5250b5e1ef..67f147950d36 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.29"; + version = "1.1.31"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-RSMuealmdHe7qGFwhK9e51TED3PaCwSqzd4aj2RKMxE="; + hash = "sha256-dOQFfkxCiOFmAr11CjSdSKNpiLERkbVWawAuy8ASkJE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-gY+MDJqDjQamxQsk/CJJVuHsBAfwgrebs/h6nI0HV78="; + hash = "sha256-ZuU14GvAtf1n1sA8amtZUSGp5iJ5qp/SI2wrw4Gwe/4="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-j5jpgofGcfjto/3CtBsC4QV411lUGdk2wHwLGmLduo4="; + hash = "sha256-qN8ciVHzHH8GgR89GDgfvteMV+YawMUQLiXNwYyN+wU="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-RnKczYB/IkUYVBnRktCFhHsmvObQovVMfCilqJq3q1g="; + hash = "sha256-zHitG4Ktt+iCKk9GrC3C4MRSWhUxh89kW9bUeHzqNJs="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 6cd0c0c2f88b..88397cb55259 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -36,19 +36,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.4"; + version = "18.6"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-BoEFh0lCd2pCIod5sFafnOs/TQHj/SlIAU8P4o+cjyE="; + hash = "sha256-thAB7QtR23j39ORK1YT2Idp4J7GffbNV7snbLAnYzMI="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-1MJ5cP4lyRSZ7VRED8RL5scnqpcy8/avmBKW1Zmt6FU="; + hash = "sha256-/kCsAZP9cwUQFcNnk5/eYMzw80Bh4JnwPXd299p1JEU="; }; nativeBuildInputs = [ @@ -92,13 +92,6 @@ stdenv.mkDerivation rec { Security ]); - patches = [ - (fetchpatch { - url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; - hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; - }) - ]; - postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/ diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix deleted file mode 100644 index 4775ba5b1635..000000000000 --- a/pkgs/games/factorio/default.nix +++ /dev/null @@ -1,280 +0,0 @@ -{ lib -, alsa-lib -, factorio-utils -, fetchurl -, libGL -, libICE -, libSM -, libX11 -, libXcursor -, libXext -, libXi -, libXinerama -, libXrandr -, libpulseaudio -, libxkbcommon -, makeDesktopItem -, makeWrapper -, releaseType -, stdenv -, wayland - -, mods-dat ? null -, versionsJson ? ./versions.json -, username ? "" -, token ? "" # get/reset token at https://factorio.com/profile -, experimental ? false # true means to always use the latest branch -, ... -} @ args: - -assert releaseType == "alpha" - || releaseType == "headless" - || releaseType == "demo" - || releaseType == "expansion"; - -let - - inherit (lib) importJSON; - - mods = args.mods or [ ]; - - helpMsg = '' - - ===FETCH FAILED=== - Please ensure you have set the username and token with config.nix, or - /etc/nix/nixpkgs-config.nix if on NixOS. - - Your token can be seen at https://factorio.com/profile (after logging in). It is - not as sensitive as your password, but should still be safeguarded. There is a - link on that page to revoke/invalidate the token, if you believe it has been - leaked or wish to take precautions. - - Example: - { - packageOverrides = pkgs: { - factorio = pkgs.factorio.override { - username = "FactorioPlayer1654"; - token = "d5ad5a8971267c895c0da598688761"; - }; - }; - } - - Alternatively, instead of providing the username+token, you may manually - download the release through https://factorio.com/download , then add it to - the store using e.g.: - - releaseType=alpha - version=0.17.74 - nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz - - Note the ultimate "_" is replaced with "-" in the --name arg! - ''; - - desktopItem = makeDesktopItem { - name = "factorio"; - desktopName = "Factorio"; - comment = "A game in which you build and maintain factories."; - exec = "factorio"; - icon = "factorio"; - categories = [ "Game" ]; - }; - - branch = if experimental then "experimental" else "stable"; - - # NB `experimental` directs us to take the latest build, regardless of its branch; - # hence the (stable, experimental) pairs may sometimes refer to the same distributable. - versions = importJSON versionsJson; - binDists = makeBinDists versions; - - actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download."); - - makeBinDists = versions: - let - f = path: name: value: - if builtins.isAttrs value then - if value ? "name" then - makeBinDist value - else - builtins.mapAttrs (f (path ++ [ name ])) value - else - throw "expected attrset at ${toString path} - got ${toString value}"; - in - builtins.mapAttrs (f [ ]) versions; - makeBinDist = { name, version, tarDirectory, url, sha256, needsAuth }: { - inherit version tarDirectory; - src = - if !needsAuth then - fetchurl { inherit name url sha256; } - else - (lib.overrideDerivation - (fetchurl { - inherit name url sha256; - curlOptsList = [ - "--get" - "--data-urlencode" - "username@username" - "--data-urlencode" - "token@token" - ]; - }) - (_: { - # This preHook hides the credentials from /proc - preHook = - if username != "" && token != "" then '' - echo -n "${username}" >username - echo -n "${token}" >token - '' else '' - # Deliberately failing since username/token was not provided, so we can't fetch. - # We can't use builtins.throw since we want the result to be used if the tar is in the store already. - exit 1 - ''; - failureHook = '' - cat < str: - if FLAGS.out: - return FLAGS.out - try_paths = ["pkgs/games/factorio/versions.json", "versions.json"] - for path in try_paths: - if os.path.exists(path): - return path - raise Exception("Couldn't figure out where to write versions.json; try specifying --out") - - -def fetch_versions() -> FactorioVersionsJSON: - return json.loads(requests.get("https://factorio.com/api/latest-releases").text) - - -def generate_our_versions(factorio_versions: FactorioVersionsJSON) -> OurVersionJSON: - rec_dd = lambda: defaultdict(rec_dd) - output = rec_dd() - - # Deal with times where there's no experimental version - for rc in RELEASE_CHANNELS: - if not factorio_versions[rc.name]: - factorio_versions[rc.name] = factorio_versions['stable'] - - for system in SYSTEMS: - for release_type in RELEASE_TYPES: - for release_channel in RELEASE_CHANNELS: - version = factorio_versions[release_channel.name].get(release_type.name) - if version == None: - continue - this_release = { - "name": f"factorio_{release_type.name}_{system.tar_name}-{version}.tar.xz", - "url": f"https://factorio.com/get-download/{version}/{release_type.name}/{system.url_name}", - "version": version, - "needsAuth": release_type.needs_auth, - "tarDirectory": system.tar_name, - } - output[system.nix_name][release_type.name][release_channel.name] = this_release - return output - - -def iter_version(versions: OurVersionJSON, it: Callable[[str, str, str, Dict[str, str]], Dict[str, str]]) -> OurVersionJSON: - versions = copy.deepcopy(versions) - for system_name, system in versions.items(): - for release_type_name, release_type in system.items(): - for release_channel_name, release in release_type.items(): - release_type[release_channel_name] = it(system_name, release_type_name, release_channel_name, dict(release)) - return versions - - -def merge_versions(old: OurVersionJSON, new: OurVersionJSON) -> OurVersionJSON: - """Copies already-known hashes from version.json to avoid having to re-fetch.""" - def _merge_version(system_name: str, release_type_name: str, release_channel_name: str, release: Dict[str, str]) -> Dict[str, str]: - old_system = old.get(system_name, {}) - old_release_type = old_system.get(release_type_name, {}) - old_release = old_release_type.get(release_channel_name, {}) - if FLAGS.release_type and release_type_name not in FLAGS.release_type: - logging.info("%s/%s/%s: not in --release_type, not updating", system_name, release_type_name, release_channel_name) - return old_release - if FLAGS.release_channel and release_channel_name not in FLAGS.release_channel: - logging.info("%s/%s/%s: not in --release_channel, not updating", system_name, release_type_name, release_channel_name) - return old_release - if not "sha256" in old_release: - logging.info("%s/%s/%s: not copying sha256 since it's missing", system_name, release_type_name, release_channel_name) - return release - if not all(old_release.get(k, None) == release[k] for k in ['name', 'version', 'url']): - logging.info("%s/%s/%s: not copying sha256 due to mismatch", system_name, release_type_name, release_channel_name) - return release - release["sha256"] = old_release["sha256"] - return release - return iter_version(new, _merge_version) - - -def nix_prefetch_url(name: str, url: str, algo: str = 'sha256') -> str: - cmd = ['nix-prefetch-url', '--type', algo, '--name', name, url] - logging.info('running %s', cmd) - out = subprocess.check_output(cmd) - return out.decode('utf-8').strip() - - -def fill_in_hash(versions: OurVersionJSON) -> OurVersionJSON: - """Fill in sha256 hashes for anything missing them.""" - urls_to_hash = {} - def _fill_in_hash(system_name: str, release_type_name: str, release_channel_name: str, release: Dict[str, str]) -> Dict[str, str]: - if "sha256" in release: - logging.info("%s/%s/%s: skipping fetch, sha256 already present", system_name, release_type_name, release_channel_name) - return release - url = release["url"] - if url in urls_to_hash: - logging.info("%s/%s/%s: found url %s in cache", system_name, release_type_name, release_channel_name, url) - release["sha256"] = urls_to_hash[url] - return release - logging.info("%s/%s/%s: fetching %s", system_name, release_type_name, release_channel_name, url) - if release["needsAuth"]: - if not FLAGS.username or not FLAGS.token: - raise Exception("fetching %s/%s/%s from %s requires --username and --token" % (system_name, release_type_name, release_channel_name, url)) - url += f"?username={FLAGS.username}&token={FLAGS.token}" - release["sha256"] = nix_prefetch_url(release["name"], url) - urls_to_hash[url] = release["sha256"] - return release - return iter_version(versions, _fill_in_hash) - - -def main(argv): - factorio_versions = fetch_versions() - new_our_versions = generate_our_versions(factorio_versions) - old_our_versions = None - our_versions_path = find_versions_json() - if our_versions_path: - logging.info('Loading old versions.json from %s', our_versions_path) - with open(our_versions_path, 'r') as f: - old_our_versions = json.load(f) - if old_our_versions: - logging.info('Merging in old hashes') - new_our_versions = merge_versions(old_our_versions, new_our_versions) - logging.info('Fetching necessary tars to get hashes') - new_our_versions = fill_in_hash(new_our_versions) - with open(our_versions_path, 'w') as f: - logging.info('Writing versions.json to %s', our_versions_path) - json.dump(new_our_versions, f, sort_keys=True, indent=2) - f.write("\n") - -if __name__ == '__main__': - app.run(main) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json deleted file mode 100644 index 3c4139657b68..000000000000 --- a/pkgs/games/factorio/versions.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "x86_64-linux": { - "alpha": { - "experimental": { - "name": "factorio_alpha_x64-2.0.7.tar.xz", - "needsAuth": true, - "sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/alpha/linux64", - "version": "2.0.7" - }, - "stable": { - "name": "factorio_alpha_x64-2.0.7.tar.xz", - "needsAuth": true, - "sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/alpha/linux64", - "version": "2.0.7" - } - }, - "demo": { - "experimental": { - "name": "factorio_demo_x64-1.1.110.tar.xz", - "needsAuth": false, - "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/demo/linux64", - "version": "1.1.110" - }, - "stable": { - "name": "factorio_demo_x64-1.1.110.tar.xz", - "needsAuth": false, - "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/demo/linux64", - "version": "1.1.110" - } - }, - "expansion": { - "experimental": { - "name": "factorio_expansion_x64-2.0.7.tar.xz", - "needsAuth": true, - "sha256": "1zvk1skkm37kyikq4l1q285l8zhxc6lqvs1x2y2ccxwd4cdm6r96", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/expansion/linux64", - "version": "2.0.7" - }, - "stable": { - "name": "factorio_expansion_x64-2.0.7.tar.xz", - "needsAuth": true, - "sha256": "1zvk1skkm37kyikq4l1q285l8zhxc6lqvs1x2y2ccxwd4cdm6r96", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/expansion/linux64", - "version": "2.0.7" - } - }, - "headless": { - "experimental": { - "name": "factorio_headless_x64-2.0.7.tar.xz", - "needsAuth": false, - "sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/headless/linux64", - "version": "2.0.7" - }, - "stable": { - "name": "factorio_headless_x64-2.0.7.tar.xz", - "needsAuth": false, - "sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/headless/linux64", - "version": "2.0.7" - } - } - } -} diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 4f032415a082..f77f6653b336 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,332 +1,332 @@ { "bluedevil": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/bluedevil-6.2.1.tar.xz", - "hash": "sha256-B0O5qCynj2hayN8tmTCa/c/s2PhnMqltLNZvQZHOSwM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/bluedevil-6.2.2.tar.xz", + "hash": "sha256-0qMvgE6tLgTMJdyQ9nwlwVhRLFDUNLp+tvlql0zEyEk=" }, "breeze": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/breeze-6.2.1.tar.xz", - "hash": "sha256-91X/9z0cTcYbaHIYfO2Mxvho4O9lVlmalzFQhVL43J4=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/breeze-6.2.2.tar.xz", + "hash": "sha256-nwdWjVQ1E7mEhwgX092iUs8VJPEWF70xOKcdK/ZYllw=" }, "breeze-grub": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/breeze-grub-6.2.1.tar.xz", - "hash": "sha256-wmHD53dQHd1lrLKiy90fksVBSKPFwyc0i+XxsPcJCXE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/breeze-grub-6.2.2.tar.xz", + "hash": "sha256-LrLd0q2RFBkI8RNNuCLLLk15nYMEGtdx664NCgYaqjA=" }, "breeze-gtk": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/breeze-gtk-6.2.1.tar.xz", - "hash": "sha256-i1R41rcFaD8MLAdc6D4RN62X7WRNGjOdj5gsTcEj7w4=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/breeze-gtk-6.2.2.tar.xz", + "hash": "sha256-fMI0lLRQ0ZeahuH1YQzaXnmOJOF06CCiUTEBTHjLJKE=" }, "breeze-plymouth": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/breeze-plymouth-6.2.1.tar.xz", - "hash": "sha256-esFwowhZ1E2zT4+GOW8APyEJMd8WUgppYkFPsAXqzhI=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/breeze-plymouth-6.2.2.tar.xz", + "hash": "sha256-uWNdgObKazysk4jPbNhbQZJZX0AnRCvrbKuuFRByY1I=" }, "discover": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/discover-6.2.1.tar.xz", - "hash": "sha256-ce0t9IFEHvaeHVxvCZfwN22DqHFIUcbQFNEWS8jubZE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/discover-6.2.2.tar.xz", + "hash": "sha256-1P76+qm1uYAFIiopjPy34+HImCDQ74wCVA4aghCNWq4=" }, "drkonqi": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/drkonqi-6.2.1.tar.xz", - "hash": "sha256-Xk260ZoKtwgFsR/tGO7bmhW7F1O8RESKkts8lpRWVVA=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/drkonqi-6.2.2.tar.xz", + "hash": "sha256-YBZQ1R4XgH+QbTEKY0ax+Pgr6chJwkWBdSgXdxjw03k=" }, "flatpak-kcm": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/flatpak-kcm-6.2.1.tar.xz", - "hash": "sha256-yKHwSAEXPqTEZktkk/8GizkL1AL3GrKBIra75xz5WYc=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/flatpak-kcm-6.2.2.tar.xz", + "hash": "sha256-hLMbgFjV3j8W12aYvFN1UKxMN2Qi79c8AlfvfvnstJU=" }, "kactivitymanagerd": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kactivitymanagerd-6.2.1.tar.xz", - "hash": "sha256-vdggWWIqm6oB4Y4OS7JRoUyEG52mGjjlVoiGwwk8jM4=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kactivitymanagerd-6.2.2.tar.xz", + "hash": "sha256-8lCgQowfkB4Uw3Wa2+EfGycIwIiWYDessgMWXUAKLOE=" }, "kde-cli-tools": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kde-cli-tools-6.2.1.tar.xz", - "hash": "sha256-8Hc3ImgJg70jdR3nVOl9SmxLfP/I/OzFgPFHK4eRNik=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kde-cli-tools-6.2.2.tar.xz", + "hash": "sha256-gWSpt+ok1kxZOaUK0D1hMkExfqZWtSu7AK/WU/FEMGw=" }, "kdecoration": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kdecoration-6.2.1.tar.xz", - "hash": "sha256-k4ALPfgtDPf8IuTN99tnyJi7GUMXJR3FkzRL4ELpkIg=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kdecoration-6.2.2.tar.xz", + "hash": "sha256-t/hhoY4q9jipyF8S4YMGwFefi8HwnspsNDNfWN0se5A=" }, "kde-gtk-config": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kde-gtk-config-6.2.1.tar.xz", - "hash": "sha256-9WPUFglLK5N41LgDNt4N3tA4ddnqxx/4hDwQTLhn5ew=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kde-gtk-config-6.2.2.tar.xz", + "hash": "sha256-uon7E143+qFUSpvimhDCpAAp39U69M6zQyicamk2UGY=" }, "kdeplasma-addons": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kdeplasma-addons-6.2.1.tar.xz", - "hash": "sha256-3yAM0Gs+aMZjnX/JJ9OK4vp/n60MtHLfalpuEkqHs1o=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kdeplasma-addons-6.2.2.tar.xz", + "hash": "sha256-YhfbbWkGC7tvBP9MqChEgfilUyvwnXKBLPo+veoBH2w=" }, "kgamma": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kgamma-6.2.1.tar.xz", - "hash": "sha256-PPdzDPFg/WjbNyY++t62BX8fslrfGc2OXoZfS4ju4JE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kgamma-6.2.2.tar.xz", + "hash": "sha256-NFIpiLp0Rea/GqeurUGf9UtuGvzNNKyKlRlBarahDc4=" }, "kglobalacceld": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kglobalacceld-6.2.1.tar.xz", - "hash": "sha256-wTPtjyZ/jkDiAp/xh++zByDwPJ5fXk2ozYXaCgDJ7dQ=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kglobalacceld-6.2.2.tar.xz", + "hash": "sha256-TMREScRF1e8lHNCgbhhICkt4D+yv08bF+6dYpW9+zmw=" }, "kinfocenter": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kinfocenter-6.2.1.tar.xz", - "hash": "sha256-UEFi5sm6kfPRrwiY3r4rapw/UVv/tYkifnOZB7aAYOs=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kinfocenter-6.2.2.tar.xz", + "hash": "sha256-QNU669MdJarDrOYBuyIil71T0rcfUQy/jqxLpZkrVHc=" }, "kmenuedit": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kmenuedit-6.2.1.tar.xz", - "hash": "sha256-wRQpdz3j5Z6q5ZWNHHy+ul5o37oObguttYiPFaZSyRE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kmenuedit-6.2.2.tar.xz", + "hash": "sha256-46AhY5rISrYq8qWfhtpRibge2semboy0A8ndJ19S49E=" }, "kpipewire": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kpipewire-6.2.1.tar.xz", - "hash": "sha256-FnXi8G4gZhpdd0AFM9VSoyotbcwtntoCvKjlrbvCQ8g=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kpipewire-6.2.2.tar.xz", + "hash": "sha256-Einbl0R8wH5i5KHMPHxeW07djBcu4bki/Se1isN4QlU=" }, "krdp": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/krdp-6.2.1.tar.xz", - "hash": "sha256-kPS/BBkVS00WEyy5b0G7DUk+U/klPkIZyM5taSW2I48=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/krdp-6.2.2.tar.xz", + "hash": "sha256-BTlishksVJliNIvNAcKshO9Plk3K+htPbWc1thChynI=" }, "kscreen": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kscreen-6.2.1.tar.xz", - "hash": "sha256-PjKubDeHF4qJgxjALVrqmzQe6M4pIgc/6s9Nq+P0lM8=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kscreen-6.2.2.tar.xz", + "hash": "sha256-ogCrhAx49+XkIC9GMPYS7/7ETWLtkdm6p6BexnhYRfA=" }, "kscreenlocker": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kscreenlocker-6.2.1.tar.xz", - "hash": "sha256-w6FzDNdeyPh+2kybWy9JHVnZiz0GyT98NyHupWkLYBk=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kscreenlocker-6.2.2.tar.xz", + "hash": "sha256-HIVj6BG9qApqEp3VSJfDX7QDRbn1qg6c2Z0eKAgqdpk=" }, "ksshaskpass": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/ksshaskpass-6.2.1.tar.xz", - "hash": "sha256-ucB2+ryf+87xcu7ChMGovek7u7YNfefqSqyLxS4ay3I=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/ksshaskpass-6.2.2.tar.xz", + "hash": "sha256-8WTx49yaGDbm/44FxBLvHZ9De+GdRYP5sfa4DfdqC44=" }, "ksystemstats": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/ksystemstats-6.2.1.tar.xz", - "hash": "sha256-wxmKliFrSOh1Tl38cKj2da97Nd7z/gY/cnBEg51FoHM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/ksystemstats-6.2.2.tar.xz", + "hash": "sha256-2zr6S9irdMYDUahcrxnlwLAJWjiKJLR9OpVyg9hd3/s=" }, "kwallet-pam": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwallet-pam-6.2.1.tar.xz", - "hash": "sha256-R6vvzbF5B1qA63EMeWzb4ts0MvBb3jbvgallnBK+jzI=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwallet-pam-6.2.2.tar.xz", + "hash": "sha256-J7v6r2Txvvmn36uyp2tc8ibS5w9MrZt0D/gELFuCaoc=" }, "kwayland": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwayland-6.2.1.tar.xz", - "hash": "sha256-veB00J2Wx0SEFmR8RP8+1HulVGA1OzLAD1UCjqjqDHw=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwayland-6.2.2.tar.xz", + "hash": "sha256-7FNMWmBXJl/qrBK24XPMgj+MuqZcmOUKsGfK+wGDDwU=" }, "kwayland-integration": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwayland-integration-6.2.1.tar.xz", - "hash": "sha256-/L3qETy8AqWynHrVApoLxwXctp+3TTojZDfUebwrV2c=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwayland-integration-6.2.2.tar.xz", + "hash": "sha256-kmMnAF5BHrfvVNc6xprL1PZNcpwQarXoN4BCRF31IW4=" }, "kwin": { - "version": "6.2.1.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwin-6.2.1.1.tar.xz", - "hash": "sha256-Qqc6q2yExt/NdhNoajmkkDIMadbVk6PEwkV4xioZIeg=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwin-6.2.2.tar.xz", + "hash": "sha256-+1wv8+gAdyLz+lKIcuZJTcIdSMimtjK3SEhjiUhrwGE=" }, "kwrited": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwrited-6.2.1.tar.xz", - "hash": "sha256-0jTymV4c3aokfGkZO9qqrdfQYJLX8E8aDyzmELHb2/8=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwrited-6.2.2.tar.xz", + "hash": "sha256-Q9tHMEKQ7OumYxqBqdGeeWI9hC6hhFTe1j/SuU8ALrU=" }, "layer-shell-qt": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/layer-shell-qt-6.2.1.tar.xz", - "hash": "sha256-EehtMH+Z6aeGl/TQtLEVKOSgliKCZdxm5Y8pnmw5eUM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/layer-shell-qt-6.2.2.tar.xz", + "hash": "sha256-B+a1sbOlQ7asOGvquwXh8P4NTTSnIPuam2K89CZAV1o=" }, "libkscreen": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/libkscreen-6.2.1.tar.xz", - "hash": "sha256-DPkTb8p5t2fUzaWnBOLaBQdPBfKb/+FUr8IOYz2vLtQ=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/libkscreen-6.2.2.tar.xz", + "hash": "sha256-Nh6K8NDFpI+eSiOCFsMoNPlCTbQgQh/eQv1+OBNWUa0=" }, "libksysguard": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/libksysguard-6.2.1.tar.xz", - "hash": "sha256-I0yghbqbFGep148OJ79Zwh4AZintLZ43Mvhy/iLhKYM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/libksysguard-6.2.2.tar.xz", + "hash": "sha256-7qiUfOWrj4L9k1JGTElBi9l0YJIbYUl+kRjQZWrw/Z8=" }, "libplasma": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/libplasma-6.2.1.tar.xz", - "hash": "sha256-i6+pBIt0Pe7PWVpjqQeo5vtL1OnLF6rDNgaPp7l7CpM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/libplasma-6.2.2.tar.xz", + "hash": "sha256-30Panz10XO7OG8/CxnRhB1U7ufN78OwK0QJTQYx+YEg=" }, "milou": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/milou-6.2.1.tar.xz", - "hash": "sha256-cVwQrD0e9MbNYwrrlqWsIfkSA5qbLb5/GrzzeT0PjNI=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/milou-6.2.2.tar.xz", + "hash": "sha256-Z2hk5RT+xzrvNG8UC1dRSoYQiA+yUK9/jn9zv+zr1O0=" }, "ocean-sound-theme": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/ocean-sound-theme-6.2.1.tar.xz", - "hash": "sha256-VBNKaaOPUzHM41ZwBPPGfU133ows7qc1llRxUxQvvNw=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/ocean-sound-theme-6.2.2.tar.xz", + "hash": "sha256-bxmh2jl5BEnMkCo8ypUsLl2Tqh9GRDjHtXQDUt31l6U=" }, "oxygen": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/oxygen-6.2.1.tar.xz", - "hash": "sha256-bGvSFwQGLi6HsBHaM/G3Tn8JSWdfSHv8KQ0aMmY0Cyo=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/oxygen-6.2.2.tar.xz", + "hash": "sha256-qIOPI2Orj8L/bo1XNcHwNKaWXDHxUVoWThQky7WKp7g=" }, "oxygen-sounds": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/oxygen-sounds-6.2.1.tar.xz", - "hash": "sha256-DiDGF8hVzS/ciZBepYZfR5cz7QSWfNkPmIjp4ahGrak=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/oxygen-sounds-6.2.2.tar.xz", + "hash": "sha256-6R9fYq/fRGoPdpKBOp/QpW3QnV0Bmli2w7lZ2b9k3/w=" }, "plasma5support": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma5support-6.2.1.tar.xz", - "hash": "sha256-TqYzU5ac5euPpfvNPwN4dBqVF+uBp4HNWPYRUztWTns=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma5support-6.2.2.tar.xz", + "hash": "sha256-jiZld2i1Uzuxx67M1RZYtHphpmdQQ4v0slq5bWOoxzA=" }, "plasma-activities": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-activities-6.2.1.tar.xz", - "hash": "sha256-nzufWkr0aqoK7o55Bd8gdHtGyDjWme+niHbD6g0hRtI=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-activities-6.2.2.tar.xz", + "hash": "sha256-sTM7vOCzaXAcmd0fv3Q1wUpnRFDD1BW9zmxEwwptT/s=" }, "plasma-activities-stats": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-activities-stats-6.2.1.tar.xz", - "hash": "sha256-cGzkdptOthQLCXVcaIp9y2QtF5G0ceK2JZNciTxKhqM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-activities-stats-6.2.2.tar.xz", + "hash": "sha256-Zl/uz78Ec77cbXfdYG9rJ3FWZybV6uXp8ndIgJX9EKU=" }, "plasma-browser-integration": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-browser-integration-6.2.1.tar.xz", - "hash": "sha256-B1j2IJ2myCSpl47vlCfRvz2WGHsfz8MZqMBggr5x7So=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-browser-integration-6.2.2.tar.xz", + "hash": "sha256-a8Smt5Qcig0S1S0WfLsUEKIl1DoPd9NTAXsslB5naw4=" }, "plasma-desktop": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-desktop-6.2.1.tar.xz", - "hash": "sha256-HU/oDE89jrdlZBKV2yjrkXOwdvBbgGZhfHumOig7v7c=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-desktop-6.2.2.tar.xz", + "hash": "sha256-yD/mI5KyOZeUS6kJWc6ud7O0suawISI979rTaB0wrk8=" }, "plasma-dialer": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-dialer-6.2.1.tar.xz", - "hash": "sha256-ujia8MeIN6TVvcJx8Vm3s5GTnTV4ezhTEu5eVSh2YKE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-dialer-6.2.2.tar.xz", + "hash": "sha256-6sfaDmcpcB9nIIg7EPimqVGLx8bofjXM84a5mFSnb2k=" }, "plasma-disks": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-disks-6.2.1.tar.xz", - "hash": "sha256-wDvWjl42z5Pakn+S3GDLRLh0qQbJPSoWASVjNTD/wQo=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-disks-6.2.2.tar.xz", + "hash": "sha256-oBAbEN1vS7vdR5oM6K5gwvuamMyILKHhxZtTTGYaF+k=" }, "plasma-firewall": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-firewall-6.2.1.tar.xz", - "hash": "sha256-riGK+t5sH8/stNSpeBH7ESWtVXtXopimeZ/GPerooG0=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-firewall-6.2.2.tar.xz", + "hash": "sha256-0slIvf/N+YHQ01Tj9ZjxXb6tGEbHwLTL/nqrH0HQstU=" }, "plasma-integration": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-integration-6.2.1.tar.xz", - "hash": "sha256-pOorneCR1C/896p3jDvirc68V7gqH142EG8DberdM+k=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-integration-6.2.2.tar.xz", + "hash": "sha256-0y0FS+aUdifwXdtXQmCmpJdoanyT7GLRySkWgHS/tTk=" }, "plasma-mobile": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-mobile-6.2.1.tar.xz", - "hash": "sha256-LjH5TzwBDwdgZjBVapOZt8bNMjpnq1ELJZov+udCvyQ=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-mobile-6.2.2.tar.xz", + "hash": "sha256-DCo+14fav1i1FcdzPNqeB61b93N7+El9s7/qkNjJZ6I=" }, "plasma-nano": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-nano-6.2.1.tar.xz", - "hash": "sha256-MK/GCxMpTCxzVvo60paZSrkmoIbomFHHA8jq/fU5ZN0=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-nano-6.2.2.tar.xz", + "hash": "sha256-XGxGvTzJAfatvAvzaYU96YNOwstvhWVQGBXdcv9uh8w=" }, "plasma-nm": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-nm-6.2.1.tar.xz", - "hash": "sha256-2XUnnwYRUQ3YAl407uJBnnx37poD9+l7tW2t5po+hyg=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-nm-6.2.2.tar.xz", + "hash": "sha256-jfmXvPFLEDG4soBVobz+IuVg6qSpGtKkJAKw24pExHA=" }, "plasma-pa": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-pa-6.2.1.tar.xz", - "hash": "sha256-9k5vtxJClgia3YnWz0P3YWWFTNvNwiz/MbAsxoBugu0=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-pa-6.2.2.tar.xz", + "hash": "sha256-L8gxbV1IUcfwHPECE0A9PnfLekoEWEvA3GN5cenSJlQ=" }, "plasma-sdk": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-sdk-6.2.1.tar.xz", - "hash": "sha256-+0RVKwsk5fGlA7J8gIQ6cW+6+sxqwMjM44VT8V9wkxw=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-sdk-6.2.2.tar.xz", + "hash": "sha256-Tz/KKMFI7cHAlmiKChCCIYfXomJBakHUBLSDuMLAYg4=" }, "plasma-systemmonitor": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-systemmonitor-6.2.1.tar.xz", - "hash": "sha256-bte/HWDba4Kcxz2bZua6PDnopOqsxnWP+/FF8uVkqZo=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-systemmonitor-6.2.2.tar.xz", + "hash": "sha256-IEzWc7kWRJe5trUpLYtNaHQYDogV5yQZ7Vr3ZpPj00U=" }, "plasma-thunderbolt": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-thunderbolt-6.2.1.tar.xz", - "hash": "sha256-rFT3T7wBz77WWTQT6Pat29QgYz6ZGnKa9zjlpTR9QdU=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-thunderbolt-6.2.2.tar.xz", + "hash": "sha256-lVA5UAJmaQqfr4LYLsygvAWZ3ixweXWeDGyI2e+pYOM=" }, "plasma-vault": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-vault-6.2.1.tar.xz", - "hash": "sha256-eXYlKEZcvY468Pt1/aGE3G3V0J32C0hwECf6LO7JaI8=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-vault-6.2.2.tar.xz", + "hash": "sha256-LBC//UbV/dx409k0q2OQ1QKxAyX19vwikszEdo702K0=" }, "plasma-welcome": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-welcome-6.2.1.tar.xz", - "hash": "sha256-oKvYKyCe27g7Qx+GN2R4nGtS4WoXp3fA+Oz0rtWRFPw=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-welcome-6.2.2.tar.xz", + "hash": "sha256-DWDzg2WLBfggY7YDIxQk6Ok8OD0b4TcvAZBJlG5AX5E=" }, "plasma-workspace": { - "version": "6.2.1.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-workspace-6.2.1.1.tar.xz", - "hash": "sha256-9tzQxRlttLYRsUPQUNwNYqMFxIlO/sEFzRz+jNnQ1QY=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-workspace-6.2.2.tar.xz", + "hash": "sha256-vsyJRz1X3MV0qNnWJsyDtEbfJWekeKZj+B1Y/W6j+FM=" }, "plasma-workspace-wallpapers": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-workspace-wallpapers-6.2.1.tar.xz", - "hash": "sha256-XMbV/NJl6uAoWzqbfPoarLYhmr6PcWVqKCTNPuPk8iE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-workspace-wallpapers-6.2.2.tar.xz", + "hash": "sha256-fpl+ezHakeFsAfbktRdbvdhKuVeq96nvMKQUAJMRzTs=" }, "plymouth-kcm": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plymouth-kcm-6.2.1.tar.xz", - "hash": "sha256-FZ7i2PFpxiB67lyPcFrelSEg6CRq74Ir9v5lFn/HBhE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plymouth-kcm-6.2.2.tar.xz", + "hash": "sha256-yzg8HH06Fk3hmEF/SB8zIiNtuKXURBqL53RN1PdZ3Zs=" }, "polkit-kde-agent-1": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/polkit-kde-agent-1-6.2.1.tar.xz", - "hash": "sha256-lwPpP9tpu9qVNBjXSN7b8loWr9EW/FCZ6Kaht+QQEsc=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/polkit-kde-agent-1-6.2.2.tar.xz", + "hash": "sha256-NRA1M2Dex1xH1gUo1lUKavypHZfUZuNaTf2yVP5s9eo=" }, "powerdevil": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/powerdevil-6.2.1.tar.xz", - "hash": "sha256-W/oGj6MfEYeE5oHrl7nEn1qANMBiiwmcAFL9+xKcPmU=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/powerdevil-6.2.2.tar.xz", + "hash": "sha256-QAby9JV0xOADa7Jb07Gh5cR6UhsmgG+kAw2Ac/2xe9k=" }, "print-manager": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/print-manager-6.2.1.tar.xz", - "hash": "sha256-hQCsuZ1WSvNNT34FhZy7/+kWQcPXifJ4lAKRyCgMc88=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/print-manager-6.2.2.tar.xz", + "hash": "sha256-iKyxTmsrMG9pPFVvIfKPH/iuOTBAkO1WE5V2rdabsSo=" }, "qqc2-breeze-style": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/qqc2-breeze-style-6.2.1.tar.xz", - "hash": "sha256-dkvHgbyPufm5PPoANCQcdv/5TbHI9ODrLsZUJQKoAls=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/qqc2-breeze-style-6.2.2.tar.xz", + "hash": "sha256-7jWHLJZKFepISB/UgiAAbkJez4VakcK6pNv4sj+KQ8s=" }, "sddm-kcm": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/sddm-kcm-6.2.1.tar.xz", - "hash": "sha256-Wl0xBiI20kFl9FfriCn1RmydKu9KpqnzWG+CU9ZTv8E=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/sddm-kcm-6.2.2.tar.xz", + "hash": "sha256-Z8h+5THWU0xl8/y4w3e1yg/4M5yTVWW5iYbKo/wqxN4=" }, "spacebar": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/spacebar-6.2.1.tar.xz", - "hash": "sha256-5ueaEVK3AJNGCBWpg4e4jqgZNC5h85NT6V3/SiAen1U=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/spacebar-6.2.2.tar.xz", + "hash": "sha256-bLhNDcVKtKlGoZUD41sffLW3O59XE0Nt0gu0U26Xg3k=" }, "systemsettings": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/systemsettings-6.2.1.tar.xz", - "hash": "sha256-HgBl2eAAbnAvMmA0bXFujeJkyVQ3Hcw+91qBJnOAdbM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/systemsettings-6.2.2.tar.xz", + "hash": "sha256-pTmeHdq12GxM98Y8NNfMp1mbG2zjjLyp1AVgIs9KSEQ=" }, "wacomtablet": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/wacomtablet-6.2.1.tar.xz", - "hash": "sha256-1L0/lWFH0mocuOc5cbEk98FdpGaFOYdnPEJLLNCkJhA=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/wacomtablet-6.2.2.tar.xz", + "hash": "sha256-Uj7gUVuHSXi4i77qTlbatgGliIHubbC5bQOc/yMvGEY=" }, "xdg-desktop-portal-kde": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/xdg-desktop-portal-kde-6.2.1.tar.xz", - "hash": "sha256-hDT9KRapOI2ePorKjysW0MrVJonsPmuboRY9XzVmP28=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/xdg-desktop-portal-kde-6.2.2.tar.xz", + "hash": "sha256-Zp+cFEaptzSQw+0UKJWyJzjtqYh+7L9izNnW0QUKPdM=" } } \ No newline at end of file diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index d1a5995f591e..5dd73932e625 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -864,12 +864,12 @@ in rec { yank = mkTmuxPlugin { pluginName = "yank"; - version = "unstable-2021-06-20"; + version = "unstable-2023-07-19"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-yank"; - rev = "1b1a436e19f095ae8f825243dbe29800a8acd25c"; - sha256 = "hRvkBf+YrWycecnDixAsD4CAHg3KsioomfJ/nLl5Zgs="; + rev = "acfd36e4fcba99f8310a7dfb432111c242fe7392"; + sha256 = "sha256-/5HPaoOx2U2d8lZZJo5dKmemu6hKgHJYq23hxkddXpA="; }; }; diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 6f0cab252b92..ca2da5f22100 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,16 +1,16 @@ { - version = "2024.2"; + version = "2024.3"; # To get these, run: # # ``` # for tool in alfred batctl batman-adv; do - # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.2/$tool-2024.2.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 + # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.3/$tool-2024.3.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 # done # ``` sha256 = { - alfred = "sha256-Kpvr62fIh1n+31fRjm79qtDECPIGikYlIBfCJ8sQlnI="; - batctl = "sha256-ywKVMJP/wscA0SLAOj2eTYZ/ZG0wOPMdCpAeWP+ZXQc="; - batman-adv = "sha256-dpKm3uei8/ZnMumuyMcWTgwYGBZ/OvBjv/P/+7AZlkM="; + alfred = "sha256-1xFDOMGgZGla9x1Y3gNnenIZsHxVQpuA+G3APAJJ/+o="; + batctl = "sha256-Zl5lXto4FBUhik1fX9d/8zxPqbXtu36I6DkJaWHjYAs="; + batman-adv = "sha256-uWgX7R9PSJF8MlUKhPqtjIfs9Tqm9vRswmVUuZm1f/M="; }; } diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d2e86f876c65..a369ced84c3c 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -7,12 +7,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.56"; - hash = "sha256-5EgCIMS6eZWPB8t6z6ts5sSHoeawja0diWuh/DNnvqw="; + version = "6.6.57"; + hash = "sha256-M12AgmaxfiBaKrZkONk7wNIJznbBhe0k1fNPIzA3ZI0="; }; main = { - version = "6.11.3"; - hash = "sha256-Pb/7XToBFZstI1DFgWg4a2HiRuSzA9rEsMBLb6fRvYc="; + version = "6.11.4"; + hash = "sha256-wBNC3V69CbWxdNckaHCRmm0GUe5EhH//SoDvDEq48ic="; }; }; diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix index d63e5247dc51..9269ec20d9d3 100644 --- a/pkgs/os-specific/linux/vmware/default.nix +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "vmware-modules"; - version = "workstation-17.5.1-unstable-2024-01-12-${kernel.version}"; + version = "workstation-17.6.1-unstable-2024-10-12-${kernel.version}"; src = fetchFromGitHub { - owner = "mkubecek"; + owner = "philipl"; repo = "vmware-host-modules"; # Developer no longer provides tags for kernel compatibility fixes - # Commit hash for branch workstation-17.5.1 as of 2024-03-07 - rev = "2c6d66f3f1947384038b765c897b102ecdb18298"; - hash = "sha256-VKN6nxtgQqElVrSD5++UdngjZio4+vmetGCgTAfgtTs="; + # Commit hash for branch workstation-17.6.1 as of 2024-10-15 + rev = "3a7595bddb2239c2149d7f730a4b57c8bb120d99"; + hash = "sha256-YqRnym5bOZ2ApMegOAeiUNyhsEsF5g1TVALtkUz/v6E="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix rename to pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/default.nix b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/alarmo/default.nix rename to pkgs/servers/home-assistant/custom-components/alarmo/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/auth-header/default.nix b/pkgs/servers/home-assistant/custom-components/auth-header/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/auth-header/default.nix rename to pkgs/servers/home-assistant/custom-components/auth-header/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/average/default.nix b/pkgs/servers/home-assistant/custom-components/average/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/average/default.nix rename to pkgs/servers/home-assistant/custom-components/average/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/awtrix/default.nix b/pkgs/servers/home-assistant/custom-components/awtrix/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/awtrix/default.nix rename to pkgs/servers/home-assistant/custom-components/awtrix/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix b/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix rename to pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix rename to pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix deleted file mode 100644 index b2d958812b84..000000000000 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ callPackage -}: - -{ - adaptive_lighting = callPackage ./adaptive_lighting {}; - - alarmo = callPackage ./alarmo {}; - - auth-header = callPackage ./auth-header {}; - - awtrix = callPackage ./awtrix {}; - - average = callPackage ./average {}; - - better_thermostat = callPackage ./better_thermostat {}; - - bodymiscale = callPackage ./bodymiscale { }; - - dwd = callPackage ./dwd { }; - - elevenlabs_tts = callPackage ./elevenlabs_tts {}; - - emporia_vue = callPackage ./emporia_vue {}; - - epex_spot = callPackage ./epex_spot {}; - - frigate = callPackage ./frigate {}; - - garmin_connect = callPackage ./garmin_connect {}; - - govee-lan = callPackage ./govee-lan {}; - - gpio = callPackage ./gpio {}; - - homematicip_local = callPackage ./homematicip_local { }; - - indego = callPackage ./indego { }; - - local_luftdaten = callPackage ./local_luftdaten { }; - - localtuya = callPackage ./localtuya {}; - - mass = callPackage ./mass { }; - - midea_ac = callPackage ./midea_ac { }; - - midea_ac_lan = callPackage ./midea_ac_lan {}; - - midea-air-appliances-lan = callPackage ./midea-air-appliances-lan {}; - - miele = callPackage ./miele {}; - - moonraker = callPackage ./moonraker {}; - - nest_protect = callPackage ./nest_protect {}; - - ntfy = callPackage ./ntfy {}; - - omnik_inverter = callPackage ./omnik_inverter {}; - - prometheus_sensor = callPackage ./prometheus_sensor {}; - - samsungtv-smart = callPackage ./samsungtv-smart {}; - - sensi = callPackage ./sensi {}; - - smartir = callPackage ./smartir {}; - - smartthinq-sensors = callPackage ./smartthinq-sensors {}; - - solax_modbus = callPackage ./solax_modbus {}; - - solis-sensor = callPackage ./solis-sensor {}; - - somweb = callPackage ./somweb {}; - - spook = callPackage ./spook {}; - - tuya_local = callPackage ./tuya_local {}; - - volkswagen_we_connect_id = callPackage ./volkswagen_we_connect_id { }; - - volkswagencarnet = callPackage ./volkswagencarnet { }; - - waste_collection_schedule = callPackage ./waste_collection_schedule {}; - - xiaomi_gateway3 = callPackage ./xiaomi_gateway3 {}; - - xiaomi_miot = callPackage ./xiaomi_miot {}; - - yassi = callPackage ./yassi {}; -} diff --git a/pkgs/servers/home-assistant/custom-components/dwd/default.nix b/pkgs/servers/home-assistant/custom-components/dwd/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/dwd/default.nix rename to pkgs/servers/home-assistant/custom-components/dwd/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix rename to pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/default.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/emporia_vue/default.nix rename to pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/epex_spot/default.nix rename to pkgs/servers/home-assistant/custom-components/epex_spot/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/frigate/default.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/frigate/default.nix rename to pkgs/servers/home-assistant/custom-components/frigate/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix rename to pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix b/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/govee-lan/default.nix rename to pkgs/servers/home-assistant/custom-components/govee-lan/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/gpio/default.nix b/pkgs/servers/home-assistant/custom-components/gpio/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/gpio/default.nix rename to pkgs/servers/home-assistant/custom-components/gpio/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix rename to pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/indego/default.nix b/pkgs/servers/home-assistant/custom-components/indego/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/indego/default.nix rename to pkgs/servers/home-assistant/custom-components/indego/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/local_luftdaten/default.nix b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/local_luftdaten/default.nix rename to pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/localtuya/default.nix b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/localtuya/default.nix rename to pkgs/servers/home-assistant/custom-components/localtuya/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/mass/default.nix b/pkgs/servers/home-assistant/custom-components/mass/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/mass/default.nix rename to pkgs/servers/home-assistant/custom-components/mass/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix rename to pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/default.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/midea_ac/default.nix rename to pkgs/servers/home-assistant/custom-components/midea_ac/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix rename to pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/miele/default.nix b/pkgs/servers/home-assistant/custom-components/miele/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/miele/default.nix rename to pkgs/servers/home-assistant/custom-components/miele/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/moonraker/default.nix rename to pkgs/servers/home-assistant/custom-components/moonraker/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/nest_protect/default.nix b/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/nest_protect/default.nix rename to pkgs/servers/home-assistant/custom-components/nest_protect/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/default.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/ntfy/default.nix rename to pkgs/servers/home-assistant/custom-components/ntfy/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix b/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix rename to pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix rename to pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix rename to pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/sensi/default.nix b/pkgs/servers/home-assistant/custom-components/sensi/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/sensi/default.nix rename to pkgs/servers/home-assistant/custom-components/sensi/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/smartir/default.nix b/pkgs/servers/home-assistant/custom-components/smartir/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/smartir/default.nix rename to pkgs/servers/home-assistant/custom-components/smartir/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix rename to pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix rename to pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix rename to pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/somweb/default.nix b/pkgs/servers/home-assistant/custom-components/somweb/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/somweb/default.nix rename to pkgs/servers/home-assistant/custom-components/somweb/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/spook/default.nix b/pkgs/servers/home-assistant/custom-components/spook/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/spook/default.nix rename to pkgs/servers/home-assistant/custom-components/spook/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/tuya_local/default.nix rename to pkgs/servers/home-assistant/custom-components/tuya_local/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/default.nix b/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/default.nix rename to pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix rename to pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix rename to pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix rename to pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/default.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/xiaomi_miot/default.nix rename to pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/yassi/default.nix b/pkgs/servers/home-assistant/custom-components/yassi/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/yassi/default.nix rename to pkgs/servers/home-assistant/custom-components/yassi/package.nix diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index ef62ba34d4fb..aa86bf6ef42b 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", - "version": "4.3.1", + "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", + "version": "4.3.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "hash": "sha256-PaDPYHUzkqY24Hzpi4e3DkvT32f+WYmx7WUNRevqIh8=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.10/groupfolders-v16.0.10.tar.gz", - "version": "16.0.10", + "hash": "sha256-Plgmnp3fIzvHVcy8+wEmjNHegHqBeUtcbsRA/PHEAlc=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.11/groupfolders-v16.0.11.tar.gz", + "version": "16.0.11", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-8xQglDlOudopTsEqvnlsOTwOU6eAt6argVSXDxJdWUA=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.8/mail-v3.7.8.tar.gz", - "version": "3.7.8", + "hash": "sha256-Y591RR3m4k8G0+sNU+hRN013LikCFJ/41SbrILEfp8A=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.9/mail-v3.7.9.tar.gz", + "version": "3.7.9", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-nk5l9naHHBmpZe0oNzRNuYchbOl2asPgoRaM1vQ3CLc=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.11/richdocuments-v8.3.11.tar.gz", - "version": "8.3.11", + "hash": "sha256-MD6zuKfGdDeItmgO9NxJogUCgVS/8b5w/TZh9mPTQno=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.12/richdocuments-v8.3.12.tar.gz", + "version": "8.3.12", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -320,9 +320,9 @@ ] }, "user_oidc": { - "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", - "version": "6.0.1", + "hash": "sha256-tF68YonuCQ90XuZvZnS7NmJApk3P2741XhFjnyb7TSQ=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.0/user_oidc-v6.1.0.tar.gz", + "version": "6.1.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ @@ -338,5 +338,15 @@ "licenses": [ "agpl" ] + }, + "whiteboard": { + "hash": "sha256-3Q0B4nAVoerolDlBmjp0KwTWXLzETPrrZxnmfSDF5Gk=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.4/whiteboard-v1.0.4.tar.gz", + "version": "1.0.4", + "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library", + "homepage": "https://github.com/nextcloud/whiteboard", + "licenses": [ + "agpl" + ] } } diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 52a805aed8d3..b1547ac6fe2a 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", - "version": "4.3.1", + "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", + "version": "4.3.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "hash": "sha256-3CG5lp1lcPzcvOjcQIFcP8OVZvWCq3iNf4OUCu3X7t8=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.4/groupfolders-v17.0.4.tar.gz", - "version": "17.0.4", + "hash": "sha256-/pREdGW7kM2imVx6Jk5iZ9odQpk/93AwkFECVPJhyuI=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.5/groupfolders-v17.0.5.tar.gz", + "version": "17.0.5", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-8xQglDlOudopTsEqvnlsOTwOU6eAt6argVSXDxJdWUA=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.8/mail-v3.7.8.tar.gz", - "version": "3.7.8", + "hash": "sha256-Y591RR3m4k8G0+sNU+hRN013LikCFJ/41SbrILEfp8A=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.9/mail-v3.7.9.tar.gz", + "version": "3.7.9", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -140,8 +140,8 @@ ] }, "maps": { - "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", + "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-fcKzfo8tyYiZTwqMnR6vP+dTwTYt1UfBZG8ortPDCNg=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.7/richdocuments-v8.4.7.tar.gz", - "version": "8.4.7", + "hash": "sha256-oRk06JoOvHUD4D7htl/B+CyCz9ybSIAZCELxV3v4uCU=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.8/richdocuments-v8.4.8.tar.gz", + "version": "8.4.8", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -320,9 +320,9 @@ ] }, "user_oidc": { - "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", - "version": "6.0.1", + "hash": "sha256-tF68YonuCQ90XuZvZnS7NmJApk3P2741XhFjnyb7TSQ=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.0/user_oidc-v6.1.0.tar.gz", + "version": "6.1.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ @@ -338,5 +338,15 @@ "licenses": [ "agpl" ] + }, + "whiteboard": { + "hash": "sha256-3Q0B4nAVoerolDlBmjp0KwTWXLzETPrrZxnmfSDF5Gk=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.4/whiteboard-v1.0.4.tar.gz", + "version": "1.0.4", + "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library", + "homepage": "https://github.com/nextcloud/whiteboard", + "licenses": [ + "agpl" + ] } } diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 8d32cb8e59aa..3c87426cdd1f 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-mlxW7ALSUr3t7fd4H/TDWASzsSlPKojOLh76v8wd1w0=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.0/calendar-v5.0.0.tar.gz", - "version": "5.0.0", + "hash": "sha256-v9qjcyc2UBZK7QeO1XBZu11coPI92PRZcTipzBEMm3c=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.1/calendar-v5.0.1.tar.gz", + "version": "5.0.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", - "version": "4.3.1", + "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", + "version": "4.3.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "hash": "sha256-jSDp8+s0bqYHMZ95UaiAMkMQdYL7tmdbde5mLG6gLOk=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.2/groupfolders-v18.0.2.tar.gz", - "version": "18.0.2", + "hash": "sha256-IrxzWjxqsA6prPn/gKj9MAw0R/1Qi3kHsddNU5E9sVk=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.3/groupfolders-v18.0.3.tar.gz", + "version": "18.0.3", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-u0h9zCT/l9cUUFppKazx4oLkHYzlgGcb0OBOy1CXOG8=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.1/mail-v4.0.1.tar.gz", - "version": "4.0.1", + "hash": "sha256-iCK+B/BP4fCzaELNxL/A9OJ6Y34gZl9KIgh7lmSgtSA=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.2/mail-v4.0.2.tar.gz", + "version": "4.0.2", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -240,9 +240,9 @@ ] }, "richdocuments": { - "hash": "sha256-sM536BlvbNNrGL++ZQItvnOBk+85Hr1Sxr6/0SZTm+g=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.1/richdocuments-v8.5.1.tar.gz", - "version": "8.5.1", + "hash": "sha256-7sdMClIyQxeCToP40mKDzD4kY/wjSe8WyNl2dlis1a8=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.2/richdocuments-v8.5.2.tar.gz", + "version": "8.5.2", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -290,9 +290,9 @@ ] }, "user_oidc": { - "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", - "version": "6.0.1", + "hash": "sha256-tF68YonuCQ90XuZvZnS7NmJApk3P2741XhFjnyb7TSQ=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.0/user_oidc-v6.1.0.tar.gz", + "version": "6.1.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ @@ -308,5 +308,15 @@ "licenses": [ "agpl" ] + }, + "whiteboard": { + "hash": "sha256-3Q0B4nAVoerolDlBmjp0KwTWXLzETPrrZxnmfSDF5Gk=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.4/whiteboard-v1.0.4.tar.gz", + "version": "1.0.4", + "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library", + "homepage": "https://github.com/nextcloud/whiteboard", + "licenses": [ + "agpl" + ] } } diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 3118d4418cfd..b9c1d623164a 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -37,4 +37,5 @@ , "unsplash": "agpl3Only" , "user_oidc": "agpl3Plus" , "user_saml": "agpl3Plus" +, "whiteboard": "agpl3Plus" } diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 86fab4f8dbae..d67a21755a06 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.6.2"; + version = "3.6.3"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = "pgrouting"; rev = "v${version}"; - hash = "sha256-r+OkhieKTiOfYSnDbiy3p8V8cgb8I1+bneFwItDfDYo="; + hash = "sha256-VCoapUM7Vh4W1DUE/gWQ9YIRLbw63XlOWsgajJW+XNU="; }; installPhase = '' diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index f0f998be7443..63a041357794 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/pkgs/shells/nushell/plugins/default.nix @@ -10,4 +10,5 @@ lib.makeScope newScope (self: with self; { units = callPackage ./units.nix { inherit IOKit Foundation; }; highlight = callPackage ./highlight.nix { inherit IOKit Foundation; }; dbus = callPackage ./dbus.nix { inherit dbus; nushell_plugin_dbus = self.dbus; }; + skim = callPackage ./skim.nix { inherit IOKit CoreFoundation; }; }) diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix new file mode 100644 index 000000000000..5edc8483eaba --- /dev/null +++ b/pkgs/shells/nushell/plugins/skim.nix @@ -0,0 +1,55 @@ +{ + stdenv, + runCommand, + lib, + rustPlatform, + nix-update-script, + fetchFromGitHub, + IOKit, + CoreFoundation, + nushell, + skim, +}: + +rustPlatform.buildRustPackage rec { + pname = "nu_plugin_skim"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "idanarye"; + repo = pname; + rev = "v${version}"; + hash = "sha256-3q2qt35lZ07N8E3p4/BoYX1H4B8qcKXJWnZhdJhgpJE="; + }; + + cargoHash = "sha256-+RYrQsB8LVjxZsQ7dVDK6GT6nXSM4b+qpILOe0Q2SjA="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + CoreFoundation + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.check = + let + nu = lib.getExe nushell; + plugin = lib.getExe skim; + in + runCommand "${pname}-test" { } '' + touch $out + ${nu} -n -c "plugin add --plugin-config $out ${plugin}" + ${nu} -n -c "plugin use --plugin-config $out skim" + ''; + }; + + meta = with lib; { + description = "A nushell plugin that adds integrates the skim fuzzy finder"; + mainProgram = "nu_plugin_skim"; + homepage = "https://github.com/idanarye/nu_plugin_skim"; + license = licenses.mit; + maintainers = with maintainers; [ aftix ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index 1f3ec386cb5e..78fa48fde463 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.53.1"; + version = "2.54.0"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-gCjPwDV7jlUwWUhuXHKqL/kigsu3V0ikxhcB3EIBvU0="; + sha256 = "sha256-EYpzVrEM0GrCJcGnFT4XfN6pULqsSMyH02b0zGInH7U="; }; strictDeps = true; diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 89261aeac396..3a3899cd4251 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -28,18 +28,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-pxLf/YLd7vdAjGRQDvJvwhJXpMUiI3dge5Y5x895SPA="; + hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-btSj69yBbnbK+jdWdMi3rQGKMOLWcwY5Zn3hmEWk/Hs="; + hash = "sha256-Qv2qknWNx2OQeucUFwL1veu3MSF+fd19jFfHCCVGprM="; }; postPatch = '' diff --git a/pkgs/tools/misc/askalono/default.nix b/pkgs/tools/misc/askalono/default.nix index a15d4d08aae8..6388be509511 100644 --- a/pkgs/tools/misc/askalono/default.nix +++ b/pkgs/tools/misc/askalono/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "askalono"; - version = "0.4.6"; + version = "0.5.0"; src = fetchCrate { pname = "askalono-cli"; inherit version; - hash = "sha256-7l5bHSsmuMoHbbOI3TAYFeHwD3Y62JvfrrXZa08V3+U="; + hash = "sha256-LwyUaU4m9fk+mG8FBfkbj9nBvd8KokwlV7cE7EBwk0Q="; }; - cargoHash = "sha256-OkN8V37GApJvremRJlWG3HSpWgMC17Ge8JMTiQVoc/g="; + cargoHash = "sha256-7yFdoXK9Nyg1uT0mtiXs6evOu1U1quxL7iMMMyxqxqk="; meta = with lib; { description = "Tool to detect open source licenses from texts"; diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 29996a1c7243..bfae54dc3522 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://oss.oetiker.ch/smokeping"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.erictapen ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/security/apkleaks/default.nix b/pkgs/tools/security/apkleaks/default.nix index a8be3c4323c8..17677755409d 100644 --- a/pkgs/tools/security/apkleaks/default.nix +++ b/pkgs/tools/security/apkleaks/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "apkleaks"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; src = fetchFromGitHub { owner = "dwisiswant0"; repo = "apkleaks"; rev = "refs/tags/v${version}"; - hash = "sha256-a7zOowvhV9H91RwNDImN2+ecixY8g3WUotlBQVdmLgA="; + hash = "sha256-8P4LZsyq0mSVdE6QhnW3QaaA3UAg4UDBS3jSg7Kg/oY="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 6cbe088d6871..32797408a874 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-stGjxv9cgYxxclQpyytN6dhFm2G1Gxbf9MdyKw6gEC4="; + hash = "sha256-bZ8cNREPUgIO7lJg0WBtc9qvkDUnfqtFNi612Ctcxo8="; }; vendorHash = "sha256-mPqCphweDF9RQibdjTaXXfXdO8NENHVMdIPxrJEw2g4="; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index e42dcb6ec46c..b558409f0cdb 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-YN79sO/XNU9/HqzN/MWfrcsIyAIcWJGdSIfn00o3alY="; + hash = "sha256-fkHMtFshRNtRhsxjbYOkeL2cln84NAa01jcGKips5Kk="; }; - vendorHash = "sha256-8QC6CiaI69U/pE3JcSi3key6IscvZkWcdbmNvikbP1w="; + vendorHash = "sha256-zTPJtuKPtsVsgMwHFjVwAh1/3DudW7TPWOMJ20nNu1I="; subPackages = [ "cmd/httpx" ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 1afba85be34e..4a0d7254a351 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.17"; + version = "2.36.18"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-2bt/AUcXwXf1TxPesfXSyoiBeLHx+LGgDk4xbXEAcaY="; + sha256 = "sha256-sj+6EnpPPsl/MWMxan6dXIqJO8NePcwnVFrTCcM1SbQ="; }; - vendorHash = "sha256-gtl8T8wXnpLgDZc6qSgFKpA+XbcLNHf20ieBkyNdE+s="; + vendorHash = "sha256-mi2Jqiy1T1fcuasrIXPkhu8VTmq78WFOK/d3i7CXkhw="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index 2a392b33a65c..e88777eb10de 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "tlsx"; rev = "refs/tags/v${version}"; - hash = "sha256-vCB1sUT5auZmIg3lHFdV905wDfay5R8v+5lEKIuVzEQ="; + hash = "sha256-AQiwHNHfwOJYIEsFm2YiksdTUxp5vkCL80rpvxHY2rA="; }; - vendorHash = "sha256-Tgvs5BUuRTGSU05O+8SSvHvReACqIXqt9MEJWB7O8p4="; + vendorHash = "sha256-KNyB+xK7TUf7XoVX/4xBTnG2lMMPVV5AOoUNi4aA/cM="; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55d2d785f5e0..e21f87842189 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -311,6 +311,12 @@ with pkgs; banana-accounting = callPackage ../applications/office/banana-accounting { }; + basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix { + tbb = tbb_2021_11; + cereal = cereal_1_3_2; + opencv = opencv.override { enableGtk3 = true; }; + }; + beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; beeper = callPackage ../applications/networking/instant-messengers/beeper { }; @@ -444,6 +450,10 @@ with pkgs; circt = callPackage ../development/compilers/circt { }; + clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { + stdenv = clangStdenv; + }; + classicube = callPackage ../games/classicube { }; clj-kondo = callPackage ../development/tools/clj-kondo { }; @@ -1906,7 +1916,7 @@ with pkgs; scarab = callPackage ../tools/games/scarab { }; - sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; + inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2; sdlookup = callPackage ../tools/security/sdlookup { }; @@ -13799,7 +13809,9 @@ with pkgs; wipe = callPackage ../tools/security/wipe { }; - wireguard-go = callPackage ../tools/networking/wireguard-go { }; + wireguard-go = callPackage ../tools/networking/wireguard-go { + buildGoModule = buildGo122Module; + }; wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; @@ -24313,10 +24325,10 @@ with pkgs; home-assistant = callPackage ../servers/home-assistant { }; buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { }; - home-assistant-custom-components = lib.recurseIntoAttrs - (callPackage ../servers/home-assistant/custom-components { - inherit (home-assistant.python.pkgs) callPackage; - }); + home-assistant-custom-components = lib.recurseIntoAttrs (lib.packagesFromDirectoryRecursive { + inherit (home-assistant.python.pkgs) callPackage; + directory = ../servers/home-assistant/custom-components; + }); home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs (callPackage ../servers/home-assistant/custom-lovelace-modules {}); @@ -25148,10 +25160,6 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo123Module; - }; - tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; tailspin = callPackage ../tools/misc/tailspin { }; @@ -28879,8 +28887,6 @@ with pkgs; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; - epic5 = callPackage ../applications/networking/irc/epic5 { }; - epick = callPackage ../applications/graphics/epick { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -33560,8 +33566,6 @@ with pkgs; xchainkeys = callPackage ../tools/X11/xchainkeys { }; - xchm = callPackage ../applications/misc/xchm { }; - inherit (xorg) xcompmgr; x-create-mouse-void = callPackage ../applications/window-managers/x-create-mouse-void { }; @@ -34530,7 +34534,7 @@ with pkgs; fltk = fltk-minimal; }; - factorio = callPackage ../games/factorio { releaseType = "alpha"; }; + factorio = callPackage ../by-name/fa/factorio/package.nix { releaseType = "alpha"; }; factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; }; @@ -34544,9 +34548,9 @@ with pkgs; factorio-space-age-experimental = factorio.override { releaseType = "expansion"; experimental = true; }; - factorio-mods = callPackage ../games/factorio/mods.nix { }; + factorio-mods = callPackage ../by-name/fa/factorio/mods.nix { }; - factorio-utils = callPackage ../games/factorio/utils.nix { }; + factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { }; fairymax = callPackage ../games/fairymax { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61fd9424c546..e87e1ee17e69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3518,6 +3518,8 @@ self: super: with self; { djangorestframework-camel-case = callPackage ../development/python-modules/djangorestframework-camel-case { }; + djangorestframework-csv = callPackage ../development/python-modules/djangorestframework-csv { }; + djangorestframework-guardian = callPackage ../development/python-modules/djangorestframework-guardian { }; djangorestframework-guardian2 = callPackage ../development/python-modules/djangorestframework-guardian2 { }; @@ -3624,6 +3626,8 @@ self: super: with self; { dnachisel = callPackage ../development/python-modules/dnachisel { }; + dncil = callPackage ../development/python-modules/dncil { }; + dnf-plugins-core = callPackage ../development/python-modules/dnf-plugins-core { }; dnf4 = callPackage ../development/python-modules/dnf4 { }; @@ -9890,6 +9894,8 @@ self: super: with self; { pescea = callPackage ../development/python-modules/pescea { }; + pesq = callPackage ../development/python-modules/pesq { }; + pex = callPackage ../development/python-modules/pex { }; pexif = callPackage ../development/python-modules/pexif { };