diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b6e5d940df46..12acd1644d27 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3577,6 +3577,17 @@ githubId = 382011; name = "c4605"; }; + c4thebomb = { + name = "Ceferino Patino"; + email = "c4patino@gmail.com"; + github = "c4thebomb"; + githubId = 79673111; + keys = [ + { + fingerprint = "EA60 D516 A926 7532 369D 3E67 E161 DF22 9EC1 280E"; + } + ]; + }; caarlos0 = { name = "Carlos A Becker"; email = "carlos@becker.software"; @@ -11620,6 +11631,11 @@ githubId = 1792886; name = "Julien Malka"; }; + juliusfreudenberger = { + name = "Julius Freudenberger"; + github = "JuliusFreudenberger"; + githubId = 13383409; + }; juliusrickert = { email = "nixpkgs@juliusrickert.de"; github = "juliusrickert"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f384eb18e747..39d5c9dcbece 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -470,7 +470,6 @@ with lib.maintainers; gnome-circle = { members = [ aleksana - dawidd6 getchoo michaelgrahamevans ]; diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 5c6bc0ab47d8..9e999832d324 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -65,6 +65,8 @@ - [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](options.html#opt-services.kimai). +- [Homer](https://homer-demo.netlify.app/), a very simple static homepage for your server. Available as [services.homer](options.html#opt-services.homer). + - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable). - [Yggdrasil-Jumper](https://github.com/one-d-wide/yggdrasil-jumper) is an independent project that aims to transparently reduce latency of a connection over Yggdrasil network, utilizing NAT traversal to automatically bypass intermediary nodes. @@ -97,6 +99,8 @@ - [Bat](https://github.com/sharkdp/bat), a {manpage}`cat(1)` clone with wings. Available as [programs.bat](options.html#opt-programs.bat). +- [Autotier](https://github.com/45Drives/autotier), a passthrough FUSE filesystem. Available as [services.autotierfs](options.html#opt-services.autotierfs.enable). + - [Β΅Streamer](https://github.com/pikvm/ustreamer), a lightweight MJPEG-HTTP streamer. Available as [services.ustreamer](options.html#opt-services.ustreamer). - [Whoogle Search](https://github.com/benbusby/whoogle-search), a self-hosted, ad-free, privacy-respecting metasearch engine. Available as [services.whoogle-search](options.html#opt-services.whoogle-search.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dd5b09d91610..05418ae2764e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -417,6 +417,7 @@ ./services/audio/squeezelite.nix ./services/audio/tts.nix ./services/audio/ympd.nix + ./services/autotierfs.nix ./services/backup/automysqlbackup.nix ./services/backup/bacula.nix ./services/backup/borgbackup.nix @@ -1497,6 +1498,7 @@ ./services/web-apps/hedgedoc.nix ./services/web-apps/hledger-web.nix ./services/web-apps/homebox.nix + ./services/web-apps/homer.nix ./services/web-apps/honk.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix diff --git a/nixos/modules/services/autotierfs.nix b/nixos/modules/services/autotierfs.nix new file mode 100644 index 000000000000..62200708bbb4 --- /dev/null +++ b/nixos/modules/services/autotierfs.nix @@ -0,0 +1,95 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.autotierfs; + ini = pkgs.formats.ini { }; + format = lib.types.attrsOf ini.type; + stateDir = "/var/lib/autotier"; + + generateConfigName = + name: builtins.replaceStrings [ "/" ] [ "-" ] (lib.strings.removePrefix "/" name); + configFiles = builtins.mapAttrs ( + name: val: ini.generate "${generateConfigName name}.conf" val + ) cfg.settings; + + getMountDeps = + settings: builtins.concatStringsSep " " (builtins.catAttrs "Path" (builtins.attrValues settings)); + + mountPaths = builtins.attrNames cfg.settings; +in +{ + options.services.autotierfs = { + enable = lib.mkEnableOption "the autotier passthrough tiering filesystem"; + package = lib.mkPackageOption pkgs "autotier" { }; + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format; + }; + default = { }; + description = '' + The contents of the configuration file for autotier. + See the [autotier repo](https://github.com/45Drives/autotier#configuration) for supported values. + ''; + example = lib.literalExpression '' + { + "/mnt/autotier" = { + Global = { + "Log Level" = 1; + "Tier Period" = 1000; + "Copy Buffer Size" = "1 MiB"; + }; + "Tier 1" = { + Path = "/mnt/tier1"; + Quota = "30GiB"; + }; + "Tier 2" = { + Path = "/mnt/tier2"; + Quota = "200GiB"; + }; + }; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.settings != { }; + message = "`services.autotierfs.settings` must be configured."; + } + ]; + + system.fsPackages = [ cfg.package ]; + + # Not necessary for module to work but makes it easier to pass config into cli + environment.etc = lib.attrsets.mapAttrs' ( + name: value: + lib.attrsets.nameValuePair "autotier/${(generateConfigName name)}.conf" { source = value; } + ) configFiles; + + systemd.tmpfiles.rules = (map (path: "d ${path} 0770 - autotier - -") mountPaths) ++ [ + "d ${stateDir} 0774 - autotier - -" + ]; + + users.groups.autotier = { }; + + systemd.services = lib.attrsets.mapAttrs' ( + path: values: + lib.attrsets.nameValuePair (generateConfigName path) { + description = "Mount autotierfs virtual path ${path}"; + unitConfig.RequiresMountsFor = getMountDeps values; + wantedBy = [ "local-fs.target" ]; + serviceConfig = { + Type = "forking"; + ExecStart = "${lib.getExe' cfg.package "autotierfs"} -c /etc/autotier/${generateConfigName path}.conf ${path} -o allow_other,default_permissions"; + ExecStop = "umount ${path}"; + }; + } + ) cfg.settings; + }; +} diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix index 37cf05fe012b..89c2f34b6699 100644 --- a/nixos/modules/services/misc/open-webui.nix +++ b/nixos/modules/services/misc/open-webui.nix @@ -97,7 +97,7 @@ in } // cfg.environment; serviceConfig = { - ExecStart = "${lib.getExe cfg.package} serve --host ${cfg.host} --port ${toString cfg.port}"; + ExecStart = "${lib.getExe cfg.package} serve --host \"${cfg.host}\" --port ${toString cfg.port}"; EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; WorkingDirectory = cfg.stateDir; StateDirectory = "open-webui"; diff --git a/nixos/modules/services/web-apps/homer.nix b/nixos/modules/services/web-apps/homer.nix new file mode 100644 index 000000000000..28936bf57be0 --- /dev/null +++ b/nixos/modules/services/web-apps/homer.nix @@ -0,0 +1,184 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.homer; + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "homer-config.yml" cfg.settings; +in +{ + options.services.homer = { + enable = lib.mkEnableOption '' + A dead simple static HOMepage for your servER to keep your services on hand, from a simple yaml configuration file. + ''; + + virtualHost = { + nginx.enable = lib.mkEnableOption "a virtualhost to serve homer through nginx"; + caddy.enable = lib.mkEnableOption "a virtualhost to serve homer through caddy"; + + domain = lib.mkOption { + description = '' + Domain to use for the virtual host. + + This can be used to change nginx options like + ```nix + services.nginx.virtualHosts."$\{config.services.homer.virtualHost.domain}".listen = [ ... ] + ``` + or + ```nix + services.nginx.virtualHosts."example.com".listen = [ ... ] + ``` + ''; + type = lib.types.str; + }; + }; + + package = lib.mkPackageOption pkgs "homer" { }; + + settings = lib.mkOption { + default = { }; + description = '' + Settings serialized into `config.yml` before build. + If left empty, the default configuration shipped with the package will be used instead. + For more information, see the [official documentation](https://github.com/bastienwirtz/homer/blob/main/docs/configuration.md). + + Note that the full configuration will be written to the nix store as world readable, which may include secrets such as [api-keys](https://github.com/bastienwirtz/homer/blob/main/docs/customservices.md). + + To add files such as icons or backgrounds, you can reference them in line such as + ```nix + icon = "$\{./icon.png}"; + ``` + This will add the file to the nix store upon build, referencing it by file path as expected by Homer. + ''; + example = '' + { + title = "App dashboard"; + subtitle = "Homer"; + logo = "assets/logo.png"; + header = true; + footer = ${"''"} +

Created with ❀️ with + bulma, + vuejs & + font awesome // + Fork me on +

+ ${"''"}; + columns = "3"; + connectivityCheck = true; + + proxy = { + useCredentials = false; + headers = { + Test = "Example"; + Test1 = "Example1"; + }; + }; + + defaults = { + layout = "columns"; + colorTheme = "auto"; + }; + + theme = "default"; + + message = { + style = "is-warning"; + title = "Optional message!"; + icon = "fa fa-exclamation-triangle"; + content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit."; + }; + + links = [ + { + name = "Link 1"; + icon = "fab fa-github"; + url = "https://github.com/bastienwirtz/homer"; + target = "_blank"; + } + { + name = "link 2"; + icon = "fas fa-book"; + url = "https://github.com/bastienwirtz/homer"; + } + ]; + + services = [ + { + name = "Application"; + icon = "fas fa-code-branch"; + items = [ + { + name = "Awesome app"; + logo = "assets/tools/sample.png"; + subtitle = "Bookmark example"; + tag = "app"; + keywords = "self hosted reddit"; + url = "https://www.reddit.com/r/selfhosted/"; + target = "_blank"; + } + { + name = "Another one"; + logo = "assets/tools/sample2.png"; + subtitle = "Another application"; + tag = "app"; + tagstyle = "is-success"; + url = "#"; + } + ]; + } + { + name = "Other group"; + icon = "fas fa-heartbeat"; + items = [ + { + name = "Pi-hole"; + logo = "assets/tools/sample.png"; + tag = "other"; + url = "http://192.168.0.151/admin"; + type = "PiHole"; + target = "_blank"; + } + ]; + } + ]; + } + + ''; + inherit (pkgs.formats.yaml { }) type; + }; + }; + + config = lib.mkIf cfg.enable { + services.nginx = lib.mkIf cfg.virtualHost.nginx.enable { + enable = true; + virtualHosts."${cfg.virtualHost.domain}" = { + locations."/" = { + root = cfg.package; + tryFiles = "$uri /index.html"; + }; + locations."= /assets/config.yml" = { + alias = configFile; + }; + }; + }; + services.caddy = lib.mkIf cfg.virtualHost.caddy.enable { + enable = true; + virtualHosts."${cfg.virtualHost.domain}".extraConfig = '' + root * ${cfg.package} + file_server + handle_path /assets/config.yml { + root * ${configFile} + file_server + } + ''; + }; + }; + + meta.maintainers = [ + lib.maintainers.stunkymonkey + ]; +} diff --git a/nixos/modules/services/web-apps/writefreely.nix b/nixos/modules/services/web-apps/writefreely.nix index 4bb5d8a579fd..3a9cf0afd58b 100644 --- a/nixos/modules/services/web-apps/writefreely.nix +++ b/nixos/modules/services/web-apps/writefreely.nix @@ -65,7 +65,7 @@ let inherit (cfg.package) version src; - nativeBuildInputs = with pkgs.nodePackages; [ less ]; + nativeBuildInputs = with pkgs; [ lessc ]; buildPhase = '' mkdir -p $out diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4dfc0e1e7831..7c96224b7d24 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -436,6 +436,7 @@ in { hedgedoc = handleTest ./hedgedoc.nix {}; herbstluftwm = handleTest ./herbstluftwm.nix {}; homebox = handleTest ./homebox.nix {}; + homer = handleTest ./homer {}; homepage-dashboard = handleTest ./homepage-dashboard.nix {}; honk = runTest ./honk.nix; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); diff --git a/nixos/tests/homer/caddy.nix b/nixos/tests/homer/caddy.nix new file mode 100644 index 000000000000..18a37cbc20ca --- /dev/null +++ b/nixos/tests/homer/caddy.nix @@ -0,0 +1,30 @@ +import ../make-test-python.nix ( + { lib, ... }: + + { + name = "homer-caddy"; + meta.maintainers = with lib.maintainers; [ stunkymonkey ]; + + nodes.machine = + { pkgs, ... }: + { + services.homer = { + enable = true; + virtualHost = { + caddy.enable = true; + domain = "localhost:80"; + }; + settings = { + title = "testing"; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("caddy.service") + machine.wait_for_open_port(80) + machine.succeed("curl --fail --show-error --silent http://localhost:80/ | grep 'Homer'") + machine.succeed("curl --fail --show-error --silent http://localhost:80/assets/config.yml | grep 'title: testing'") + ''; + } +) diff --git a/nixos/tests/homer/default.nix b/nixos/tests/homer/default.nix new file mode 100644 index 000000000000..fee30e520c7f --- /dev/null +++ b/nixos/tests/homer/default.nix @@ -0,0 +1,6 @@ +{ system, pkgs, ... }: + +{ + caddy = import ./caddy.nix { inherit system pkgs; }; + nginx = import ./nginx.nix { inherit system pkgs; }; +} diff --git a/nixos/tests/homer/nginx.nix b/nixos/tests/homer/nginx.nix new file mode 100644 index 000000000000..39dd0c2c52ac --- /dev/null +++ b/nixos/tests/homer/nginx.nix @@ -0,0 +1,30 @@ +import ../make-test-python.nix ( + { lib, ... }: + + { + name = "homer-nginx"; + meta.maintainers = with lib.maintainers; [ stunkymonkey ]; + + nodes.machine = + { pkgs, ... }: + { + services.homer = { + enable = true; + virtualHost = { + nginx.enable = true; + domain = "localhost"; + }; + settings = { + title = "testing"; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + machine.succeed("curl --fail --show-error --silent http://localhost:80/ | grep 'Homer'") + machine.succeed("curl --fail --show-error --silent http://localhost:80/assets/config.yml | grep 'title: testing'") + ''; + } +) diff --git a/nixos/tests/open-webui.nix b/nixos/tests/open-webui.nix index 27f913dbffd5..91cd52843c11 100644 --- a/nixos/tests/open-webui.nix +++ b/nixos/tests/open-webui.nix @@ -15,6 +15,7 @@ in { services.open-webui = { enable = true; + host = ""; environment = { # Requires network connection RAG_EMBEDDING_MODEL = ""; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index dd3820116c42..1b06e1596c5a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -27,6 +27,8 @@ lib.packagesFromDirectoryRecursive { ; }; + lua = callPackage ./manual-packages/lua { inherit (pkgs) lua; }; + straight = callPackage ./manual-packages/straight { inherit (pkgs) git; }; structured-haskell-mode = self.shm; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lua/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lua/default.nix new file mode 100644 index 000000000000..31b1613e722e --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lua/default.nix @@ -0,0 +1,39 @@ +{ + lib, + lua, + melpaBuild, + pkg-config, + fetchFromGitHub, + unstableGitUpdater, +}: + +melpaBuild { + pname = "lua"; + version = "0-unstable-2025-01-27"; + + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-lua"; + rev = "501189b5fc069fcead8843b2b0ad510c08de1397"; + hash = "sha256-psCrto12p03R9XxPtDYTMB5vcRVWj+Blq7D30nLsSbU="; + }; + + preBuild = '' + make LUA_VERSION=${lua.luaversion} CC=$CC LD=$CC + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ lua ]; + + files = ''(:defaults "lua-core.so")''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + homepage = "https://github.com/syohex/emacs-lua"; + description = "Lua engine from Emacs Lisp"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ nagy ]; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 63f0266f395f..164c0e8fb7bc 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11223,6 +11223,18 @@ final: prev: meta.homepage = "https://github.com/amitds1997/remote-nvim.nvim/"; }; + remote-sshfs-nvim = buildVimPlugin { + pname = "remote-sshfs.nvim"; + version = "2024-08-29"; + src = fetchFromGitHub { + owner = "nosduco"; + repo = "remote-sshfs.nvim"; + rev = "03f6c40c4032eeb1ab91368e06db9c3f3a97a75d"; + sha256 = "1pl08cpgx27mhmbjxlqld4n2728hxs0hvwyjjy982k315hhhhldw"; + }; + meta.homepage = "https://github.com/nosduco/remote-sshfs.nvim/"; + }; + renamer-nvim = buildVimPlugin { pname = "renamer.nvim"; version = "2022-08-29"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0f223263cdd7..bd9f3940bf2a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -44,12 +44,14 @@ nodejs, notmuch, openscad, + openssh, parinfer-rust, phpactor, ranger, ripgrep, skim, sqlite, + sshfs, statix, stylish-haskell, tabnine, @@ -2796,6 +2798,17 @@ in nvimSkipModule = "repro"; }; + remote-sshfs-nvim = super.remote-sshfs-nvim.overrideAttrs { + dependencies = with self; [ + telescope-nvim + plenary-nvim + ]; + runtimeDeps = [ + openssh + sshfs + ]; + }; + renamer-nvim = super.renamer-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4f63eb7fae3e..1884a1007ff5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -929,6 +929,7 @@ https://github.com/theprimeagen/refactoring.nvim/,, https://github.com/tversteeg/registers.nvim/,, https://github.com/vladdoster/remember.nvim/,, https://github.com/amitds1997/remote-nvim.nvim/,HEAD, +https://github.com/nosduco/remote-sshfs.nvim/,HEAD, https://github.com/filipdutescu/renamer.nvim/,, https://github.com/MeanderingProgrammer/render-markdown.nvim/,, https://github.com/gabrielpoca/replacer.nvim/,HEAD, diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 631ee1843d2c..beb7a046b7bd 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... }: callPackage ./generic.nix { - version = "5.2.6"; + version = "5.2.9"; kde-channel = "stable"; - hash = "sha256-SNcShVT99LTpLFSuMbUq95IfR6jabOyqBnRKu/yC1fs="; + hash = "sha256-CMmvVW3r8mkxvWUGeS45G0t6MzSlog9RazJJBDNKy6Y="; } diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index ab967d94a5cb..04a8802a9114 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , pkg-config @@ -31,24 +30,16 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2024.11.27-12"; + version = "2025.01.26-9"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-lBEDPqxdnaajMHlf7G/d1TYYL9yPZo8AGekoKmF1ObM="; + hash = "sha256-pzZmaOBo4aYywprxrJa3Rk9Uu3w+Q6XdVdcPmV0cSUs="; fetchSubmodules = true; }; - patches = [ - # Fix for https://github.com/organicmaps/organicmaps/issues/7838 - (fetchpatch { - url = "https://github.com/organicmaps/organicmaps/commit/1caf64e315c988cd8d5196c80be96efec6c74ccc.patch"; - hash = "sha256-k3VVRgHCFDhviHxduQMVRUUvQDgMwFHIiDZKa4BNTyk="; - }) - ]; - postPatch = '' # Disable certificate check. It's dependent on time echo "exit 0" > tools/unix/check_cert.sh diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 81c3d4acca1e..7639d289014e 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -11,6 +11,7 @@ , pkg-config , curl , libavif +, libGL , libjxl , libpulseaudio , libwebp @@ -48,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-12-30"; + version = "0-unstable-2025-01-28"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "4324439006a6df1179440ce4f415b67658919957"; - hash = "sha256-vg2Nb85+fegs7Idika9Mbq+f27wrIO48pWQSUidLKwE="; + rev = "eca68aad8846f20f64167cf53dc1f432abe1590e"; + hash = "sha256-8vENHJ6BdMAEhlt54IU9+i4iVPnGp0R42v6zykGrrg4="; }; postPatch = '' @@ -108,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg fontconfig libavif + libGL libjxl libwebp libxcrypt @@ -141,6 +143,11 @@ stdenv.mkDerivation (finalAttrs: { # FIXME: Add an option to -DENABLE_QT=ON on macOS to use Qt rather than Cocoa for the GUI + # ld: [...]/OESVertexArrayObject.cpp.o: undefined reference to symbol 'glIsVertexArrayOES' + # ld: [...]/libGL.so.1: error adding symbols: DSO missing from command line + # https://github.com/LadybirdBrowser/ladybird/issues/371#issuecomment-2616415434 + env.NIX_LDFLAGS = "-lGL"; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications $out/bin mv $out/bundle/Ladybird.app $out/Applications diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 347c15a2e25b..ab8de1ab715f 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.170.0"; + version = "0.170.1"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-HlSpY7+Qct2vxtAejrwmmWhnWq+jVycjuxQ42KScpSs="; + hash = "sha256-qu/0l+4fZUk7H5sCZopmCNxja5hI5WwfXga90Yeuy7o="; }; - vendorHash = "sha256-BmEtzUUORY/ck158+1ItVeiG9mzXdikjjUX7XwQ7xoo="; + vendorHash = "sha256-vAv/VlAvkPRWrOHDNkt4VdXXjqi65RVjYtvqSJjb8ds="; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 45c972d4f87e..ede0aff09ae3 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { "out" "dev" ]; - version = "15.54.3"; + version = "15.61.3"; src = let @@ -39,11 +39,11 @@ mkDerivation rec { { x86_64-linux = fetchurl { url = "${base_url}/teamviewer_${version}_amd64.deb"; - hash = "sha256-41zVX2svomcRKu2ow1A/EeKojBIpABO4o2EZxappzgo="; + hash = "sha256-o7Em+QRW4TebRTJS5xjcx1M6KPh1ziB1j0fvlO+RYa4="; }; aarch64-linux = fetchurl { url = "${base_url}/teamviewer_${version}_arm64.deb"; - hash = "sha256-wuQYWeYgXW54/5dpiGzJxZ9JZDlUgFgCKq8Z4xV2HlI="; + hash = "sha256-LDByF4u9xZV1MYApBrnlNrUPndbDrQt6DKX+r8Kmq6k="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -152,6 +152,8 @@ mkDerivation rec { dontWrapQtApps = true; preferLocalBuild = true; + passthru.updateScript = ./update-teamviewer.sh; + meta = with lib; { homepage = "https://www.teamviewer.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; @@ -162,6 +164,7 @@ mkDerivation rec { jagajaga jraygauthier gador + c4thebomb ]; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh b/pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh new file mode 100755 index 000000000000..e8d2f681851a --- /dev/null +++ b/pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh @@ -0,0 +1,7 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nix-update curl + +TEAMVIEWER_VER=$(curl -s https://www.teamviewer.com/en-us/download/linux/ | grep -oP 'Current version: \K[0-9]+\.[0-9]+\.[0-9]+') + +nix-update --version "$TEAMVIEWER_VER" --system x86_64-linux teamviewer +nix-update --version "skip" --system aarch64-linux teamviewer diff --git a/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix b/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix index 4eb15356d236..96ad51a136b3 100644 --- a/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "visualization-fishbmc"; namespace = "visualization.fishbmc"; - version = "21.0.1"; + version = "21.0.2"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-JAiWkW9iaOq+Q2tArxJ+S7sXQM2K010uT09j30rTY0I="; + hash = "sha256-4cU5g50ZRnkKSfT/V2hHw1l0PTFkvV4hrxAgPDpfCiw="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/visualization-goom/default.nix b/pkgs/applications/video/kodi/addons/visualization-goom/default.nix index 9bf4477fe2d3..bfc80fbf2b38 100644 --- a/pkgs/applications/video/kodi/addons/visualization-goom/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-goom/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "visualization-goom"; namespace = "visualization.goom"; - version = "21.0.1"; + version = "21.0.2"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-Cu0XRv2iU35bakbS5JkjSYAW5Enra1gt1I0sebcapx4="; + hash = "sha256-TGSYSrQLFrjbp+UMQ14f5sb8thePFZaSH7x/ckLIoqw="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix b/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix index 7fe93c76e200..f91cab16bf06 100644 --- a/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "visualization-pictureit"; namespace = "visualization.pictureit"; - version = "21.0.1"; + version = "21.0.2"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-0soMNqff/aVANDFORL3mqUUpi2BWmauUtE4EBr3QwlI="; + hash = "sha256-jFRv/fYR/98jcP9GCRVYu2EQIdWQItzYrEoXW/RF+bA="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix index e1464f9a445a..6b8416a45d6d 100644 --- a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "visualization-waveform"; namespace = "visualization.waveform"; - version = "21.0.1"; + version = "21.0.2"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-ocLiDt9Fvwb/KvCsULyWRCNK0vOGMh/r88PRn1WYyXs="; + hash = "sha256-RiFPR0nlyrnHzHBosvU+obbdtHXjdgMtxscQTcQ7kLw="; }; extraBuildInputs = [ diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index c25dcc390f91..9445416c7fea 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeWrapper , copyDesktopItems -, electron +, electron_33 , nodejs , pnpm_9 , makeDesktopItem @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - cp -r ${electron.dist} electron-dist + cp -r ${electron_33.dist} electron-dist chmod -R u+w electron-dist pnpm build @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { --dir \ --config .electron-builder.config.cjs \ -c.electronDist=electron-dist \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron_33.version} runHook postBuild ''; @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg" - makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \ + makeWrapper '${electron_33}/bin/electron' "$out/bin/podman-desktop" \ --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ booxter panda2134 ]; - inherit (electron.meta) platforms; + inherit (electron_33.meta) platforms; mainProgram = "podman-desktop"; }; }) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix index d478a2e29a13..b9262fd6d216 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix @@ -8,13 +8,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; rev = "refs/tags/hl${version}"; - hash = "sha256-etPkIYs38eDgJOpsFfgljlGIy0FPRXgU3DRWuib1wWc="; + hash = "sha256-DicW4xltTHVk1L34xtEJwrKb9nSBWJ+zLVrh28Fr6Fg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index 865b4a94526b..71a817827730 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -7,7 +7,6 @@ kdePackages, qt6, libsecret, - xdg-utils, amneziawg-go, openvpn, shadowsocks-rust, @@ -20,6 +19,7 @@ zlib, tun2socks, xray, + nix-update-script, }: let amnezia-tun2socks = tun2socks.overrideAttrs ( @@ -35,13 +35,6 @@ let }; vendorHash = "sha256-VvOaTJ6dBFlbGZGxnHy2sCtds1tyhu6VsPewYpsDBiM="; - - ldflags = [ - "-w" - "-s" - "-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.Version=v${finalAttrs.version}" - "-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.GitCommit=v${finalAttrs.version}" - ]; } ); @@ -63,18 +56,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.2.3"; + version = "4.8.3.1"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-bCWPyRW2xnnopcwfPHgQrdP85Ct0CDufJRQ1PvCAiDE="; + hash = "sha256-U/fVO9GcSdxFg5r57vX5Ylgu6CMjG4GKyInIgBNUiEw="; fetchSubmodules = true; }; - patches = [ ./router.patch ]; - postPatch = '' substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \ @@ -82,8 +73,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace client/utilities.cpp \ --replace-fail 'return Utils::executable("../../client/bin/openvpn", true);' 'return Utils::executable("${openvpn}/bin/openvpn", false);' \ --replace-fail 'return Utils::executable("../../client/bin/tun2socks", true);' 'return Utils::executable("${amnezia-tun2socks}/bin/amnezia-tun2socks", false);' \ - --replace-fail 'return Utils::usrExecutable("wg-quick");' 'return Utils::executable("${wireguard-tools}/bin/wg-quick", false);' \ - --replace-fail 'QProcess::execute(QString("pkill %1").arg(name));' 'return QProcess::execute(QString("pkill -f %1").arg(name)) == 0;' + --replace-fail 'return Utils::usrExecutable("wg-quick");' 'return Utils::executable("${wireguard-tools}/bin/wg-quick", false);' substituteInPlace client/protocols/xrayprotocol.cpp \ --replace-fail 'return Utils::executable(QString("xray"), true);' 'return Utils::executable(QString("${amnezia-xray}/bin/xray"), false);' substituteInPlace client/protocols/openvpnovercloakprotocol.cpp \ @@ -91,11 +81,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace client/protocols/shadowsocksvpnprotocol.cpp \ --replace-fail 'return Utils::executable(QString("/ss-local"), true);' 'return Utils::executable(QString("${shadowsocks-rust}/bin/sslocal"), false);' substituteInPlace client/configurators/openvpn_configurator.cpp \ - --replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/local/bin\");" + --replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/libexec\");" substituteInPlace client/ui/qautostart.cpp \ --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \ - --replace-fail "#!/usr/bin/env xdg-open" "#!${xdg-utils}/bin/xdg-open" \ --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" substituteInPlace deploy/data/linux/AmneziaVPN.service \ --replace-fail "ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh" "ExecStart=$out/bin/AmneziaVPN-service" \ @@ -137,14 +126,26 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - mkdir -p $out/bin $out/local/bin $out/share/applications $out/share/pixmaps $out/lib/systemd/system + mkdir -p $out/bin $out/libexec $out/share/applications $out/share/pixmaps $out/lib/systemd/system cp client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/ - cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/local/bin/ + cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/libexec/ cp ../AppDir/AmneziaVPN.desktop $out/share/applications/ cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/ cp ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/ ''; + passthru = { + inherit amnezia-tun2socks amnezia-xray; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "amnezia-tun2socks" + "--subpackage" + "amnezia-xray" + ]; + }; + }; + meta = with lib; { description = "Amnezia VPN Client"; downloadPage = "https://amnezia.org/en/downloads"; diff --git a/pkgs/by-name/am/amnezia-vpn/router.patch b/pkgs/by-name/am/amnezia-vpn/router.patch deleted file mode 100644 index 3f78af405af2..000000000000 --- a/pkgs/by-name/am/amnezia-vpn/router.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/service/server/router_linux.cpp 2025-01-01 11:36:27.615658613 +0300 -+++ b/service/server/router_linux.cpp 2025-01-01 18:07:57.300178080 +0300 -@@ -19,9 +19,27 @@ - #include - #include - #include -+#include -+#include - - #include - -+bool isServiceActive(const QString &serviceName) { -+ QProcess process; -+ process.start("systemctl", { "list-units", "--type=service", "--state=running", "--no-legend" }); -+ process.waitForFinished(); -+ -+ QString output = process.readAllStandardOutput(); -+ QStringList services = output.split('\n', Qt::SkipEmptyParts); -+ -+ for (const QString &service : services) { -+ if (service.contains(serviceName)) { -+ return true; -+ } -+ } -+ return false; -+} -+ - RouterLinux &RouterLinux::Instance() - { - static RouterLinux s; -@@ -158,15 +176,14 @@ - p.setProcessChannelMode(QProcess::MergedChannels); - - //check what the dns manager use -- if (QFileInfo::exists("/usr/bin/nscd") -- || QFileInfo::exists("/usr/sbin/nscd") -- || QFileInfo::exists("/usr/lib/systemd/system/nscd.service")) -- { -- p.start("systemctl restart nscd"); -- } -- else -- { -- p.start("systemctl restart systemd-resolved"); -+ if (isServiceActive("nscd.service")) { -+ qDebug() << "Restarting nscd.service"; -+ p.start("systemctl", { "restart", "nscd" }); -+ } else if (isServiceActive("systemd-resolved.service")) { -+ qDebug() << "Restarting systemd-resolved.service"; -+ p.start("systemctl", { "restart", "systemd-resolved" }); -+ } else { -+ qDebug() << "No suitable DNS manager found."; - } - - p.waitForFinished(); diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix new file mode 100644 index 000000000000..a6d8836eed35 --- /dev/null +++ b/pkgs/by-name/au/autotier/package.nix @@ -0,0 +1,88 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + pkg-config, + rocksdb, + boost, + fuse3, + lib45d, + tbb_2021_11, + liburing, + installShellFiles, +}: +stdenv.mkDerivation (finalAttrs: { + name = "autotier"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "45Drives"; + repo = "autotier"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Pf1baDJsyt0ScASWrrgMu8+X5eZPGJSu0/LDQNHe1Ok="; + }; + + patches = [ + # https://github.com/45Drives/autotier/pull/70 + # fix "error: 'uintmax_t' has not been declared" build failure until next release + (fetchpatch { + url = "https://github.com/45Drives/autotier/commit/d447929dc4262f607d87cbc8ad40a54d64f5011a.patch"; + hash = "sha256-0ab8YBgdJMxBHfOgUsgPpyUE1GyhAU3+WCYjYA2pjqo="; + }) + # Unvendor rocksdb (nixpkgs already applies RTTI and PORTABLE flags) and use pkg-config for flags + (fetchpatch { + url = "https://github.com/45Drives/autotier/commit/fa282f5079ff17c144a7303d64dad0e44681b87f.patch"; + hash = "sha256-+W3RwSe8zJKgZIXOaawHuI6xRzedYIcZundPC8eHuwM="; + }) + # Add missing list import to src/incl/config.hpp + (fetchpatch { + url = "https://github.com/45Drives/autotier/commit/1f97703f4dfbfe093f5c18c4ee01dcc1c8fe04f3.patch"; + hash = "sha256-3+KOh7JvbujCMbMqnZ5SGopAuOKHitKq6XV6a/jkcog="; + }) + ]; + + buildInputs = [ + rocksdb + boost + fuse3 + lib45d + tbb_2021_11 + liburing + ]; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + installPhase = '' + runHook preInstall + + # binaries + installBin dist/from_source/* + + # docs + installManPage doc/man/autotier.8 + + # Completions + installShellCompletion --bash doc/completion/autotier.bash-completion + installShellCompletion --bash doc/completion/autotierfs.bash-completion + + # Scripts + installBin script/autotier-init-dirs + + # Default config + install -Dm755 -t $out/etc/autotier.conf doc/autotier.conf.template + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/45Drives/autotier"; + description = "Passthrough FUSE filesystem that intelligently moves files between storage tiers based on frequency of use, file age, and tier fullness"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ philipwilk ]; + mainProgram = "autotier"; # cli, for file system use autotierfs + platforms = lib.platforms.linux; # uses io_uring so only available on linux not unix + }; +}) diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch b/pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch new file mode 100644 index 000000000000..78dfcfe06458 --- /dev/null +++ b/pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch @@ -0,0 +1,29 @@ +From 316457cf70dd105905d5d4925f43de280f08ab10 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Sat, 11 Jan 2025 20:55:29 +0100 +Subject: [PATCH] tests/CMakeLists.txt: Drop hardcoded -no-pie linker flags + +--- + tests/CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 63beacb..5b0812c 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -32,7 +32,6 @@ add_dependencies("indicator-messages-service" "ayatana-indicator-messages-servic + # test-gactionmuxer + + add_executable("test-gactionmuxer" test-gactionmuxer.cpp) +-target_link_options("test-gactionmuxer" PRIVATE -no-pie) + target_include_directories("test-gactionmuxer" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/src") + target_link_libraries("test-gactionmuxer" "indicator-messages-service" ${PROJECT_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES}) + add_test("test-gactionmuxer" "test-gactionmuxer") +@@ -59,7 +58,6 @@ add_custom_target("gschemas-compiled" ALL DEPENDS gschemas.compiled) + + pkg_check_modules(DBUSTEST REQUIRED dbustest-1) + add_executable("indicator-test" indicator-test.cpp) +-target_link_options("indicator-test" PRIVATE -no-pie) + target_include_directories("indicator-test" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS} ${DBUSTEST_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/libmessaging-menu") + target_link_libraries("indicator-test" "messaging-menu" ${PROJECT_DEPS_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES}) + target_compile_definitions( diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix index 054390390166..d217e3c199bd 100644 --- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: { "dev" ] ++ lib.optionals withDocumentation [ "devdoc" ]; + patches = [ + # Remove when https://github.com/AyatanaIndicators/ayatana-indicator-messages/pull/39 merged & in release + ./fix-pie.patch + ]; + postPatch = '' # Uses pkg_get_variable, cannot substitute prefix with that diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index dd75cddd3f4f..5581bad62b2a 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.23"; + version = "0.37.24"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-yYZasrnfxpLf0z6GndLYhkIFfVNjTkx4zdfHYX6WyXk="; + hash = "sha256-hrUd4J15cDyd78BVVzi8jiDqJI1dE35WUdOo6Tq8gH8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-DtNSP/S41wj4lfd8yE3t8dJOf0yX+ifuj+L6pB53yR8="; + cargoHash = "sha256-ml/OW4S4fIMLmm7vVPgsXB7CigDYORGFpN3jZRp1f8c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/dh/dhcpm/package.nix b/pkgs/by-name/dh/dhcpm/package.nix new file mode 100644 index 000000000000..d95eda1f899e --- /dev/null +++ b/pkgs/by-name/dh/dhcpm/package.nix @@ -0,0 +1,31 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "dhcpm"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "leshow"; + repo = "dhcpm"; + tag = "v${version}"; + hash = "sha256-vjKN9arR6Os3pgG89qmHt/0Ds5ToO38tLsQBay6VEIk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-L6+/buzhYoLdFh7x8EmT37JyY5Pr7oFzyOGbhvgNvlw="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Dhcpm is a CLI tool for constructing & sending DHCP messages"; + homepage = "https://github.com/leshow/dhcpm"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jmbaur ]; + mainProgram = "dhcpm"; + }; +} diff --git a/pkgs/by-name/gd/gdm-settings/package.nix b/pkgs/by-name/gd/gdm-settings/package.nix index 2fab3fa7429f..8dfd34988f3b 100644 --- a/pkgs/by-name/gd/gdm-settings/package.nix +++ b/pkgs/by-name/gd/gdm-settings/package.nix @@ -1,16 +1,16 @@ { lib, - fetchFromGitHub, - python3Packages, appstream, blueprint-compiler, desktop-file-utils, - glib, + fetchFromGitHub, gdm, + glib, libadwaita, meson, ninja, pkg-config, + python3Packages, wrapGAppsHook4, # gdm-settings needs to know where to look for themes # This should work for most systems, but can be overridden if not @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication rec { pname = "gdm-settings"; - version = "4.4"; + version = "5.0"; pyproject = false; src = fetchFromGitHub { owner = "gdm-settings"; repo = "gdm-settings"; tag = "v${version}"; - hash = "sha256-3Te8bhv2TkpJFz4llm1itRhzg9v64M7Drtrm4s9EyiQ="; + hash = "sha256-x7w6m0+uwkm95onR+ioQAoLlaPoUmLc0+NgawQIIa/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/go-blueprint/package.nix b/pkgs/by-name/go/go-blueprint/package.nix index f4df089c084a..87019c44fe02 100644 --- a/pkgs/by-name/go/go-blueprint/package.nix +++ b/pkgs/by-name/go/go-blueprint/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "go-blueprint"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "Melkeydev"; repo = "go-blueprint"; rev = "v${version}"; - hash = "sha256-/MIMDQKdpgY0bCwrYpJNC6jiEhNECROe61uuoFz8P68="; + hash = "sha256-8J+PxFHrNkX2McBn1tO7Q1X4tWtMWDIRsxzKtRhM/Jk="; }; ldflags = [ diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix index 7738bcda8d90..f23086ee7a7c 100644 --- a/pkgs/by-name/go/gocryptfs/package.nix +++ b/pkgs/by-name/go/gocryptfs/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+JMit0loxT5KOupqL5bkO3pcAfuiN8YAw0ueUh9mUJI="; + sha256 = "sha256-yTZD4Q/krl6pW6EdtU+sdCWOOo9LHJqHCuNubAoEIyo="; }; - vendorHash = "sha256-9qYmErARMIxnbECANO66m6fPwoR8YQlJzP/VcK9tfP4="; + vendorHash = "sha256-bzhwYiTqI3MV0KxDT5j9TVnWJxM0BuLgEC8/r+2aQjI="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix index 6acf9a013661..914b15c19ded 100644 --- a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix +++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphene-hardened-malloc"; - version = "2024123000"; + version = "2025012700"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; rev = finalAttrs.version; - hash = "sha256-zsP/ym/MXomqq+t/ckiAzHVR4AuFg+mEwXlICbBbODA="; + hash = "sha256-Xi34Dv+qGBrmmyYQ69KnyI+WQNJMRPlZQnSv3ey72zI="; }; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix index 50fe5bf1fc59..7d104aa46ff0 100644 --- a/pkgs/by-name/ho/homer/package.nix +++ b/pkgs/by-name/ho/homer/package.nix @@ -6,6 +6,7 @@ nodejs, dart-sass, nix-update-script, + nixosTests, }: stdenvNoCC.mkDerivation rec { pname = "homer"; @@ -54,7 +55,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests.homer) caddy nginx; + }; + }; meta = with lib; { description = "A very simple static homepage for your server."; diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix index 4cc603dfc42f..84c80d6caa50 100644 --- a/pkgs/by-name/in/inv-sig-helper/package.nix +++ b/pkgs/by-name/in/inv-sig-helper/package.nix @@ -10,18 +10,19 @@ openssl, # passthru + nixosTests, unstableGitUpdater, }: rustPlatform.buildRustPackage { pname = "inv-sig-helper"; - version = "0-unstable-2024-12-17"; + version = "0-unstable-2025-01-31"; src = fetchFromGitHub { owner = "iv-org"; repo = "inv_sig_helper"; - rev = "74e879b54e46831e31c09fd08fe672ca58e9cb2d"; - hash = "sha256-Q+u09WWBwWLcLLW9XwkaYDxM3xoQmeJzi37mrdDGvRc="; + rev = "40835906774cc7cdefa76b2648216afd063ad0e2"; + hash = "sha256-yjVN81VSXPOXSOhhlF6Jjc/7sYsdoWT+Tr1BA+C2XQI="; }; useFetchCargoVendor = true; @@ -35,7 +36,12 @@ rustPlatform.buildRustPackage { openssl ]; - passthru.updateScript = unstableGitUpdater { }; + passthru = { + tests = { + inherit (nixosTests) invidious; + }; + updateScript = unstableGitUpdater { }; + }; meta = { description = "Rust service that decrypts YouTube signatures and manages player information"; diff --git a/pkgs/by-name/ja/ja2-stracciatella/dont-use-vendored-sdl2.patch b/pkgs/by-name/ja/ja2-stracciatella/dont-use-vendored-sdl2.patch new file mode 100644 index 000000000000..ca95503404d4 --- /dev/null +++ b/pkgs/by-name/ja/ja2-stracciatella/dont-use-vendored-sdl2.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4e5547af..a3017d197 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -428,12 +425,6 @@ if (MINGW) + install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install-dlls-mingw.cmake") + endif() + +-if(APPLE) +- file(GLOB APPLE_DIST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/distr-files-mac/*.txt") +- install(FILES ${APPLE_DIST_FILES} DESTINATION .) +- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-SDL2-2.0.20-macos/SDL2.framework DESTINATION .) +-endif() +- + ## Build AppImage + + add_custom_target(package-appimage diff --git a/pkgs/by-name/ja/ja2-stracciatella/package.nix b/pkgs/by-name/ja/ja2-stracciatella/package.nix new file mode 100644 index 000000000000..3fb6f4dea863 --- /dev/null +++ b/pkgs/by-name/ja/ja2-stracciatella/package.nix @@ -0,0 +1,109 @@ +{ + stdenv, + lib, + fetchurl, + fetchFromGitHub, + cmake, + python3, + rustPlatform, + cargo, + rustc, + SDL2, + fltk, + lua5_3, + miniaudio, + rapidjson, + sol2, + gtest, +}: + +let + stringTheory = fetchurl { + url = "https://github.com/zrax/string_theory/archive/3.8.tar.gz"; + hash = "sha256-mq7pW3qRZs03/SijzbTl1txJHCSW/TO+gvRLWZh/11M="; + }; + + magicEnum = fetchurl { + url = "https://github.com/Neargye/magic_enum/archive/v0.8.2.zip"; + hash = "sha256-oQ+mUDB8YJULcSploz+0bprJbqclhc+p/Pmsn1AsAes="; + }; +in +stdenv.mkDerivation rec { + pname = "ja2-stracciatella"; + version = "0.21.0"; + + src = fetchFromGitHub { + owner = "ja2-stracciatella"; + repo = "ja2-stracciatella"; + tag = "v${version}"; + hash = "sha256-zMCFDMSKcsYz5LjW8UJbBlSmuJX6ibr9zIS3BgZMgAg="; + }; + + patches = [ + # Note: this patch is only relevant for darwin + ./dont-use-vendored-sdl2.patch + ]; + + postPatch = '' + # Patch dependencies that are usually loaded by url + substituteInPlace dependencies/lib-string_theory/builder/CMakeLists.txt.in \ + --replace-fail ${stringTheory.url} file://${stringTheory} + substituteInPlace dependencies/lib-magic_enum/getter/CMakeLists.txt.in \ + --replace-fail ${magicEnum.url} file://${magicEnum} + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + python3 + rustPlatform.cargoSetupHook + cargo + rustc + ]; + + buildInputs = [ + SDL2 + fltk + lua5_3 + rapidjson + sol2 + gtest + ]; + + cargoRoot = "rust"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit + pname + version + src + cargoRoot + ; + hash = "sha256-5KZa5ocn6Q4qUeRmm7Tymgg09dr6aZoAuJvtF32CXNg="; + }; + + cmakeFlags = [ + (lib.cmakeBool "FLTK_SKIP_FLUID" true) # otherwise `find_package(FLTK)` fails + (lib.cmakeBool "LOCAL_LUA_LIB" false) + (lib.cmakeBool "LOCAL_MINIAUDIO_LIB" false) + (lib.cmakeFeature "MINIAUDIO_INCLUDE_DIR" "${miniaudio}") + (lib.cmakeBool "LOCAL_RAPIDJSON_LIB" false) + (lib.cmakeBool "LOCAL_SOL_LIB" false) + (lib.cmakeBool "LOCAL_GTEST_LIB" false) + (lib.cmakeFeature "EXTRA_DATA_DIR" "${placeholder "out"}/share/ja2") + ]; + + doInstallCheck = true; + + installCheckPhase = '' + HOME=$(mktemp -d) $out/bin/ja2 -unittests + ''; + + meta = { + description = "Jagged Alliance 2, with community fixes"; + license = "SFI Source Code license agreement"; + homepage = "https://ja2-stracciatella.github.io/"; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix index bfd2836a1663..37195361098d 100644 --- a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix +++ b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix @@ -10,7 +10,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "katawa-shoujo-re-engineered"; - version = "1.4.9"; + version = "2.0.0"; src = fetchFromGitea { # GitHub mirror at fleetingheart/ksre @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "fhs"; repo = "katawa-shoujo-re-engineered"; rev = "v${finalAttrs.version}"; - hash = "sha256-JrR1om7bvigVJbJKrKhfigpLvEGWTKzH8BNeNIYJrvA="; + hash = "sha256-JvwMbwbPWH3iLc03qCWknrK2kSC7D92rcdDpVpbaruM="; }; desktopItems = [ diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index 266ba0f87a9e..f038f7d3b079 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -5,14 +5,14 @@ nixosTests, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "kimai"; version = "2.28.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-z8NyPpaG6wNxQ7SSEdtVM/gFTOzxjclhE/Y++M4wN5I="; }; @@ -26,7 +26,6 @@ php.buildComposerProject (finalAttrs: { mbstring pdo tokenizer - xml xsl zip ]) @@ -39,7 +38,7 @@ php.buildComposerProject (finalAttrs: { ''; }; - vendorHash = "sha256-xa0vdlCxKe5QPsqVZ61HcUcxnYYbb7w+Qn3PBEmUkH0="; + vendorHash = "sha256-E0l6eeMlXFmsZ1v27/v4DbbmiINxXf+t2H/Xcr/hocs="; composerNoPlugins = false; composerNoScripts = false; diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index cb99bd032eb5..05076e2bc745 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-I0xJfX0f1srIjiitBt5EN6j/pOCvfGUIwxCt5sT2UuY="; + sha256 = "sha256-9klOS9VFKMiOWihJkXdk5/GTW6oRVrmSAKwK7es6IhM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ku/kuttl/package.nix b/pkgs/by-name/ku/kuttl/package.nix index a4f482272ed8..08268eab763c 100644 --- a/pkgs/by-name/ku/kuttl/package.nix +++ b/pkgs/by-name/ku/kuttl/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.20.0"; + version = "0.21.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-RZmylvf4q1JD8EAnxiFVfu9Q/ya1TXnbZhn4RguehII="; + sha256 = "sha256-0eETF9kf5e0E7R9CEANZC854r7/P/wjxeVgx90TdRFg="; }; - vendorHash = "sha256-XdHgPN0gE1ie4kxqmZQgxlV+RUddu6OPbqWwIHAw6Hc="; + vendorHash = "sha256-QYdeYmp++sAvgDPWpEscfm4n0lRejLTPZPGbVPCoWmk="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/pkgs/by-name/le/lessc/package.nix b/pkgs/by-name/le/lessc/package.nix new file mode 100644 index 000000000000..637f55a762a4 --- /dev/null +++ b/pkgs/by-name/le/lessc/package.nix @@ -0,0 +1,77 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + callPackage, + testers, + runCommand, + writeText, + nix-update-script, + lessc, +}: + +buildNpmPackage rec { + pname = "lessc"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "less"; + repo = "less.js"; + rev = "v${version}"; + hash = "sha256-pOTKw+orCl2Y8lhw5ZyAqjFJDoka7uG7V5ae6RS1yqw="; + }; + sourceRoot = "${src.name}/packages/less"; + + npmDepsHash = "sha256-oPE2lo/lMiU8cnOciPW/gwzOtiehl9MGNncCrq1Hk+g="; + + postPatch = '' + sed -i ./package.json \ + -e '/@less\/test-data/d' \ + -e '/@less\/test-import-module/d' + ''; + + env.PUPPETEER_SKIP_DOWNLOAD = 1; + + passthru = { + updateScript = nix-update-script { }; + plugins = callPackage ./plugins { }; + wrapper = callPackage ./wrapper { }; + withPlugins = fn: lessc.wrapper.override { plugins = fn lessc.plugins; }; + tests = { + version = testers.testVersion { package = lessc; }; + + simple = testers.testEqualContents { + assertion = "lessc compiles a basic less file"; + expected = writeText "expected" '' + body h1 { + color: red; + } + ''; + actual = + runCommand "actual" + { + nativeBuildInputs = [ lessc ]; + base = writeText "base" '' + @color: red; + body { + h1 { + color: @color; + } + } + ''; + } + '' + lessc $base > $out + ''; + }; + }; + }; + + meta = { + homepage = "https://github.com/less/less.js"; + description = "Dynamic stylesheet language"; + mainProgram = "lessc"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lelgenio ]; + }; +} diff --git a/pkgs/by-name/le/lessc/plugins/clean-css/default.nix b/pkgs/by-name/le/lessc/plugins/clean-css/default.nix new file mode 100644 index 000000000000..2ae24adea596 --- /dev/null +++ b/pkgs/by-name/le/lessc/plugins/clean-css/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + testers, + runCommand, + writeText, + lessc, +}: + +buildNpmPackage { + pname = "less-plugin-clean-css"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "less"; + repo = "less-plugin-clean-css"; + rev = "b2c3886b7af67ab45a5568e7758bbc2d5b82b112"; + hash = "sha256-dYYcaCLTwAI2T7cWCfiK866Azrw4fnzTE/mkUA6HUFo="; + }; + + npmDepsHash = "sha256-uAYXFxOoUo8tLrYqNeUFMRuaYp2GArGMLaaes1QhLp4="; + + dontNpmBuild = true; + + passthru = { + updateScript = ./update.sh; + tests = { + simple = testers.testEqualContents { + assertion = "lessc compiles a basic less file"; + expected = writeText "expected" '' + body h1{color:red} + ''; + actual = + runCommand "actual" + { + nativeBuildInputs = [ (lessc.withPlugins (p: [ p.clean-css ])) ]; + base = writeText "base" '' + @color: red; + body { + h1 { + color: @color; + } + } + ''; + } + '' + lessc $base --clean-css="--s1 --advanced" > $out + printf "\n" >> $out + ''; + }; + }; + }; + + meta = { + homepage = "https://github.com/less/less-plugin-clean-css"; + description = " Post-process and compress CSS using clean-css"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lelgenio ]; + }; +} diff --git a/pkgs/by-name/le/lessc/plugins/clean-css/update.sh b/pkgs/by-name/le/lessc/plugins/clean-css/update.sh new file mode 100755 index 000000000000..78d1d063a9e9 --- /dev/null +++ b/pkgs/by-name/le/lessc/plugins/clean-css/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts nodejs prefetch-npm-deps sd + +set -xeu -o pipefail + +PACKAGE_DIR="$(realpath "$(dirname "$0")")" +cd "$PACKAGE_DIR/.." +while ! test -f flake.nix; do cd .. ; done +NIXPKGS_DIR="$PWD" + +latest_commit="$( + curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} https://api.github.com/repos/less/less-plugin-clean-css/branches/master \ + | jq -r .commit.sha +)" + +# This repository does not report it's version in tags +version="$( + curl https://raw.githubusercontent.com/less/less-plugin-clean-css/$latest_commit/package.json \ + | jq -r .version +)" +update-source-version lessc.plugins.clean-css "$version" --rev=$latest_commit + +src="$(nix-build --no-link "$NIXPKGS_DIR" -A lessc.plugins.clean-css.src)" + +prev_npm_hash="$( + nix-instantiate "$NIXPKGS_DIR" \ + --eval --json -A lessc.plugins.clean-css.npmDepsHash \ + | jq -r . +)" +new_npm_hash="$(prefetch-npm-deps "$src/package-lock.json")" +sd --fixed-strings "$prev_npm_hash" "$new_npm_hash" "$PACKAGE_DIR/default.nix" diff --git a/pkgs/by-name/le/lessc/plugins/default.nix b/pkgs/by-name/le/lessc/plugins/default.nix new file mode 100644 index 000000000000..ab310246bba5 --- /dev/null +++ b/pkgs/by-name/le/lessc/plugins/default.nix @@ -0,0 +1,4 @@ +{ callPackage }: +{ + clean-css = callPackage ./clean-css { }; +} diff --git a/pkgs/by-name/le/lessc/wrapper/default.nix b/pkgs/by-name/le/lessc/wrapper/default.nix new file mode 100644 index 000000000000..4826a8b716d4 --- /dev/null +++ b/pkgs/by-name/le/lessc/wrapper/default.nix @@ -0,0 +1,27 @@ +{ + lib, + stdenv, + makeWrapper, + lessc, + plugins ? [ ], +}: + +stdenv.mkDerivation { + pname = "lessc-with-plugins"; + nativeBuildInputs = [ makeWrapper ]; + buildPhase = '' + mkdir -p $out/bin + + makeWrapper "${lib.getExe lessc}" "$out/bin/lessc" \ + --prefix NODE_PATH : "${lib.makeSearchPath "/lib/node_modules" plugins}" + ''; + + doUnpack = false; + + inherit (lessc) + version + src + passthru + meta + ; +} diff --git a/pkgs/by-name/li/lib45d/package.nix b/pkgs/by-name/li/lib45d/package.nix new file mode 100644 index 000000000000..26c1a86711c9 --- /dev/null +++ b/pkgs/by-name/li/lib45d/package.nix @@ -0,0 +1,44 @@ +{ + stdenv, + fetchFromGitHub, + fetchpatch, + lib, +}: +stdenv.mkDerivation (finalAttrs: { + name = "lib45d"; + version = "0.3.6"; + src = fetchFromGitHub { + owner = "45Drives"; + repo = "lib45d"; + tag = "v${finalAttrs.version}"; + hash = "sha256-42xB30Iu2WxNrBxomVBKd/uyIRt27y/Y1ah5mckOrc0="; + }; + + patches = [ + # https://github.com/45Drives/lib45d/issues/3 + # fix "error: 'uintmax_t' has not been declared" build failure until next release + (fetchpatch { + url = "https://github.com/45Drives/lib45d/commit/a607e278182a3184c004c45c215aa22c15d6941d.patch"; + hash = "sha256-sMAvOp4EjBXGHa9PGuuEqJvpEvUlMuzRKCfq9oqQLgY="; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/lib dist/shared/lib45d.so + + mkdir -p $out/include/45d + cp -f -r src/incl/45d/* $out/include/45d/ + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/45Drives/lib45d"; + description = "45Drives C++ Library"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ philipwilk ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/li/librewolf-bin/package.nix b/pkgs/by-name/li/librewolf-bin/package.nix index 6311ef341ebb..7aec7bd04c0d 100644 --- a/pkgs/by-name/li/librewolf-bin/package.nix +++ b/pkgs/by-name/li/librewolf-bin/package.nix @@ -6,11 +6,11 @@ let pname = "librewolf-bin"; - upstreamVersion = "134.0-1"; + upstreamVersion = "134.0.1-1"; version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion; src = fetchurl { url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage"; - hash = "sha256-WlI0a2Sb59O6QGZ59vseTeDIkzyJd4/VIZ/qTFcLWm0="; + hash = "sha256-AZSIHs8m0Y5CWE9C1MyQReOIxkrl3QvLhHx+n41hlIk="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index d907d627dda2..8dc369dd08b9 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -2,13 +2,17 @@ lib, fetchFromGitHub, buildNpmPackage, - electron, + electron_33, makeWrapper, testers, mattermost-desktop, nix-update-script, }: +let + electron = electron_33; +in + buildNpmPackage rec { pname = "mattermost-desktop"; version = "5.10.2"; diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 76b17d664ebd..fbf1289361b7 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "microfetch"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "NotAShelf"; repo = "microfetch"; tag = "v${version}"; - hash = "sha256-SY7Eln0Hwj0VWqzzYfqsVpAMES+SCiZkLgNZR3a8d7A="; + hash = "sha256-qpwzuzEqXsGO4y3ClaY25Q4rFm2RyPl/X3yNcQz3R4E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-fHIQK1zsYuKj2ps6tmzqGwX8woiuIQx0yiyWdMf2Fnw="; + cargoHash = "sha256-UguHTRHdcogxg/8DmRWSE7XwmaF36MTGHzF5CpMBc3Y="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mo/moonpalace/package.nix b/pkgs/by-name/mo/moonpalace/package.nix new file mode 100644 index 000000000000..a317b5bc3b29 --- /dev/null +++ b/pkgs/by-name/mo/moonpalace/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + testers, + nix-update-script, + moonpalace, +}: +buildGoModule rec { + pname = "moonpalace"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "MoonshotAI"; + repo = "moonpalace"; + tag = "v${version}"; + hash = "sha256-30ibs49srFwTsnjbtvLUNQ79yA/vZJdlHQZ8ERi5lls="; + }; + vendorHash = "sha256-e5G+28cgUJvUpS1CX/Tinn3gDK8fNEcJi8uv9xMR+5o="; + + passthru = { + tests.version = testers.testVersion { + package = moonpalace; + version = "v${moonpalace.version}"; + command = "HOME=$(mktemp -d) moonpalace --version"; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "An API debugging tool provided by Moonshot AI"; + homepage = "https://github.com/MoonshotAI/moonpalace"; + changelog = "https://github.com/MoonshotAI/moonpalace/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "moonpalace"; + }; +} diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index 394b1cac3dd9..70cbbb7c22b7 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { gzip perl jq + lua5_3 # luac is needed for cross builds ]; preConfigure = '' env MYMPD_BUILDDIR=$PWD/build ./build.sh createassets @@ -59,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: { # 5 tests out of 23 fail, probably due to the sandbox... doCheck = false; + strictDeps = true; + passthru.tests = { inherit (nixosTests) mympd; }; meta = { diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index 7f5355789016..0f996a78bf6b 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -80,7 +80,8 @@ rustPlatform.buildRustPackage rec { env = { GEN_ARTIFACTS = "artifacts"; - LIBGIT2_NO_VENDOR = 1; + # FIXME: our libgit2 is currently too new + # LIBGIT2_NO_VENDOR = 1; NIX = lib.getExe nix; NURL = lib.getExe nurl; ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd b/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd index cc4fc3a19ca8..0d4c88e5def5 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd +++ b/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd @@ -17,11 +17,12 @@ nixos-rebuild - reconfigure a NixOS machine # SYNOPSIS +; document here only non-deprecated flags _nixos-rebuild_ \[--verbose] [--max-jobs MAX_JOBS] [--cores CORES] [--log-format LOG_FORMAT] [--keep-going] [--keep-failed] [--fallback] [--repair] [--option OPTION OPTION] [--builders BUILDERS]++ \[--include INCLUDE] [--quiet] [--print-build-logs] [--show-trace] [--accept-flake-config] [--refresh] [--impure] [--offline] [--no-net] [--recreate-lock-file]++ \[--no-update-lock-file] [--no-write-lock-file] [--no-registries] [--commit-lock-file] [--update-input UPDATE_INPUT] [--override-input OVERRIDE_INPUT OVERRIDE_INPUT]++ \[--no-build-output] [--use-substitutes] [--help] [--file FILE] [--attr ATTR] [--flake [FLAKE]] [--no-flake] [--install-bootloader] [--profile-name PROFILE_NAME]++ - \[--specialisation SPECIALISATION] [--rollback] [--upgrade] [--upgrade-all] [--json] [--ask-sudo-password] [--sudo] [--fast]++ + \[--specialisation SPECIALISATION] [--rollback] [--upgrade] [--upgrade-all] [--json] [--ask-sudo-password] [--sudo] [--no-reexec]++ \[--image-variant VARIANT]++ \[--build-host BUILD_HOST] [--target-host TARGET_HOST]++ \[{switch,boot,test,build,edit,repl,dry-build,dry-run,dry-activate,build-image,build-vm,build-vm-with-bootloader,list-generations}] @@ -170,7 +171,7 @@ It must be one of the following: Causes the boot loader to be (re)installed on the device specified by the relevant configuration options. -*--fast* +*--no-reexec* Normally, *nixos-rebuild* first finds and builds itself from the _config.system.build.nixos-rebuild_ attribute from the current user channel or flake and exec into it. This allows *nixos-rebuild* to run diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 2b9975e48e98..1c725b60f617 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -18,7 +18,7 @@ logger.setLevel(logging.INFO) def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentParser]]: - common_flags = argparse.ArgumentParser(add_help=False) + common_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) common_flags.add_argument( "--verbose", "-v", @@ -37,13 +37,13 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa common_flags.add_argument("--repair", action="store_true") common_flags.add_argument("--option", nargs=2, action="append") - common_build_flags = argparse.ArgumentParser(add_help=False) + common_build_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) common_build_flags.add_argument("--builders") common_build_flags.add_argument("--include", "-I", action="append") common_build_flags.add_argument("--print-build-logs", "-L", action="store_true") common_build_flags.add_argument("--show-trace", action="store_true") - flake_common_flags = argparse.ArgumentParser(add_help=False) + flake_common_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) flake_common_flags.add_argument("--accept-flake-config", action="store_true") flake_common_flags.add_argument("--refresh", action="store_true") flake_common_flags.add_argument("--impure", action="store_true") @@ -57,10 +57,10 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa flake_common_flags.add_argument("--update-input", action="append") flake_common_flags.add_argument("--override-input", nargs=2, action="append") - classic_build_flags = argparse.ArgumentParser(add_help=False) + classic_build_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) classic_build_flags.add_argument("--no-build-output", "-Q", action="store_true") - copy_flags = argparse.ArgumentParser(add_help=False) + copy_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) copy_flags.add_argument( "--use-substitutes", "--substitute-on-destination", @@ -166,10 +166,15 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa help="Deprecated, use '--sudo' instead", ) main_parser.add_argument("--no-ssh-tty", action="store_true", help="Deprecated") + main_parser.add_argument( + "--no-reexec", + action="store_true", + help="Do not update nixos-rebuild in-place (also known as re-exec) before build", + ) main_parser.add_argument( "--fast", action="store_true", - help="Skip possibly expensive operations", + help="Deprecated, use '--no-reexec' instead", ) main_parser.add_argument("--build-host", help="Specifies host to perform the build") main_parser.add_argument( @@ -223,23 +228,23 @@ def parse_args( if args.ask_sudo_password: args.sudo = True - # TODO: use deprecated=True in Python >=3.13 if args.install_grub: - parser_warn("--install-grub deprecated, use --install-bootloader instead") + parser_warn("--install-grub is deprecated, use --install-bootloader instead") args.install_bootloader = True - # TODO: use deprecated=True in Python >=3.13 if args.use_remote_sudo: - parser_warn("--use-remote-sudo deprecated, use --sudo instead") + parser_warn("--use-remote-sudo is deprecated, use --sudo instead") args.sudo = True - # TODO: use deprecated=True in Python >=3.13 + if args.fast: + parser_warn("--fast is deprecated, use --no-reexec instead") + args.no_reexec = True + if args.no_ssh_tty: - parser_warn("--no-ssh-tty deprecated, SSH's TTY is never used anymore") + parser_warn("--no-ssh-tty is deprecated, SSH's TTY is never used anymore") - # TODO: use deprecated=True in Python >=3.13 if args.no_build_nix: - parser_warn("--no-build-nix deprecated, we do not build nix anymore") + parser_warn("--no-build-nix is deprecated, we do not build nix anymore") if args.action == Action.EDIT.value and (args.file or args.attr): parser.error("--file and --attr are not supported with 'edit'") @@ -351,7 +356,7 @@ def execute(argv: list[str]) -> None: if ( WITH_REEXEC and can_run - and not args.fast + and not args.no_reexec and not os.environ.get("_NIXOS_REBUILD_REEXEC") ): reexec(argv, args, build_flags, flake_build_flags) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index ba67fa838578..c95840345a51 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -144,7 +144,7 @@ def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: mock_run.side_effect = run_side_effect - nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv", "--fast"]) + nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv", "--no-reexec"]) assert mock_run.call_count == 6 mock_run.assert_has_calls( @@ -222,7 +222,7 @@ def test_execute_nix_build_vm(mock_run: Any, tmp_path: Path) -> None: "nixos-config=./configuration.nix", "-I", "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - "--fast", + "--no-reexec", ] ) @@ -340,7 +340,7 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: "--install-bootloader", "--sudo", "--verbose", - "--fast", + "--no-reexec", # https://github.com/NixOS/nixpkgs/issues/374050 "--option", "narinfo-cache-negative-ttl", @@ -418,7 +418,7 @@ def test_execute_nix_switch_flake_target_host( "--use-remote-sudo", "--target-host", "user@localhost", - "--fast", + "--no-reexec", ] ) @@ -508,7 +508,7 @@ def test_execute_nix_switch_flake_build_host( "/path/to/config#hostname", "--build-host", "user@localhost", - "--fast", + "--no-reexec", ] ) @@ -587,7 +587,7 @@ def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: nixpkgs_path.touch() nr.execute( - ["nixos-rebuild", "switch", "--rollback", "--install-bootloader", "--fast"] + ["nixos-rebuild", "switch", "--rollback", "--install-bootloader", "--no-reexec"] ) assert mock_run.call_count >= 2 @@ -625,7 +625,7 @@ def test_execute_build(mock_run: Any, tmp_path: Path) -> None: CompletedProcess([], 0, str(config_path)), ] - nr.execute(["nixos-rebuild", "build", "--no-flake", "--fast"]) + nr.execute(["nixos-rebuild", "build", "--no-flake", "--no-reexec"]) assert mock_run.call_count == 1 mock_run.assert_has_calls( @@ -659,7 +659,7 @@ def test_execute_test_flake(mock_run: Any, tmp_path: Path) -> None: mock_run.side_effect = run_side_effect nr.execute( - ["nixos-rebuild", "test", "--flake", "github:user/repo#hostname", "--fast"] + ["nixos-rebuild", "test", "--flake", "github:user/repo#hostname", "--no-reexec"] ) assert mock_run.call_count == 2 @@ -712,7 +712,7 @@ def test_execute_test_rollback( mock_run.side_effect = run_side_effect nr.execute( - ["nixos-rebuild", "test", "--rollback", "--profile-name", "foo", "--fast"] + ["nixos-rebuild", "test", "--rollback", "--profile-name", "foo", "--no-reexec"] ) assert mock_run.call_count == 2 diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 2c3a6c5ce60c..bfd8dba0a58c 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -20,7 +20,7 @@ from .helpers import get_qualified_name autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build(mock_run: Any, monkeypatch: Any) -> None: +def test_build(mock_run: Any) -> None: assert n.build( "config.system.build.attr", m.BuildAttr("", None), @@ -79,7 +79,7 @@ def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> N @patch(get_qualified_name(n.run_wrapper, n), autospec=True) @patch(get_qualified_name(n.uuid4, n), autospec=True) -def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: Any) -> None: +def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) -> None: build_host = m.Remote("user@host", [], None) monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts") @@ -226,7 +226,7 @@ def test_build_remote_flake( ) -def test_copy_closure(monkeypatch: Any) -> None: +def test_copy_closure(monkeypatch: MonkeyPatch) -> None: closure = Path("/path/to/closure") with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, None) @@ -290,7 +290,7 @@ def test_copy_closure(monkeypatch: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_edit(mock_run: Any, monkeypatch: Any, tmpdir: Any) -> None: +def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: # Flake flake = m.Flake.parse(f"{tmpdir}#attr") n.edit(flake, {"commit_lock_file": True}) @@ -309,8 +309,8 @@ def test_edit(mock_run: Any, monkeypatch: Any, tmpdir: Any) -> None: # Classic with monkeypatch.context() as mp: - default_nix = tmpdir.join("default.nix") - default_nix.write("{}") + default_nix = tmpdir / "default.nix" + default_nix.write_text("{}", encoding="utf-8") mp.setenv("NIXOS_CONFIG", str(tmpdir)) mp.setenv("EDITOR", "editor") @@ -333,7 +333,7 @@ def test_edit(mock_run: Any, monkeypatch: Any, tmpdir: Any) -> None: """, ), ) -def test_get_build_image_variants(mock_run: Any) -> None: +def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: build_attr = m.BuildAttr("", None) assert n.get_build_image_variants(build_attr) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", @@ -357,7 +357,7 @@ def test_get_build_image_variants(mock_run: Any) -> None: stdout=PIPE, ) - build_attr = m.BuildAttr(Path("/tmp"), "preAttr") + build_attr = m.BuildAttr(Path(tmp_path), "preAttr") assert n.get_build_image_variants(build_attr, {"inst_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", @@ -369,10 +369,10 @@ def test_get_build_image_variants(mock_run: Any) -> None: "--strict", "--json", "--expr", - textwrap.dedent(""" + textwrap.dedent(f""" let - value = import "/tmp"; - set = if builtins.isFunction value then value {} else value; + value = import "{tmp_path}"; + set = if builtins.isFunction value then value {{}} else value; in builtins.mapAttrs (n: v: v.passthru.filePath) set.preAttr.config.system.build.images """), @@ -687,7 +687,7 @@ def test_set_profile(mock_run: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_switch_to_configuration(mock_run: Any, monkeypatch: Any) -> None: +def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index 6c2ca2289245..bfd5b180fd5a 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -1,6 +1,8 @@ from typing import Any from unittest.mock import patch +from pytest import MonkeyPatch + import nixos_rebuild.models as m import nixos_rebuild.process as p @@ -94,7 +96,7 @@ def test_run(mock_run: Any) -> None: ) -def test_remote_from_name(monkeypatch: Any) -> None: +def test_remote_from_name(monkeypatch: MonkeyPatch) -> None: monkeypatch.setenv("NIX_SSHOPTS", "") assert m.Remote.from_arg("user@localhost", None, False) == m.Remote( "user@localhost", diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index c9894806103b..3d691d5a02cf 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -13,7 +13,7 @@ }: let pname = "obsidian"; - version = "1.8.3"; + version = "1.8.4"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -37,9 +37,9 @@ let url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; hash = if stdenv.hostPlatform.isDarwin then - "sha256-SqeCnS2Ncz8y1F+YAzAfBlsAgSaaMfmMcCjke9/UbXQ=" + "sha256-kg0gH4LW78uKUxnvE1CG8B1BvJzyO8vlP6taLvmGw/s=" else - "sha256-t5iZOA/cFJpn9OtbutQ6gJ6SVkG0QljnJZ931YnGc54="; + "sha256-bvmvzVyHrjh1Yj3JxEfry521CMX3E2GENmXddEeLwiE="; }; icon = fetchurl { diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index c3d6c09fb924..9776f4654915 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -13,18 +13,18 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.11.7"; + version = "0.11.8"; src = fetchFromGitea { domain = "codeberg.org"; owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; - hash = "sha256-sR+jBCSuDH4YdJz3YuvA4EE36RHV3m/xU8hIEXXsqKo="; + hash = "sha256-pE7AAgps8LlsmM97q/XIi7If1UwNP/0uJH9wOeZ6neM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-WFh6blk0sdpDVBsiQVXtXzVQBjAKJ2995PQ4voqxm+A="; + cargoHash = "sha256-/OC/+eMRBF2MICVUtsJR0m62fWLP0lr10J/XkKGcPnA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/pa/patchy/package.nix b/pkgs/by-name/pa/patchy/package.nix index bd5e0888335b..04f80161fd07 100644 --- a/pkgs/by-name/pa/patchy/package.nix +++ b/pkgs/by-name/pa/patchy/package.nix @@ -6,7 +6,7 @@ versionCheckHook, }: let - version = "1.2.7"; + version = "1.3.0"; in rustPlatform.buildRustPackage { pname = "patchy"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "nik-rev"; repo = "patchy"; tag = "v${version}"; - hash = "sha256-Npb+qcguxZAvWggJC5NtxCeUCU/nOtjCbK5gfkDTkfw="; + hash = "sha256-7WAdfbnvsmaD8fMCJQ8dQenCDmLLxjVTj2DGcAhMxcg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+0hgG+PcxZQGgen969cnQcaGW47tDVGCCoiK/31YI0M="; + cargoHash = "sha256-QaFIu7YVixQsDGL5fjQ3scKMyr0hw8lEWVc80EMTBB8="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix index e185a6b74ab4..90e748ccf96c 100644 --- a/pkgs/by-name/pr/protoc-gen-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.36.3"; + version = "1.36.4"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-yzrdZMWl5MBOAGCXP1VxVZNLCSFUWEURVYiDhRKSSRc="; + hash = "sha256-lDhg72i/5J4PMsdMPBthEpV3gFqr+ds3O4+rj6AZoMs="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index 2e794fc3a8de..cb38a35d6831 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.89.0"; + version = "1.90.0"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-v/0Sg7f/pf7wt7r0+ewSXGKgBqMFnOwldKQUwKQ8Fz0="; + hash = "sha256-3++hipn/7dJKQhY1gh8v/OsY+R316n5EJcEcmOheYnM="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-UIdoFcnXeCpf1CSBTmdxkP5uKz+WoJt5u5u6MXCqnG4="; + hash = "sha256-qa4ESWW6voh45Kl0ydL6kyTwH8MNUNnyRSlFJcu3trI="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/re/renpy/noSteam.patch b/pkgs/by-name/re/renpy/noSteam.patch new file mode 100644 index 000000000000..6322bcff3248 --- /dev/null +++ b/pkgs/by-name/re/renpy/noSteam.patch @@ -0,0 +1,16 @@ +diff --git a/renpy/common/00steam.rpy b/renpy/common/00steam.rpy +index 9a5f9c405..68c8c26e0 100644 +--- a/renpy/common/00steam.rpy ++++ b/renpy/common/00steam.rpy +@@ -1029,11 +1029,6 @@ init -1499 python in achievement: + steam = None + steamapi = None + +- if renpy.windows or renpy.macintosh or renpy.linux: +- steam_preinit() +- steam_init() +- +- + init 1500 python in achievement: + + # Steam position. diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index 9bba63ce1c43..49bd15debfce 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -16,6 +16,7 @@ zlib, harfbuzz, makeWrapper, + withoutSteam ? true, }: let @@ -90,7 +91,7 @@ stdenv.mkDerivation { patches = [ ./shutup-erofs-errors.patch ./5687.patch - ]; + ] ++ lib.optional withoutSteam ./noSteam.patch; postPatch = '' cp tutorial/game/tutorial_director.rpy{m,} @@ -136,7 +137,5 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ shadowrz ]; }; - passthru = { - inherit base_version vc_version; - }; + passthru = { inherit base_version vc_version; }; } diff --git a/pkgs/by-name/si/simplesamlphp/package.nix b/pkgs/by-name/si/simplesamlphp/package.nix index 35ae0774f99a..835c007c7afe 100644 --- a/pkgs/by-name/si/simplesamlphp/package.nix +++ b/pkgs/by-name/si/simplesamlphp/package.nix @@ -3,18 +3,18 @@ fetchFromGitHub, lib, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "simplesamlphp"; version = "1.19.7"; src = fetchFromGitHub { owner = "simplesamlphp"; repo = "simplesamlphp"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Qmy9fuZq8MBqvYV6/u3Dg92pHHicuUhdNeB22u4hwwA="; }; - vendorHash = "sha256-FMFD0AXmD7Rq4d9+aNtGVk11YuOt40FWEqxvf+gBjmI="; + vendorHash = "sha256-kFRvOxSfqlM+xzFFlEm9YrbQDOvC4AA0BtztFQ1xxDU="; meta = { description = "SimpleSAMLphp is an application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius)"; diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index 6f719c22a0aa..ede7d61c519a 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.10.7"; + version = "1.11.0"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-+0wzCFeQ0ZdjYKGQQcwBOAj3bGRHOaHeFMMg/hyXDGQ="; + hash = "sha256-or3RklqfrDIC2ZHJ7jDs1y+118/OsJiRKyDt1NCWqfI="; }; - vendorHash = "sha256-Z3SGEDphy4U+AJzI7QSTEWG/T+U/FwTlP/zJN/mBAL0="; + vendorHash = "sha256-NWHDEN7aQWR3DXp9nFNhxDXFMeBsCk8/ZzCcT/zgwmI="; tags = [ "with_quic" diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix index 89f73e4ffd9d..bd1c0fd74c36 100644 --- a/pkgs/by-name/sn/snyk/package.nix +++ b/pkgs/by-name/sn/snyk/package.nix @@ -8,7 +8,7 @@ }: let - version = "1.1295.0"; + version = "1.1295.2"; in buildNpmPackage { pname = "snyk"; @@ -18,7 +18,7 @@ buildNpmPackage { owner = "snyk"; repo = "cli"; tag = "v${version}"; - hash = "sha256-KFSEnNO1K1dAU8IIrWMOXtgoRmCaGeHdEUtU+bHjIOk="; + hash = "sha256-cHOIToO9xr+CNS0llwffaTUdhUqFbFcZcrPnBeD+JxE="; }; npmDepsHash = "sha256-RuIavwtTbgo5Ni7oGH2i5VAcVxfS4wKKSX6qHD8CHIw="; diff --git a/pkgs/by-name/ta/tangram/package.nix b/pkgs/by-name/ta/tangram/package.nix index 28875a45c51f..60dfcae1a73f 100644 --- a/pkgs/by-name/ta/tangram/package.nix +++ b/pkgs/by-name/ta/tangram/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "tangram"; - version = "3.1"; + version = "3.3"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Tangram"; rev = "v${version}"; - hash = "sha256-vN9zRc8Ac9SI0lIcuf01A2WLqLGtV3DUiNzCSmc2ri4="; + hash = "sha256-OtQN8Iigu92iKa7CAaslIpbS0bqJ9Vus++inrgV/eeM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index f4e1bdb7b32d..3e55a2fa7159 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.74.0"; + version = "2.75.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-LOy9q2Qc47DQxPkAt2mmlmrJUcoL+hBpm0dFI4oZo/0="; + hash = "sha256-0ayEGmIUw5jI5utp689oxlFR15TeQ1gbLJIos4AXdd4="; }; buildInputs = [ diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix index 34416791bafe..52ff6e9e41da 100644 --- a/pkgs/by-name/tu/tuisky/package.nix +++ b/pkgs/by-name/tu/tuisky/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "tuisky"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "sugyan"; repo = "tuisky"; tag = "v${version}"; - hash = "sha256-phadkJgSvizSNPvrVaYu/+y1uAj6fmb9JQLdj0dEQIg="; + hash = "sha256-s0eKWP4cga82Fj7KGIG6yLk67yOqGoAqfhvJINzytTw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nY+9DOdpFxVA16DTL47rDbbeBPSrXxlC1+APzb4Kkbk="; + cargoHash = "sha256-F/gEBEpcgNT0Q55zUTf8254yYIZI6RmiW9heCuljAEY="; nativeBuildInputs = [ pkg-config @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "TUI client for bluesky"; homepage = "https://github.com/sugyan/tuisky"; - changelog = "https://github.com/sugyan/tuisky/blob/${lib.removePrefix "refs/tags/" src.rev}/CHANGELOG.md"; + changelog = "https://github.com/sugyan/tuisky/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "tuisky"; diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index d49e94757f00..8223b592248c 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "turbo-unwrapped"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; tag = "v${version}"; - hash = "sha256-L51RgXUlA9hnVt232qdLo6t0kqXl7b01jotUk1r8wO0="; + hash = "sha256-cvwYBdvBxkntCXA4FJMc54Rca+zoZEjyWZUQoMH9Qdc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qv5bK65vA94M/YSjSRaYilg44NqkzF2ybmUVapu8cpI="; + cargoHash = "sha256-e9xq3xc8Rtuq3e/3IEwj9eR9SEj5N4bvsu4PFubm8mM="; nativeBuildInputs = [ diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index cceff8bbb193..ca2069e898c7 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.25"; + version = "0.5.26"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-nDZaS3Yc7Z8gKyl2+HTpwoTTJKJDZCTQIiZazICvlvQ="; + hash = "sha256-Rp6DexvMbUdE7i8hik4MC2sW/VFmpxJFfF7ukc49VlE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-GWlL5NZwHfkOfl16Eh38xo4OETmy/HFFeOZCGDruluI="; + cargoHash = "sha256-MZKrkxy7bXQ3lTrPwCRT8nAR8fP+SeZmBEMQrXlvkYo="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/wh/whisper-ctranslate2/package.nix b/pkgs/by-name/wh/whisper-ctranslate2/package.nix index b1ab24638246..a92e8ab1bf7e 100644 --- a/pkgs/by-name/wh/whisper-ctranslate2/package.nix +++ b/pkgs/by-name/wh/whisper-ctranslate2/package.nix @@ -51,5 +51,10 @@ python3Packages.buildPythonApplication { license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada ]; mainProgram = "whisper-ctranslate2"; + badPlatforms = [ + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + # what(): /build/source/include/onnxruntime/core/common/logging/logging.h:320 static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger() Attempt to use DefaultLogger but none has been registered. + "aarch64-linux" + ]; }; } diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 775489002e02..b8371f5690f1 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -95,7 +95,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.171.3"; + version = "0.171.4"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-hUEZzN2rocWXxEFmtjB/7AZf+1kAGx8IZ3U57+Zi0EQ="; + hash = "sha256-DeZHXU106uqCyqjdF+rMdnFifra9ug9Dzosg+PcD8Nw="; }; patches = [ @@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-s+SH6anGnYAPMDTD71QEclp8XM+ceyur3Anto0JOPyc="; + cargoHash = "sha256-uB6CM3KSr57sfbh81rXBhNq8LChme5+WHVIjwZrSso4="; nativeBuildInputs = [ diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 005feae23c28..6e42d6cf9397 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -29,13 +29,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "zipline"; - version = "3.7.11"; + version = "3.7.12"; src = fetchFromGitHub { owner = "diced"; repo = "zipline"; tag = "v${finalAttrs.version}"; - hash = "sha256-sogsPx6vh+1+ew9o3/0B4yU9I/Gllo9XLJqvMvGZ89Q="; + hash = "sha256-i3IGcSxIhy8jmCMsDJGGszYoFsShBfbv7SjTQL1dDM0="; }; patches = [ diff --git a/pkgs/by-name/zx/zxpy/package.nix b/pkgs/by-name/zx/zxpy/package.nix index 4c731b863602..070c0d22ca25 100644 --- a/pkgs/by-name/zx/zxpy/package.nix +++ b/pkgs/by-name/zx/zxpy/package.nix @@ -2,35 +2,22 @@ lib, python3, fetchFromGitHub, - fetchpatch, deterministic-uname, }: - python3.pkgs.buildPythonApplication rec { pname = "zxpy"; - version = "1.6.3"; - format = "pyproject"; + version = "1.6.4"; + pyproject = true; src = fetchFromGitHub { owner = "tusharsadhwani"; repo = "zxpy"; - rev = version; - hash = "sha256-/sOLSIqaAUkaAghPqe0Zoq7C8CSKAd61o8ivtjJFcJY="; + tag = version; + hash = "sha256-/VITHN517lPUmhLYgJHBYYvvlJdGg2Hhnwk47Mp9uc0="; }; - patches = [ - # fix test caused by `uname -p` printing unknown - # https://github.com/tusharsadhwani/zxpy/pull/53 - (fetchpatch { - name = "allow-unknown-processor-in-injection-test.patch"; - url = "https://github.com/tusharsadhwani/zxpy/commit/95ad80caddbab82346f60ad80a601258fd1238c9.patch"; - hash = "sha256-iXasOKjWuxNjjTpb0umNMNhbFgBjsu5LsOpTaXllATM="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ python3.pkgs.setuptools - python3.pkgs.wheel ]; nativeCheckInputs = [ @@ -44,12 +31,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "zx" ]; - meta = with lib; { + meta = { description = "Shell scripts made simple"; homepage = "https://github.com/tusharsadhwani/zxpy"; changelog = "https://github.com/tusharsadhwani/zxpy/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "zxpy"; }; } diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/1001-test-secret-agent-Make-GetServerInformation-not-leak-into-tests.patch b/pkgs/desktops/lomiri/services/lomiri-indicator-network/1001-test-secret-agent-Make-GetServerInformation-not-leak-into-tests.patch new file mode 100644 index 000000000000..832514441465 --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/1001-test-secret-agent-Make-GetServerInformation-not-leak-into-tests.patch @@ -0,0 +1,240 @@ +From 9c2a6a6349f705017e3c8a34daa4ba1805586498 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Thu, 30 Jan 2025 14:53:02 +0100 +Subject: [PATCH] tests/unit/secret-agent/test-secret-agent: Make sure signal + emitted on agent startup doesn't leak into tests + +--- + tests/unit/secret-agent/test-secret-agent.cpp | 116 ++++++++++-------- + 1 file changed, 67 insertions(+), 49 deletions(-) + +diff --git a/tests/unit/secret-agent/test-secret-agent.cpp b/tests/unit/secret-agent/test-secret-agent.cpp +index 1f1cd7e9..9c72e251 100644 +--- a/tests/unit/secret-agent/test-secret-agent.cpp ++++ b/tests/unit/secret-agent/test-secret-agent.cpp +@@ -29,6 +29,16 @@ + #include + #include + ++#define WAIT_FOR_SIGNALS(signalSpy, signalsExpected)\ ++{\ ++ while (signalSpy.size() < signalsExpected)\ ++ {\ ++ ASSERT_TRUE(signalSpy.wait()) << "Waiting for " << signalsExpected << " signals, got " << signalSpy.size();\ ++ }\ ++ ASSERT_EQ(signalsExpected, signalSpy.size()) << "Waiting for " << signalsExpected << " signals, got " << signalSpy.size();\ ++} ++ ++ + using namespace std; + using namespace testing; + using namespace QtDBusTest; +@@ -49,21 +59,6 @@ protected: + dbusMock.registerTemplate(NM_DBUS_SERVICE, NETWORK_MANAGER_TEMPLATE_PATH, {}, QDBusConnection::SystemBus); + dbusTestRunner.startServices(); + +- QProcessEnvironment env(QProcessEnvironment::systemEnvironment()); +- env.insert("SECRET_AGENT_DEBUG_PASSWORD", "1"); +- secretAgent.setProcessEnvironment(env); +- secretAgent.setReadChannel(QProcess::StandardOutput); +- secretAgent.setProcessChannelMode(QProcess::ForwardedErrorChannel); +- secretAgent.start(SECRET_AGENT_BIN, QStringList() << "--print-address"); +- secretAgent.waitForStarted(); +- secretAgent.waitForReadyRead(); +- agentBus = secretAgent.readAll().trimmed(); +- +- agentInterface.reset( +- new OrgFreedesktopNetworkManagerSecretAgentInterface(agentBus, +- NM_DBUS_PATH_SECRET_AGENT, dbusTestRunner.systemConnection())); +- +- + notificationsInterface.reset( + new OrgFreedesktopDBusMockInterface( + "org.freedesktop.Notifications", +@@ -72,8 +67,11 @@ protected: + } + + virtual ~TestSecretAgentCommon() { +- secretAgent.terminate(); +- secretAgent.waitForFinished(); ++ if (secretAgent.state() != QProcess::NotRunning) ++ { ++ secretAgent.terminate(); ++ secretAgent.waitForFinished(); ++ } + } + + QVariantDictMap connection(const QString &keyManagement) { +@@ -111,6 +109,32 @@ protected: + return connection; + } + ++ void setupSecretAgent (void) { ++ QSignalSpy notificationSpy(notificationsInterface.data(), ++ SIGNAL(MethodCalled(const QString &, const QVariantList &))); ++ ++ QProcessEnvironment env(QProcessEnvironment::systemEnvironment()); ++ env.insert("SECRET_AGENT_DEBUG_PASSWORD", "1"); ++ secretAgent.setProcessEnvironment(env); ++ secretAgent.setReadChannel(QProcess::StandardOutput); ++ secretAgent.setProcessChannelMode(QProcess::ForwardedErrorChannel); ++ secretAgent.start(SECRET_AGENT_BIN, QStringList() << "--print-address"); ++ secretAgent.waitForStarted(); ++ secretAgent.waitForReadyRead(); ++ ++ agentBus = secretAgent.readAll().trimmed(); ++ ++ agentInterface.reset( ++ new OrgFreedesktopNetworkManagerSecretAgentInterface(agentBus, ++ NM_DBUS_PATH_SECRET_AGENT, dbusTestRunner.systemConnection())); ++ ++ WAIT_FOR_SIGNALS(notificationSpy, 1); ++ { ++ const QVariantList &call(notificationSpy.at(0)); ++ EXPECT_EQ(call.at(0), "GetServerInformation"); ++ } ++ } ++ + DBusTestRunner dbusTestRunner; + + DBusMock dbusMock; +@@ -163,22 +187,21 @@ static void transform(QVariantList &list) { + } + + TEST_P(TestSecretAgentGetSecrets, ProvidesPasswordForWpaPsk) { ++ setupSecretAgent(); ++ ++ QSignalSpy notificationSpy(notificationsInterface.data(), ++ SIGNAL(MethodCalled(const QString &, const QVariantList &))); ++ + QDBusPendingReply reply( + agentInterface->GetSecrets(connection(GetParam().keyManagement), + QDBusObjectPath("/connection/foo"), + SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(), + 5)); + +- QSignalSpy notificationSpy(notificationsInterface.data(), +- SIGNAL(MethodCalled(const QString &, const QVariantList &))); +- if (notificationSpy.empty()) +- { +- ASSERT_TRUE(notificationSpy.wait()); +- } ++ WAIT_FOR_SIGNALS(notificationSpy, 1); + +- ASSERT_EQ(1, notificationSpy.size()); + const QVariantList &call(notificationSpy.at(0)); +- EXPECT_EQ("Notify", call.at(0).toString().toStdString()); ++ EXPECT_EQ("Notify", call.at(0)); + + QVariantList args(call.at(1).toList()); + transform(args); +@@ -254,6 +277,7 @@ class TestSecretAgent: public TestSecretAgentCommon, public Test { + }; + + TEST_F(TestSecretAgent, GetSecretsWithNone) { ++ setupSecretAgent(); + + QDBusPendingReply reply( + agentInterface->GetSecrets( +@@ -272,6 +296,8 @@ TEST_F(TestSecretAgent, GetSecretsWithNone) { + /* Tests that if we request secrets and then cancel the request + that we close the notification */ + TEST_F(TestSecretAgent, CancelGetSecrets) { ++ setupSecretAgent(); ++ + QSignalSpy notificationSpy(notificationsInterface.data(), SIGNAL(MethodCalled(const QString &, const QVariantList &))); + + agentInterface->GetSecrets( +@@ -280,23 +306,19 @@ TEST_F(TestSecretAgent, CancelGetSecrets) { + SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(), + 5); + +- notificationSpy.wait(); +- +- ASSERT_EQ(1, notificationSpy.size()); +- const QVariantList &call(notificationSpy.at(0)); +- EXPECT_EQ("Notify", call.at(0).toString().toStdString()); ++ WAIT_FOR_SIGNALS(notificationSpy, 1); ++ { ++ const QVariantList &call(notificationSpy.at(0)); ++ EXPECT_EQ("Notify", call.at(0)); ++ } + + notificationSpy.clear(); + + agentInterface->CancelGetSecrets(QDBusObjectPath("/connection/foo"), + SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME); + +- if (notificationSpy.empty()) +- { +- ASSERT_TRUE(notificationSpy.wait()); +- } ++ WAIT_FOR_SIGNALS(notificationSpy, 1); + +- ASSERT_EQ(1, notificationSpy.size()); + const QVariantList &closecall(notificationSpy.at(0)); + EXPECT_EQ("CloseNotification", closecall.at(0).toString().toStdString()); + } +@@ -304,6 +326,8 @@ TEST_F(TestSecretAgent, CancelGetSecrets) { + /* Ensures that if we request secrets twice we close the notification + for the first request */ + TEST_F(TestSecretAgent, MultiSecrets) { ++ setupSecretAgent(); ++ + QSignalSpy notificationSpy(notificationsInterface.data(), SIGNAL(MethodCalled(const QString &, const QVariantList &))); + + agentInterface->GetSecrets( +@@ -312,15 +336,12 @@ TEST_F(TestSecretAgent, MultiSecrets) { + SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(), + 5); + +- if (notificationSpy.empty()) ++ WAIT_FOR_SIGNALS(notificationSpy, 1); + { +- ASSERT_TRUE(notificationSpy.wait()); ++ const QVariantList &call(notificationSpy.at(0)); ++ EXPECT_EQ("Notify", call.at(0)); + } + +- ASSERT_EQ(1, notificationSpy.size()); +- const QVariantList &call(notificationSpy.at(0)); +- EXPECT_EQ("Notify", call.at(0).toString().toStdString()); +- + notificationSpy.clear(); + + agentInterface->GetSecrets( +@@ -329,14 +350,7 @@ TEST_F(TestSecretAgent, MultiSecrets) { + SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(), + 5); + +- if (notificationSpy.empty()) +- { +- ASSERT_TRUE(notificationSpy.wait()); +- } +- if (notificationSpy.size() == 1) +- { +- ASSERT_TRUE(notificationSpy.wait()); +- } ++ WAIT_FOR_SIGNALS(notificationSpy, 2); + + ASSERT_EQ(2, notificationSpy.size()); + const QVariantList &closecall(notificationSpy.at(1)); +@@ -347,11 +361,15 @@ TEST_F(TestSecretAgent, MultiSecrets) { + } + + TEST_F(TestSecretAgent, SaveSecrets) { ++ setupSecretAgent(); ++ + agentInterface->SaveSecrets(QVariantDictMap(), + QDBusObjectPath("/connection/foo")).waitForFinished(); + } + + TEST_F(TestSecretAgent, DeleteSecrets) { ++ setupSecretAgent(); ++ + agentInterface->DeleteSecrets(QVariantDictMap(), + QDBusObjectPath("/connection/foo")).waitForFinished(); + } +-- +2.47.1 + diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index f07cd148290a..5ae4396f939d 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; + patches = [ + ./1001-test-secret-agent-Make-GetServerInformation-not-leak-into-tests.patch + ]; + postPatch = '' # Override original prefixes substituteInPlace data/CMakeLists.txt \ diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index b7d7792aef09..9beecc88fe05 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "lximage-qt"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-08HEPTbZw4CCq3A9KxMKeT/X1notXwsV1sSSgtRFPO0="; + hash = "sha256-Y9lBXEROC4LIl1M7js0TvJBBNyO06qCWpHxvQjcYPhc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 49bb815f1eb2..dd3cb3190bc6 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "lxqt-runner"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-NsAlaoWMvisRZ04KkrQzwi5B2eXnaHqg0HtYG4NKLcs="; + hash = "sha256-AJLm6bjlM6cq9PNrM8eyvX4xN6lUxVSzgJs4+p/11ug="; }; nativeBuildInputs = [ diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index ca413d532f6b..e8f49d2337b0 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -10,8 +10,13 @@ pname = "equations"; owner = "mattam82"; repo = "Coq-Equations"; + opam-name = "rocq-equations"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { + case = "9.0"; + out = "1.3.1+9.0"; + } { case = "8.20"; out = "1.3.1+8.20"; @@ -117,9 +122,14 @@ release."1.3+8.19".sha256 = "sha256-roBCWfAHDww2Z2JbV5yMI3+EOfIsv3WvxEcUbBiZBsk="; release."1.3.1+8.20".rev = "v1.3.1-8.20"; release."1.3.1+8.20".sha256 = "sha256-u8LB1KiACM5zVaoL7dSdHYvZgX7pf30VuqtjLLGuTzc="; + release."1.3.1+9.0".rev = "v1.3.1-9.0"; + release."1.3.1+9.0".sha256 = "sha256-186Z0/wCuGAjIvG1LoYBMPooaC6HmnKWowYXuR0y6bA="; mlPlugin = true; + useDuneifVersion = + v: v != null && (v == "dev" || lib.versionAtLeast v "1.3.1+9.0"); + propagatedBuildInputs = [ stdlib ]; meta = with lib; { @@ -128,8 +138,12 @@ maintainers = with maintainers; [ jwiegley ]; }; }).overrideAttrs - (o: { + (o: if o.version != null && o.version != "dev" + && !(lib.versionAtLeast o.version "1.3.1+9.0") then { preBuild = "coq_makefile -f _CoqProject -o Makefile${ lib.optionalString (lib.versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq" }"; + } else { + propagatedBuildInputs = o.propagatedBuildInputs + ++ [ coq.ocamlPackages.ppx_optcomp ]; }) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index beda04f5598d..f454bfe9ce3b 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2565,14 +2565,14 @@ buildLuarocksPackage { lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lze"; - version = "0.4.5-1"; + version = "0.6.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lze-0.4.5-1.rockspec"; - sha256 = "1r029y9d8dvl5ynwspxq6168x0bg3qyf5m1x9yrqvb52mk0dyhbq"; + url = "mirror://luarocks/lze-0.6.3-1.rockspec"; + sha256 = "1g1snlzpqkmb3wlahdz2zd2ivrz1kqvszriznix612ziwd6i9iij"; }).outPath; src = fetchzip { - url = "https://github.com/BirdeeHub/lze/archive/v0.4.5.zip"; - sha256 = "0lsy7ikwqnpis8mwha4sl5i0v6x51xxravnsdjvy6fvcr6jbp51r"; + url = "https://github.com/BirdeeHub/lze/archive/v0.6.3.zip"; + sha256 = "02rjd1z4dznacn9m8smd141qaml9jyfgbgyb3vrxnx8irh50mbzl"; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 5581c6e9d695..89373478f71c 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -133,6 +133,8 @@ mapAliases { inherit (pkgs) kaput-cli; # added 2024-12-03 karma = pkgs.karma-runner; # added 2023-07-29 leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31 + less = pkgs.lessc; # added 2024-06-15 + less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15 inherit (pkgs) lv_font_conv; # added 2024-06-28 manta = pkgs.node-manta; # Added 2023-05-06 inherit (pkgs) markdown-link-check; # added 2024-06-28 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 490656679cc4..45e3f8ec7c4c 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -32,7 +32,6 @@ graphql-language-service-cli = "graphql-lsp"; grunt-cli = "grunt"; gulp-cli = "gulp"; - less = "lessc"; localtunnel = "lt"; lua-fmt = "luafmt"; parsoid = "parse.js"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 0e37a6f244cf..7e2bc43159b8 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -116,8 +116,6 @@ , "keyoxide" , "lcov-result-merger" , "lerna" -, "less" -, "less-plugin-clean-css" , "live-server" , "livedown" , "localtunnel" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3a0116e0dee0..1632c672f57e 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -69097,65 +69097,6 @@ in bypassCache = true; reconstructLock = true; }; - less = nodeEnv.buildNodePackage { - name = "less"; - packageName = "less"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-4.2.0.tgz"; - sha512 = "P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA=="; - }; - dependencies = [ - sources."copy-anything-2.0.6" - sources."errno-0.1.8" - sources."graceful-fs-4.2.11" - sources."iconv-lite-0.6.3" - sources."image-size-0.5.5" - sources."is-what-3.14.1" - sources."make-dir-2.1.0" - sources."mime-1.6.0" - sources."needle-3.3.1" - sources."parse-node-version-1.0.1" - sources."pify-4.0.1" - sources."prr-1.0.1" - sources."safer-buffer-2.1.2" - sources."sax-1.4.1" - sources."semver-5.7.2" - sources."source-map-0.6.1" - sources."tslib-2.7.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Leaner CSS"; - homepage = "http://lesscss.org"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - less-plugin-clean-css = nodeEnv.buildNodePackage { - name = "less-plugin-clean-css"; - packageName = "less-plugin-clean-css"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.6.0.tgz"; - sha512 = "jwXX6WlXT57OVCXa5oBJBaJq1b4s1BOKeEEoAL2UTeEitogQWfTcBbLT/vow9pl0N0MXV8Mb4KyhTGG0YbEKyQ=="; - }; - dependencies = [ - sources."clean-css-5.3.3" - sources."source-map-0.6.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "clean-css plugin for less.js"; - homepage = "https://lesscss.org"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; live-server = nodeEnv.buildNodePackage { name = "live-server"; packageName = "live-server"; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index f3f0651f4fdc..f74760c014ef 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -17,13 +17,13 @@ buildDunePackage rec { pname = "eliom"; - version = "11.1.0"; + version = "11.1.1"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-q8XLkyE5GE7NmU+v5221mkMrm2pK0Loh+RsS++PZp+Q="; + hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/php-packages/php-codesniffer/default.nix b/pkgs/development/php-packages/php-codesniffer/default.nix index bfa8eab74c9d..c5bd03de8a1a 100644 --- a/pkgs/development/php-packages/php-codesniffer/default.nix +++ b/pkgs/development/php-packages/php-codesniffer/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "php-codesniffer"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "PHPCSStandards"; repo = "PHP_CodeSniffer"; tag = "${finalAttrs.version}"; - hash = "sha256-/rUkAQvdVMjeIS9UIKjTgk2D9Hb6HfQBRUXqbDYTAmg="; + hash = "sha256-yOi3SFBZfE6WhmMRHt0z86UJPnDnc9hXHtzYe5Ess6c="; }; - vendorHash = "sha256-t5v+HyzOwa6+z5+PtEAAs9wSKxNBZ++tNc2iGO3tspY="; + vendorHash = "sha256-XAyRbfISIpIa4H9IX4TvpDnHhLj6SdqyKlpyG68mnUM="; meta = { changelog = "https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 349535b88b7b..63ff80082b05 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; tag = finalAttrs.version; - hash = "sha256-pc65TtMFsei338t73kjKO8agPhyvYfJrtKleQG7ZLlY="; + hash = "sha256-Wh0dBO5tokAJXxndL5QsgWUiYh0cE4B4EDmHKGC6uFk="; }; - vendorHash = "sha256-HclF1hXWKwfq+r897FV8XMG1I31RyppyDz5LdFj2Sbg="; + vendorHash = "sha256-rkrJ36jugPyZ0v92bPSm4/77POLGqncOGo1PBQQdsds="; composerStrictValidation = false; meta = { diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix index 87464e23549a..026157783d23 100644 --- a/pkgs/development/php-packages/tideways/default.nix +++ b/pkgs/development/php-packages/tideways/default.nix @@ -23,7 +23,7 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-php"; extensionName = "tideways"; - version = "5.17.0"; + version = "5.17.2"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -43,15 +43,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz"; - hash = "sha256-zWmGGSSvV48dSU+Ox2ypPcIxVzr0oru9Eaoh1hQ+WgI="; + hash = "sha256-Uo9GWpT3TV2+NCaAaFeWwcoyya4ZMrhOOMI5PtJ5WEo="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz"; - hash = "sha256-xGkyLBy5oXVXs3VHT6fVg82H7Dmfc8VGHV9CEfw3ETY="; + hash = "sha256-p1ng6v2GkoqoH3WuGT3d/ZqD6lbpqS4PIlq9Fodpkog="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz"; - hash = "sha256-StVPDWGKseagnkEi9dUX2dvu0+tIN8xxUTWmxKW1kDM="; + hash = "sha256-T43HwPKB5LOqR7wA1Gw5eTzIEc5kmn+uGZik1b6dwB4="; }; }; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index f7fe6970a33a..2e2645e304f4 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.137"; + version = "9.2.138"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; tag = "v${version}"; - hash = "sha256-5/dJFjqLIDafjzapsuSNz5YnaA9faDAgkW01tpHUHrA="; + hash = "sha256-EFynGM265FNUgBrofp0nFhamom26yse9sMDympXM1rk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix index 32bb612d8c8b..da49c8107a1d 100644 --- a/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.30"; + version = "0.0.32"; pyproject = true; src = fetchFromGitHub { owner = "mkmer"; repo = "AIOSomecomfort"; tag = version; - hash = "sha256-1hKJG1F0tLHVvgaI3m82/11KUmm99zwn26z9G279Cig="; + hash = "sha256-5hWnKv5ZOfPvBfDQ/0mUAYbPtjMFd1/RdriQ1APIXXg="; }; build-system = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 3bfeffe564ba..e514838c4d6a 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.137"; + version = "9.2.138"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; tag = "v${version}"; - hash = "sha256-RIsgE/WE7QEmOIyujLObnpTpUR0GgUbavPmgs9QwakE="; + hash = "sha256-zJH54+IoMhYNpJE8CJF/Eq2Re152QO1K0JEN2JlFg5c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 22af7df5bbdf..e30c41f015d5 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.137"; + version = "9.2.138"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; tag = "v${version}"; - hash = "sha256-NVOq1yiyjuDVwcgkHS1z2cgG0PipR34hV1DWODhvgtY="; + hash = "sha256-BnmYUvXji+YFBGXyJ0P1y+OIREsT2RYa/hdxwpUacT0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/changelog-chug/default.nix b/pkgs/development/python-modules/changelog-chug/default.nix index 11301d2b4190..3a08569a8441 100644 --- a/pkgs/development/python-modules/changelog-chug/default.nix +++ b/pkgs/development/python-modules/changelog-chug/default.nix @@ -21,6 +21,10 @@ buildPythonPackage rec { repo = "changelog-chug"; rev = "release/${version}"; hash = "sha256-SPwFkmRQMpdsVmzZE4mB2J9wsfvE1K21QDkOQ2XPlow="; + # HACK: sourcehut can't generate tarballs from tags with slashes properly, + # so force using git clone. + # See: https://todo.sr.ht/~sircmpwn/git.sr.ht/323 + fetchSubmodules = true; }; build-system = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 558059d4e083..09c00fea692a 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.137"; + version = "9.2.138"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; tag = "v${version}"; - hash = "sha256-XyOowwIHlGKKJ3IAdvr9LAzNA6jr/P1qzscCr9Z2Pmk="; + hash = "sha256-1nIREzUeUzfMu7gqrbAMJvKNnboavQRL8c2GDhH0Xs0="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index db4635ca46d9..aa9c703f1313 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.137"; + version = "9.2.138"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-pvjxP237GUfWh5weGTtIH+RI/vzsg+L2xJvKNTh7ACE="; + hash = "sha256-Dfo8JTTjq4JsMx3OjFn8G/3PBlLCRVRkEjJdEroSp/c="; }; in buildPythonPackage rec { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-nWkzJZXvMj7Pj6A2RgWVZSkXazzmi+exirzYiCchkD8="; + hash = "sha256-NVDLKA2BMgCB0k0LNPqYVIVWyiqdOHssIT/7Vx2/oWo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index f52f290be8d5..3c72369dcd44 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -8,6 +8,7 @@ pyyaml, openssh, unittestCheckHook, + installShellFiles, bc, hostname, bash, @@ -15,13 +16,13 @@ buildPythonPackage rec { pname = "clustershell"; - version = "1.9.2"; + version = "1.9.3"; pyproject = true; src = fetchPypi { pname = "ClusterShell"; inherit version; - hash = "sha256-rsF/HG4GNBC+N49b+sDO2AyUI1G44wJNBUwQNPzShD0="; + hash = "sha256-4oTA5rP+CgzWvmffcd+/aqMhGIlz22g6BX9WN1UvvIw="; }; build-system = [ @@ -51,6 +52,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; + nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ bc hostname @@ -80,6 +83,10 @@ buildPythonPackage rec { rm tests/TreeGatewayTest.py ''; + postInstall = '' + installShellCompletion --bash bash_completion.d/* + ''; + meta = with lib; { broken = stdenv.hostPlatform.isDarwin; description = "Scalable Python framework for cluster administration"; diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix index 0989d978445b..8192377125f5 100644 --- a/pkgs/development/python-modules/dm-tree/default.nix +++ b/pkgs/development/python-modules/dm-tree/default.nix @@ -1,9 +1,7 @@ { lib, buildPythonPackage, - fetchpatch, fetchFromGitHub, - stdenv, # nativeBuildInputs cmake, @@ -15,41 +13,35 @@ # build-system setuptools, - # checks + # dependencies absl-py, attrs, numpy, wrapt, }: -let - patchCMakeAbseil = fetchpatch { - name = "0001-don-t-rebuild-abseil.patch"; - url = "https://raw.githubusercontent.com/conda-forge/dm-tree-feedstock/93a91aa2c13240cecf88133e2885ade9121b464a/recipe/patches/0001-don-t-rebuild-abseil.patch"; - hash = "sha256-bho7lXAV5xHkPmWy94THJtx+6i+px5w6xKKfThvBO/M="; - }; - patchCMakePybind = fetchpatch { - name = "0002-don-t-fetch-pybind11.patch"; - url = "https://raw.githubusercontent.com/conda-forge/dm-tree-feedstock/93a91aa2c13240cecf88133e2885ade9121b464a/recipe/patches/0002-don-t-fetch-pybind11.patch"; - hash = "sha256-41XIouQ4Fm1yewaxK9erfcnkGBS6vgdvMm/DyF0rsKg="; - }; -in buildPythonPackage rec { pname = "dm-tree"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; src = fetchFromGitHub { owner = "deepmind"; repo = "tree"; tag = version; - hash = "sha256-VvSJTuEYjIz/4TTibSLkbg65YmcYqHImTHOomeorMJc="; + hash = "sha256-cHuaqA89r90TCPVHNP7B1cfK+WxqmfTXndJ/dRdmM24="; }; - patches = [ - patchCMakeAbseil - patchCMakePybind - ] ++ (lib.optional stdenv.hostPlatform.isDarwin ./0003-don-t-configure-apple.patch); - + # Allows to forward cmake args through the conventional `cmakeFlags` + postPatch = '' + substituteInPlace setup.py \ + --replace-fail \ + "cmake_args = [" \ + 'cmake_args = [ *os.environ.get("cmakeFlags", "").split(),' + ''; + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_ABSEIL" true) + (lib.cmakeBool "USE_SYSTEM_PYBIND11" true) + ]; dontUseCmakeConfigure = true; nativeBuildInputs = [ @@ -64,7 +56,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ + # It is unclear whether those are runtime dependencies or simply test dependencies + # https://github.com/google-deepmind/tree/issues/127 + dependencies = [ absl-py attrs numpy diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index 9a359369cb12..1119274198df 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -12,7 +12,7 @@ }: let - version = "1.50.5"; + version = "1.50.6"; tag = version; in buildPythonPackage { @@ -24,7 +24,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-Cew8+L7NoQlvR2pILVmwNIa3WUfZzmEkf1+U2nglsnM="; + hash = "sha256-o+J9UnYWE0/3SXQJtv2sm6xibXUPG1V1T7d+SXyBW50="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/iopath/default.nix b/pkgs/development/python-modules/iopath/default.nix index ffc33c52f882..2f18e9de0744 100644 --- a/pkgs/development/python-modules/iopath/default.nix +++ b/pkgs/development/python-modules/iopath/default.nix @@ -13,7 +13,7 @@ }: let pname = "iopath"; - version = "0.1.9"; + version = "0.1.10"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { owner = "facebookresearch"; repo = "iopath"; tag = "v${version}"; - hash = "sha256-Qubf/mWKMgYz9IVoptMZrwy4lQKsNGgdqpJB1j/u5s8="; + hash = "sha256-vJV0c+dCFO0wOHahKJ8DbwT2Thx3YjkNLVSpQv9H69g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 2a297b2f4617..a0eab7688b1b 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -58,7 +58,6 @@ buildPythonPackage rec { optional-dependencies = { betamax = [ betamax - fixtures pyyaml ]; kerberos = [ requests-kerberos ]; @@ -67,6 +66,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + fixtures hacking oslo-config oslo-utils diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 7b96e00577b0..f0a14e85611e 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.9"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; tag = "v${version}"; - hash = "sha256-7fRn7KvB7CEq8keVR8nrf6IY2G8omAQqNX+DPEf+7nc="; + hash = "sha256-Uu5VhrETDOYnTwjSSKkJx08yjt7cpgP2fmkpRyDepaI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index ac9d47f9c7b7..fc00cd17894f 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -34,16 +34,16 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.5.10"; + version = "2.5.11"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "meshtastic"; - repo = "Meshtastic-python"; + repo = "python"; tag = version; - hash = "sha256-uXyHblcV5qm/NJ/zYsPIr12lqI914n6KYxl4gun7XdM="; + hash = "sha256-qV+yueBaBRiFdpnvgyhoh4IkoMihG030ZqxTqQR+UsY="; }; pythonRelaxDeps = [ @@ -123,7 +123,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for talking to Meshtastic devices"; - homepage = "https://github.com/meshtastic/Meshtastic-python"; + homepage = "https://github.com/meshtastic/python"; changelog = "https://github.com/meshtastic/python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/nice-go/default.nix b/pkgs/development/python-modules/nice-go/default.nix index 9d70d035bc65..7412237b72d2 100644 --- a/pkgs/development/python-modules/nice-go/default.nix +++ b/pkgs/development/python-modules/nice-go/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nice-go"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "IceBotYT"; repo = "nice-go"; tag = version; - hash = "sha256-u4AhFYhRYwcAGUrXhUgP+SgR0aoric864qSyWhc7Gmo="; + hash = "sha256-8hm2kB1axv2oqMLSKmquFLe7jsTFO+HYnCz5vL4ve/A="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 53db33d4d3b0..0d1c36df8028 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -70,8 +70,8 @@ buildPythonPackage rec { (fetchpatch { name = "port-to-embree-4.patch"; # https://github.com/PixarAnimationStudios/OpenUSD/pull/2266 - url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch?full_index=1"; - hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI="; + url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/a07a6b4d1da19bfc499db49641d74fb7c1a71e9b.patch?full_index=1"; + hash = "sha256-Gww6Ll2nKwpcxMY9lnf5BZ3eqUWz1rik9P3mPKDOf+Y="; }) # https://github.com/PixarAnimationStudios/OpenUSD/issues/3442 # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 1 @@ -126,7 +126,6 @@ buildPythonPackage rec { [ alembic.dev bison - boost draco embree flex diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 0f8e2a7a3bb6..694bca9edb1a 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "28.0.0"; + version = "28.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-JA4KH7zxSlxAyKHEsJ4YH8oAI2/s1ELwPrXwmi1HhYo="; + hash = "sha256-FEw9cuCjQCU4vsZFg8/pn8i1g2XMVXno2PDZl8+iZoc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/podgen/default.nix b/pkgs/development/python-modules/podgen/default.nix new file mode 100644 index 000000000000..0a7e23210d09 --- /dev/null +++ b/pkgs/development/python-modules/podgen/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + dateutils, + future, + lxml, + python-dateutil, + pytz, + requests, + tinytag, + pytest-mock, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "podgen"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tobinus"; + repo = "python-podgen"; + tag = "v${version}"; + hash = "sha256-IlTbKWNdEHJmEPdslKphZLB5IVERxNL/wqCMbJDHkD4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + dateutils + future + lxml + python-dateutil + pytz + requests + tinytag + ]; + + pythonImportsCheck = [ "podgen" ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; + + disabledTestPaths = [ + # test requires downloading content + "podgen/tests/test_media.py" + ]; + + meta = { + description = "Python module to generate Podcast feeds"; + downloadPage = "https://github.com/tobinus/python-podgen"; + changelog = "https://github.com/tobinus/python-podgen/blob/v${version}/CHANGELOG.md"; + homepage = "https://podgen.readthedocs.io/en/latest/"; + license = with lib.licenses; [ + bsd2 + lgpl3 + ]; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + }; +} diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index ac723db320d5..6b4396b7a739 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -9,6 +9,7 @@ pytestCheckHook, pythonOlder, setuptools, + typing-extensions, voluptuous, }: @@ -32,6 +33,7 @@ buildPythonPackage rec { aiohttp bitstruct cryptography + typing-extensions voluptuous ]; diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index 9f4fca6cc438..695bbc36890f 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-swiftclient"; version = "4.6.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -23,17 +23,13 @@ buildPythonPackage rec { hash = "sha256-1NGFQEE4k/wWrYd5HXQPgj92NDXoIS5o61PWDaJjgjM="; }; - # remove duplicate script that will be created by setuptools from the - # entry_points section of setup.cfg - postPatch = '' - sed -i '/^scripts =/d' setup.cfg - sed -i '/bin\/swift/d' setup.cfg - ''; - nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ + build-system = [ pbr + ]; + + dependencies = [ python-keystoneclient ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index db95245c55f1..af7113835a74 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.137"; + version = "9.2.138"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-EEdBG1eZxljN5WDvSDECrL9CoFd7sx+TztawXjaDAW0="; + hash = "sha256-2cO6uTlD2IuufCSBpoyP7JsK+0ON06yn2tuV004NjaU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 01061aefd205..e9466cf425fb 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "roadlib"; - version = "0.29.0"; + version = "0.29.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bCdPL9ic1zf6Kzv10bUQI5baqWofGDWk4ipuarsqbeY="; + hash = "sha256-147ej4qRH0pR5jeWd0+RjL8SgMu/eVRw9yFx1qJmy/Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index f7fac9f6394f..b541aca11bc8 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2024.9.16"; + version = "2025.1.29"; pyproject = true; src = fetchPypi { pname = "scikit_fmm"; inherit version; - hash = "sha256-q6hqteXv600iH7xpCKHgRLkJYSpy9hIf/QnlsYI+jh4="; + hash = "sha256-7gTKuObCAahEjfmIL8Azbby3nxJPPh4rjb4x1O4xBQw="; }; build-system = [ meson-python ]; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 45f49fe817c0..f9fb5365f156 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.6"; + version = "0.30.8"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; tag = "v${version}"; - hash = "sha256-3/BDqCYNgICb8NGYR1VJM9MsMRmdvJVruqFXuyG6tIY="; + hash = "sha256-RuPWxa4FC+5knkC9tlUHvk5jtE5jso+6L7JDGXIimKA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tivars/default.nix b/pkgs/development/python-modules/tivars/default.nix new file mode 100644 index 000000000000..50d5bcc88ce8 --- /dev/null +++ b/pkgs/development/python-modules/tivars/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "tivars"; + version = "0.9.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "TI-Toolkit"; + repo = "tivars_lib_py"; + tag = "v${version}"; + hash = "sha256-4c5wRv78Rql9k98WNT58As/Ir1YJpTeoBdkft9TIn7o="; + fetchSubmodules = true; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "tivars" ]; + + # no upstream tests exist + doCheck = false; + + meta = { + description = "Python library for interacting with TI-(e)z80 (82/83/84 series) calculator files"; + license = lib.licenses.mit; + homepage = "https://ti-toolkit.github.io/tivars_lib_py/"; + changelog = "https://github.com/TI-Toolkit/tivars_lib_py/releases/tag/v${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + }; +} diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 55dee632e966..0a21259d8e3a 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.4.3"; + version = "9.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-HgV6GEhtwk2smtzdOypucZBX+kj9lfqsY2sZ9Yl7fbM="; + hash = "sha256-qkbxu2FembYCdGOEaBmAod6HYGaulhcakTLgCHJoZZY="; }; build-system = [ setuptools ]; @@ -59,16 +59,11 @@ buildPythonPackage rec { "test_set_user_agent_extensions" ]; - disabledTestPaths = - [ - # Tests require API token - "tests/cluster/test_webhook.py" - "tests/cluster/test_cluster.py" - ] - ++ lib.optionals (pythonAtLeast "3.11") [ - # aiounittest is not supported on Python 3.12 - "tests/unit/http/test_async_http_client.py" - ]; + disabledTestPaths = [ + # Tests require API token + "tests/cluster/test_webhook.py" + "tests/cluster/test_cluster.py" + ]; pythonImportsCheck = [ "twilio" ]; diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 4d1fde322382..1b5b01a7d77f 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -86,5 +86,16 @@ "x86_64-linux": "13b99da4a78dae9bf0960309cd1e9476faf5f7260bbf930bd302189d490ff77c" }, "version": "33.3.2" + }, + "34": { + "hashes": { + "aarch64-darwin": "604e5f6c706383dd7a86c3b9a59f60525c687f65907b60ccdabf43358dbb8661", + "aarch64-linux": "98e711d7678670572b873aec1e4df3a2fa0002b88bc6283dbff8fc13ac401670", + "armv7l-linux": "cc3bb0110fafbf5a9ef6576470b82864dacb6380cc312650d6b0cdf404ac9d9f", + "headers": "1zcm8j3qqvy6y5jgdj9aypbqa1sq4wkk9ynj0382wnk994bzjs86", + "x86_64-darwin": "3b34acc7908a311e05509cab9e1926604113e1f650b4dbe1ecfde1dbf4397c37", + "x86_64-linux": "74e55edc5d7cf9e63ba61f1a670134779109fcf33990e568f1992c46c1d31b89" + }, + "version": "34.0.2" } } diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 6b459fc65606..96a57f01acd9 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -53,5 +53,16 @@ "x86_64-linux": "85e3d980a43f4792d1b6246a50dad745653c0e13b95dbc37adadc78078cfcc99" }, "version": "33.3.2" + }, + "34": { + "hashes": { + "aarch64-darwin": "ae2ccc17a7f391869cf6cfe41d4b7c25013ccbf36861b5007fcdf62ac4db9eb0", + "aarch64-linux": "904c101b206e9d4de088c06ac6886563493e5abaac537cb55f129a8cfd2620c0", + "armv7l-linux": "0a295dc16833384dc51ac6baa0d7025f9767b587c30ac857d1461b41bc3246af", + "headers": "1zcm8j3qqvy6y5jgdj9aypbqa1sq4wkk9ynj0382wnk994bzjs86", + "x86_64-darwin": "f6419dca74fcd4affeb9c4a061abc343e52031cdc36d4abb01ece2b9ee731d7c", + "x86_64-linux": "fba4a47b7762142f4ca01f405746b99ddb36e0860316952c2118b4b90840897d" + }, + "version": "34.0.2" } } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 37288631397c..070dc6279edb 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -100,6 +100,7 @@ tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json; tree-sitter-talon = lib.importJSON ./tree-sitter-talon.json; tree-sitter-templ = lib.importJSON ./tree-sitter-templ.json; + tree-sitter-tera = lib.importJSON ./tree-sitter-tera.json; tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json; tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json; tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json new file mode 100644 index 000000000000..8624f790709e --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/uncenter/tree-sitter-tera", + "rev": "e8d679a29c03e64656463a892a30da626e19ed8e", + "date": "2024-12-29T18:16:18-05:00", + "path": "/nix/store/r0cf0nb4r9wvy0f1pb207f3yj0sx3j4z-tree-sitter-tera", + "sha256": "0lz6x2yd9rjklc1821x6jd577820izv5bmwhf957gxj0nlrixhj7", + "hash": "sha256-R8IeM7VA9ndKcpDXVfaPQKBzSpOmB4ECo1Pm1Lzo5lM=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 075ce4756b30..3e78029a0074 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -470,6 +470,10 @@ let orga = "tree-sitter-grammars"; repo = "tree-sitter-kdl"; }; + "tree-sitter-tera" = { + orga = "uncenter"; + repo = "tree-sitter-tera"; + }; }; allGrammars = diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix deleted file mode 100644 index 6ad1f4baa330..000000000000 --- a/pkgs/games/ja2-stracciatella/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchFromGitHub, - cmake, - python3, - rustPlatform, - SDL2, - fltk, - rapidjson, - gtest, - Carbon, - Cocoa, -}: -let - version = "0.17.0"; - src = fetchFromGitHub { - owner = "ja2-stracciatella"; - repo = "ja2-stracciatella"; - rev = "v${version}"; - sha256 = "0m6rvgkba29jy3yq5hs1sn26mwrjl6mamqnv4plrid5fqaivhn6j"; - }; - libstracciatella = rustPlatform.buildRustPackage { - pname = "libstracciatella"; - inherit version; - src = "${src}/rust"; - cargoHash = "sha256-asUt+wUpwwDvSyuNZds6yMC4Ef4D8woMYWamzcJJiy4="; - - preBuild = '' - mkdir -p $out/include/stracciatella - export HEADER_LOCATION=$out/include/stracciatella/stracciatella.h - ''; - }; - stringTheoryUrl = "https://github.com/zrax/string_theory/archive/3.1.tar.gz"; - stringTheory = fetchurl { - url = stringTheoryUrl; - sha256 = "1flq26kkvx2m1yd38ldcq2k046yqw07jahms8a6614m924bmbv41"; - }; -in -stdenv.mkDerivation { - pname = "ja2-stracciatella"; - inherit src version; - - nativeBuildInputs = [ - cmake - python3 - ]; - buildInputs = - [ - SDL2 - fltk - rapidjson - gtest - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - ]; - - patches = [ - ./remove-rust-buildstep.patch - ]; - - preConfigure = '' - # Use rust library built with nix - substituteInPlace CMakeLists.txt \ - --replace lib/libstracciatella_c_api.a ${libstracciatella}/lib/libstracciatella_c_api.a \ - --replace include/stracciatella ${libstracciatella}/include/stracciatella \ - --replace bin/ja2-resource-pack ${libstracciatella}/bin/ja2-resource-pack - - # Patch dependencies that are usually loaded by url - substituteInPlace dependencies/lib-string_theory/builder/CMakeLists.txt.in \ - --replace ${stringTheoryUrl} file://${stringTheory} - - cmakeFlagsArray+=("-DLOCAL_RAPIDJSON_LIB=OFF" "-DLOCAL_GTEST_LIB=OFF" "-DEXTRA_DATA_DIR=$out/share/ja2") - ''; - - # error: 'uint64_t' does not name a type - # gcc13 and above don't automatically include cstdint - env.CXXFLAGS = "-include cstdint"; - - doInstallCheck = true; - installCheckPhase = '' - HOME=/tmp $out/bin/ja2 -unittests - ''; - - meta = { - description = "Jagged Alliance 2, with community fixes"; - license = "SFI Source Code license agreement"; - homepage = "https://ja2-stracciatella.github.io/"; - }; -} diff --git a/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch b/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch deleted file mode 100644 index 64e3c11b2502..000000000000 --- a/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4e5547af..a3017d197 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -175,13 +175,12 @@ if(BUILD_LAUNCHER) - endif() - message(STATUS "Fltk Libraries: ${FLTK_LIBRARIES}") - --set(JA2_INCLUDES "") -+set(JA2_INCLUDES "include/stracciatella") - set(JA2_SOURCES "") - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/externalized") - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/game") - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/sgp") - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-smacker") --add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-stracciatella") - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-string_theory") - - if(BUILD_LAUNCHER) -@@ -239,14 +238,12 @@ string(LENGTH "${CMAKE_SOURCE_DIR}/src/" SOURCE_PATH_SIZE) - add_definitions("-DSOURCE_PATH_SIZE=${SOURCE_PATH_SIZE}") - - add_executable(${JA2_BINARY} ${JA2_SOURCES}) --target_link_libraries(${JA2_BINARY} ${SDL2_LIBRARY} ${GTEST_LIBRARIES} smacker ${STRACCIATELLA_LIBRARIES} string_theory-internal) --add_dependencies(${JA2_BINARY} stracciatella) -+target_link_libraries(${JA2_BINARY} ${SDL2_LIBRARY} ${GTEST_LIBRARIES} smacker lib/libstracciatella_c_api.a dl pthread string_theory-internal) - set_property(SOURCE ${CMAKE_SOURCE_DIR}/src/game/GameVersion.cc APPEND PROPERTY COMPILE_DEFINITIONS "GAME_VERSION=v${ja2-stracciatella_VERSION}") - - if(BUILD_LAUNCHER) - add_executable(${LAUNCHER_BINARY} ${LAUNCHER_SOURCES}) -- target_link_libraries(${LAUNCHER_BINARY} ${FLTK_LIBRARIES} ${STRACCIATELLA_LIBRARIES} string_theory-internal) -- add_dependencies(${LAUNCHER_BINARY} stracciatella) -+ target_link_libraries(${LAUNCHER_BINARY} ${FLTK_LIBRARIES} lib/libstracciatella_c_api.a dl pthread string_theory-internal) - endif() - - macro(copy_assets_dir_to_ja2_binary_after_build DIR) -@@ -375,12 +372,12 @@ set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${PACKAGE_ - - include(CPack) - --if (UNIX AND NOT MINGW AND NOT APPLE) -+if (UNIX) - install(TARGETS ${JA2_BINARY} RUNTIME DESTINATION bin) - if(BUILD_LAUNCHER) - install(TARGETS ${LAUNCHER_BINARY} RUNTIME DESTINATION bin) - endif() -- install(PROGRAMS "${CMAKE_BINARY_DIR}/lib-stracciatella/bin/ja2-resource-pack${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION bin) -+ install(PROGRAMS "bin/ja2-resource-pack" DESTINATION bin) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/assets/externalized assets/mods assets/unittests DESTINATION share/ja2) - if(WITH_EDITOR_SLF) - install(FILES "${EDITORSLF_FILE}" DESTINATION share/ja2) -@@ -400,7 +397,7 @@ else() - if(BUILD_LAUNCHER) - install(TARGETS ${LAUNCHER_BINARY} RUNTIME DESTINATION .) - endif() -- install(PROGRAMS "${CMAKE_BINARY_DIR}/lib-stracciatella/bin/ja2-resource-pack${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION .) -+ install(PROGRAMS "bin/ja2-resource-pack" DESTINATION .) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/assets/externalized assets/mods assets/unittests DESTINATION .) - if(WITH_EDITOR_SLF) - install(FILES "${EDITORSLF_FILE}" DESTINATION .) -@@ -428,12 +425,6 @@ if (MINGW) - install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install-dlls-mingw.cmake") - endif() - --if(APPLE) -- file(GLOB APPLE_DIST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/distr-files-mac/*.txt") -- install(FILES ${APPLE_DIST_FILES} DESTINATION .) -- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-SDL2-2.0.8-macos/SDL2.framework DESTINATION .) --endif() -- - ## Uninstall - - add_custom_templated_target("uninstall") diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index a97f70a0bd29..12ee477f6868 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -107,11 +107,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.82"; + version = "550.40.83"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-+lvADY8k3Wfc1wuDLHC8xP1BPK/la3ZJmHvZ3zqQJ+I="; - openSha256 = "sha256-wTNAMI3J83v3lhKJ1yKgrL2V+mzLr3MeCT7oLlEasFw="; + sha256_64bit = "sha256-2zfiVA7H4erkdbqyNH+2MHexclT+ZF2PifYkD5Dmo7M="; + openSha256 = "sha256-Tqj8g/KUOtUc815tZo1wOrj7XMbDp7JL7oq7t3h1r+I="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix index 7e2fbc3da940..9983e1f4e13e 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wuwentao"; domain = "midea_ac_lan"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { inherit owner; repo = domain; tag = "v${version}"; - hash = "sha256-BOKGALMrJg2zhcF6E874xaBpqNDivToCQhBP8kh4oJY="; + hash = "sha256-GksX+RmQ7lcyuUL3vu9b1q3c56W9yB2Hg20DUNTeOxY="; }; dependencies = [ midea-local ]; diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json deleted file mode 100644 index c94e6f85b81f..000000000000 --- a/pkgs/servers/nextcloud/packages/28.json +++ /dev/null @@ -1,372 +0,0 @@ -{ - "bookmarks": { - "hash": "sha256-T0XDgDnAAI3ifOwz6BNCtjj6ZDXOhhUSLRIJKdD4qaQ=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.7/bookmarks-14.2.7.tar.gz", - "version": "14.2.7", - "description": "- πŸ“‚ Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- πŸ“² Synchronize with all your browsers and devices\n- πŸ“” Store archived versions of your links in case they are depublished\n- πŸ” Full-text search on site contents\n- πŸ‘ͺ Share bookmarks with other users and via public links\n- βš› Generate RSS feeds of your collections\n- πŸ“ˆ Stats on how often you access which links\n- πŸ”’ Automatic backups of your bookmarks collection\n- πŸ’Ό Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", - "homepage": "https://github.com/nextcloud/bookmarks", - "licenses": [ - "agpl" - ] - }, - "calendar": { - "hash": "sha256-NwXTuSHl278Q2Wko4DC3rzqvNHnDI513UJ+8/3Rp5/U=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.16/calendar-v4.7.16.tar.gz", - "version": "4.7.16", - "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": [ - "agpl" - ] - }, - "collectives": { - "hash": "sha256-IAnJZuaj6KW6kF4daIKxvCEDCViWu30gogm8q2/ooQs=", - "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.0/collectives-2.16.0.tar.gz", - "version": "2.16.0", - "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* πŸ‘₯ **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* πŸ“ **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* πŸ”€ **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **Β»AppsΒ«**, find the\n**Β»TeamsΒ«** and **Β»CollectivesΒ«** apps and enable them.", - "homepage": "https://github.com/nextcloud/collectives", - "licenses": [ - "agpl" - ] - }, - "contacts": { - "hash": "sha256-zxmgMiizzXGfReRS9XJ+fb6tJRLH/Z5NvuLpspYARFI=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.3/contacts-v5.5.3.tar.gz", - "version": "5.5.3", - "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", - "homepage": "https://github.com/nextcloud/contacts#readme", - "licenses": [ - "agpl" - ] - }, - "cookbook": { - "hash": "sha256-upbTdzu17BH6tehgCUcTxBvTVOO31Kri/33vGd4Unyw=", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz", - "version": "0.11.2", - "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", - "homepage": "https://github.com/nextcloud/cookbook/", - "licenses": [ - "agpl" - ] - }, - "cospend": { - "hash": "sha256-J6w+ZqFNZbJeaPuZOZ4OQ+O+VhIQ0XajqYZuHqvjL24=", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.6.1/cospend-1.6.1.tar.gz", - "version": "1.6.1", - "description": "# Nextcloud Cospend πŸ’°\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be shared with other Nextcloud users or via public links.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\n\n## Features\n\n* ✎ Create/edit/delete projects, members, bills, bill categories, currencies\n* βš– Check member balances\n* πŸ—  Display project statistics\n* β™» Display settlement plan\n* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* πŸŽ‡ Automatically create reimbursement bills from settlement plan\n* πŸ—“ Create recurring bills (day/week/month/year)\n* πŸ“Š Optionally provide custom amount for each member in new bills\n* πŸ”— Link personal files to bills (picture of physical receipt for example)\n* πŸ‘© Public links for people outside Nextcloud (can be password protected)\n* πŸ‘« Share projects with Nextcloud users/groups/circles\n* πŸ–« Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* πŸ”— Generate link/QRCode to easily add projects in MoneyBuster\n* πŸ—² Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* It does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", - "homepage": "https://github.com/julien-nc/cospend-nc", - "licenses": [ - "agpl" - ] - }, - "deck": { - "hash": "sha256-63yeX5w8nOdZuzbICJ6hJCjIHzigBKJToTPoEVPm/EE=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.6/deck-v1.12.6.tar.gz", - "version": "1.12.6", - "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- πŸ“₯ Add your tasks to cards and put them in order\n- πŸ“„ Write down additional notes in markdown\n- πŸ”– Assign labels for even better organization\n- πŸ‘₯ Share with your team, friends or family\n- πŸ“Ž Attach files and embed them in your markdown description\n- πŸ’¬ Discuss with your team using comments\n- ⚑ Keep track of changes in the activity stream\n- πŸš€ Get your project organized", - "homepage": "https://github.com/nextcloud/deck", - "licenses": [ - "agpl" - ] - }, - "end_to_end_encryption": { - "hash": "sha256-+4RlbVoCnncygsPWdLCWgKZXXaC10risgd4b8uMRJO0=", - "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.14.5/end_to_end_encryption-v1.14.5.tar.gz", - "version": "1.14.5", - "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", - "homepage": "https://github.com/nextcloud/end_to_end_encryption", - "licenses": [ - "agpl" - ] - }, - "files_mindmap": { - "hash": "sha256-USwTVkcEDzmaJMMaztf86yag5t7b79sQW8OOHEw0hec=", - "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.31/files_mindmap-0.0.31.tar.gz", - "version": "0.0.31", - "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", - "homepage": "https://github.com/ACTom/files_mindmap", - "licenses": [ - "agpl" - ] - }, - "forms": { - "hash": "sha256-NW57bhZiNqKfUhMvGN9Ncy21Y0GucC/CFCmHTf8kJ2I=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.4/forms-v4.3.4.tar.gz", - "version": "4.3.4", - "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": [ - "agpl" - ] - }, - "gpoddersync": { - "hash": "sha256-U4YzTec7mvslXk6LC5/YlIRzrbOhABHK3ZZ1zYR3JYU=", - "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.11.0/gpoddersync.tar.gz", - "version": "3.11.0", - "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", - "homepage": "https://github.com/thrillfall/nextcloud-gpodder", - "licenses": [ - "agpl" - ] - }, - "groupfolders": { - "hash": "sha256-YC+ANDzF9OsBlwx8GnkNNws1j1Ews1z7leYDfh6w0X4=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.12/groupfolders-v16.0.12.tar.gz", - "version": "16.0.12", - "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": [ - "agpl" - ] - }, - "impersonate": { - "hash": "sha256-fJ96PmkRvgmoIYmF7r/zOQ88/tjb6d0+sQ1YbKq8sY8=", - "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.15.0/impersonate-v1.15.0.tar.gz", - "version": "1.15.0", - "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", - "homepage": "https://github.com/nextcloud/impersonate", - "licenses": [ - "agpl" - ] - }, - "integration_openai": { - "hash": "sha256-qU86h6DHNetWOmt7yXCknQ3MBB9KdQ15UDJggqZgWMk=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.3/integration_openai-v2.0.3.tar.gz", - "version": "2.0.3", - "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLΒ·E via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟑\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟒\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟑\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟑\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\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/integration_openai", - "licenses": [ - "agpl" - ] - }, - "integration_paperless": { - "hash": "sha256-D8w2TA2Olab326REnHHG+fFWRmWrhejAEokXZYx5H6w=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.4/integration_paperless-v1.0.4.tar.gz", - "version": "1.0.4", - "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", - "homepage": "", - "licenses": [ - "agpl" - ] - }, - "mail": { - "hash": "sha256-59ra95yAOnHG+a6sSK6dJmmZ7qqUqtanfrw1jjpTjQ0=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.17/mail-v3.7.17.tar.gz", - "version": "3.7.17", - "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": [ - "agpl" - ] - }, - "maps": { - "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.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", - "licenses": [ - "agpl" - ] - }, - "memories": { - "hash": "sha256-VMaOC+sCh84SsKjJk/pC3BwYRWRkqbCJPRgptI9dppA=", - "url": "https://github.com/pulsejet/memories/releases/download/v7.4.1/memories.tar.gz", - "version": "7.4.1", - "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **πŸ“Έ Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **βͺ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **πŸ€– AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **πŸ–ΌοΈ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **πŸ«±πŸ»β€πŸ«²πŸ» External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **πŸ“± Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **πŸ“¦ Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **πŸ“Ή Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **πŸ—ΊοΈ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **πŸ“¦ Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚑️ Performance**: Do all this very fast.\n\n## πŸš€ Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the πŸ“· Memories app in Nextcloud and set the directory containing your photos.", - "homepage": "https://memories.gallery", - "licenses": [ - "agpl" - ] - }, - "music": { - "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", - "version": "2.0.1", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", - "homepage": "https://github.com/owncloud/music", - "licenses": [ - "agpl" - ] - }, - "notes": { - "hash": "sha256-dpMCehjhPQoOA+MVdLeGc370hmqWzmsMczgV08m/cO4=", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz", - "version": "4.11.0", - "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", - "homepage": "https://github.com/nextcloud/notes", - "licenses": [ - "agpl" - ] - }, - "notify_push": { - "hash": "sha256-5VjDDU8YpSDHSV45GKP+YDSd9bq1F3/qLppaLiBzjy4=", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.7.0/notify_push-v0.7.0.tar.gz", - "version": "0.7.0", - "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", - "homepage": "", - "licenses": [ - "agpl" - ] - }, - "onlyoffice": { - "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", - "version": "9.5.0", - "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", - "homepage": "https://www.onlyoffice.com", - "licenses": [ - "agpl" - ] - }, - "phonetrack": { - "hash": "sha256-zQt+3t86HZJVT/wiETHkPdTwV6Qy+iNkH3/THtTe1Xs=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz", - "version": "0.8.1", - "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* πŸ“ Display location history\n* β›› Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* β›Ά Define geofencing zones for devices\n* βš‡ Define proximity alerts for device pairs\n* πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n* πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n* πŸ—  Display sessions statistics\n* πŸ”’ [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n* β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", - "homepage": "https://github.com/julien-nc/phonetrack", - "licenses": [ - "agpl" - ] - }, - "polls": { - "hash": "sha256-l0oK9go7NVkTJCyC1sagWwZpa/R5ZQsXTOishNSpYuw=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.6/polls-v7.2.6.tar.gz", - "version": "7.2.6", - "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", - "homepage": "https://github.com/nextcloud/polls", - "licenses": [ - "agpl" - ] - }, - "previewgenerator": { - "hash": "sha256-kTYmN/tAJwjj2KwnrKVIZa5DhyXHjuNWNskqJZxs4sY=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.7.0/previewgenerator-v5.7.0.tar.gz", - "version": "5.7.0", - "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", - "homepage": "https://github.com/nextcloud/previewgenerator", - "licenses": [ - "agpl" - ] - }, - "qownnotesapi": { - "hash": "sha256-ydz8e8ZOLOT60yt55DI0gGpSaLz9sCz5Zyt1jhMYIv0=", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.11.0/qownnotesapi-nc.tar.gz", - "version": "24.11.0", - "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", - "homepage": "https://github.com/pbek/qownnotesapi", - "licenses": [ - "agpl" - ] - }, - "registration": { - "hash": "sha256-4MLNKwYx/3hqnrcF2TpTCKOMveWINvWo71aOXcBO79E=", - "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.4.0/registration-v2.4.0.tar.gz", - "version": "2.4.0", - "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", - "homepage": "https://github.com/nextcloud/registration", - "licenses": [ - "agpl" - ] - }, - "richdocuments": { - "hash": "sha256-rPo5Hex/S/9yU5CVVHJcqJ0aCvrzncHXca2LOm8pOhE=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.13/richdocuments-v8.3.13.tar.gz", - "version": "8.3.13", - "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": [ - "agpl" - ] - }, - "spreed": { - "hash": "sha256-8Y6bBj9IiGkLbxyNUhVRpBuDqDU1ZCAbXxk9/Oi3yGM=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.13/spreed-v18.0.13.tar.gz", - "version": "18.0.13", - "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", - "homepage": "https://github.com/nextcloud/spreed", - "licenses": [ - "agpl" - ] - }, - "tasks": { - "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=", - "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz", - "version": "0.16.1", - "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", - "homepage": "https://github.com/nextcloud/tasks/", - "licenses": [ - "agpl" - ] - }, - "twofactor_nextcloud_notification": { - "hash": "sha256-4fXWgDeiup5/Gm9hdZDj/u07rp/Nzwly53aLUT/d0IU=", - "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.9.0/twofactor_nextcloud_notification-v3.9.0.tar.gz", - "version": "3.9.0", - "description": "Allows using any of your logged in devices as second factor", - "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", - "licenses": [ - "agpl" - ] - }, - "twofactor_webauthn": { - "hash": "sha256-2qvP6xZO7ZdCZkOSP4FNqyjZ0GMcw/FDSy67JDrlM04=", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.4.0/twofactor_webauthn-v1.4.0.tar.gz", - "version": "1.4.0", - "description": "A two-factor provider for WebAuthn devices", - "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", - "licenses": [ - "agpl" - ] - }, - "unroundedcorners": { - "hash": "sha256-sdgc2ENnRkcQnopbqsn/FHYDoiKqeKfYEontFy0cYU4=", - "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.3/unroundedcorners-v1.1.3.tar.gz", - "version": "1.1.3", - "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.", - "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners", - "licenses": [ - "agpl" - ] - }, - "unsplash": { - "hash": "sha256-hUKpIGvu7aX45Pz/xCssOuyZ7E+kJ4cmqhhycX5DG6A=", - "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.3/unsplash.tar.gz", - "version": "3.0.3", - "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", - "homepage": "https://github.com/nextcloud/unsplash/", - "licenses": [ - "agpl" - ] - }, - "user_oidc": { - "hash": "sha256-hdFEruRfEFL5PQykOpHHb19NOKh+p5hGOMo0tPVg0eE=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.2/user_oidc-v6.1.2.tar.gz", - "version": "6.1.2", - "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", - "homepage": "https://github.com/nextcloud/user_oidc", - "licenses": [ - "agpl" - ] - }, - "user_saml": { - "hash": "sha256-ospit0ZoPTxwdEDXN21EEt7WlTl4ys5IzdDBrurAPDs=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.4.1/user_saml-v6.4.1.tar.gz", - "version": "6.4.1", - "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", - "homepage": "https://github.com/nextcloud/user_saml", - "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/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 50562124a2e3..3465db715b9f 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, bison, cmake, pkg-config, @@ -47,12 +48,20 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + # Fix compilation with LLVM 19, adapted from https://github.com/mysql/mysql-server/commit/3a51d7fca76e02257f5c42b6a4fc0c5426bf0421 + # in https://github.com/NixOS/nixpkgs/pull/374591#issuecomment-2615855076 + ./libcpp-fixes.patch + (fetchpatch { + url = "https://github.com/mysql/mysql-server/commit/4a5c00d26f95faa986ffed7a15ee15e868e9dcf2.patch"; + hash = "sha256-MEl1lQlDYtFjHk0+S02RQFnxMr+YeFxAyNjpDtVHyeE="; + }) ]; ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. - postPatch = '' - substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool - substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool ${cctools}/bin/libtool + substituteInPlace cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool ${cctools}/bin/libtool + substituteInPlace cmake/package_name.cmake --replace-fail "COMMAND sw_vers" "COMMAND ${DarwinTools}/bin/sw_vers" ''; buildInputs = @@ -77,10 +86,8 @@ stdenv.mkDerivation (finalAttrs: { libtirpc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools CoreServices developer_cmds - DarwinTools ]; strictDeps = true; diff --git a/pkgs/servers/sql/mysql/libcpp-fixes.patch b/pkgs/servers/sql/mysql/libcpp-fixes.patch new file mode 100644 index 000000000000..d7ba0740a42c --- /dev/null +++ b/pkgs/servers/sql/mysql/libcpp-fixes.patch @@ -0,0 +1,183 @@ +diff --git a/include/my_char_traits.h b/include/my_char_traits.h +new file mode 100644 +index 00000000..6336bc03 +--- /dev/null ++++ b/include/my_char_traits.h +@@ -0,0 +1,65 @@ ++/* Copyright (c) 2024, Oracle and/or its affiliates. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License, version 2.0, ++ as published by the Free Software Foundation. ++ ++ This program is designed to work with certain software (including ++ but not limited to OpenSSL) that is licensed under separate terms, ++ as designated in a particular file or component or in included license ++ documentation. The authors of MySQL hereby grant you an additional ++ permission to link the program and your derivative works with the ++ separately licensed software that they have either included with ++ the program or referenced in the documentation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License, version 2.0, for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ ++ ++#ifndef MY_CHAR_TRAITS_INCLUDED ++#define MY_CHAR_TRAITS_INCLUDED ++ ++#include ++ ++template ++struct my_char_traits; ++ ++/* ++ This is a standards-compliant, drop-in replacement for ++ std::char_traits ++ We need this because clang libc++ is removing support for it in clang 19. ++ It is not a complete implementation. Rather we implement just enough to ++ compile any usage of char_traits we have in our codebase. ++ */ ++template <> ++struct my_char_traits { ++ using char_type = unsigned char; ++ using int_type = unsigned int; ++ ++ static void assign(char_type &c1, const char_type &c2) { c1 = c2; } ++ ++ static char_type *assign(char_type *s, std::size_t n, char_type a) { ++ return static_cast(memset(s, a, n)); ++ } ++ ++ static int compare(const char_type *s1, const char_type *s2, std::size_t n) { ++ return memcmp(s1, s2, n); ++ } ++ ++ static char_type *move(char_type *s1, const char_type *s2, std::size_t n) { ++ if (n == 0) return s1; ++ return static_cast(memmove(s1, s2, n)); ++ } ++ ++ static char_type *copy(char_type *s1, const char_type *s2, std::size_t n) { ++ if (n == 0) return s1; ++ return static_cast(memcpy(s1, s2, n)); ++ } ++}; ++ ++#endif // MY_CHAR_TRAITS_INCLUDED +diff --git a/sql/mdl_context_backup.h b/sql/mdl_context_backup.h +index 89e7e23d..cf9c307e 100644 +--- a/sql/mdl_context_backup.h ++++ b/sql/mdl_context_backup.h +@@ -28,6 +28,7 @@ + #include + #include + ++#include "my_char_traits.h" + #include "sql/malloc_allocator.h" + #include "sql/mdl.h" + +@@ -47,7 +48,8 @@ class MDL_context_backup_manager { + /** + Key for uniquely identifying MDL_context in the MDL_context_backup map. + */ +- typedef std::basic_string MDL_context_backup_key; ++ using MDL_context_backup_key = ++ std::basic_string>; + + class MDL_context_backup; + +diff --git a/sql/stream_cipher.h b/sql/stream_cipher.h +index 606d4064..358fbb41 100644 +--- a/sql/stream_cipher.h ++++ b/sql/stream_cipher.h +@@ -28,6 +28,8 @@ + #include + #include + ++#include "my_char_traits.h" ++ + /** + @file stream_cipher.h + +@@ -35,7 +37,8 @@ + binary log files. + */ + +-typedef std::basic_string Key_string; ++using Key_string = ++ std::basic_string>; + + /** + @class Stream_cipher +diff --git a/unittest/gunit/binlogevents/transaction_compression-t.cc b/unittest/gunit/binlogevents/transaction_compression-t.cc +index ba13f979..01af0e3a 100644 +--- a/unittest/gunit/binlogevents/transaction_compression-t.cc ++++ b/unittest/gunit/binlogevents/transaction_compression-t.cc +@@ -23,6 +23,7 @@ + */ + + #include ++#include + + #include + #include "libbinlogevents/include/binary_log.h" +@@ -51,14 +52,13 @@ class TransactionPayloadCompressionTest : public ::testing::Test { + using Managed_buffer_t = Decompressor_t::Managed_buffer_t; + using Size_t = Decompressor_t::Size_t; + using Char_t = Decompressor_t::Char_t; +- using String_t = std::basic_string; + using Decompress_status_t = + binary_log::transaction::compression::Decompress_status; + using Compress_status_t = + binary_log::transaction::compression::Compress_status; + +- static String_t constant_data(Size_t size) { +- return String_t(size, (Char_t)'a'); ++ static std::string constant_data(Size_t size) { ++ return std::string(size, (Char_t)'a'); + } + + protected: +@@ -69,7 +69,7 @@ class TransactionPayloadCompressionTest : public ::testing::Test { + void TearDown() override {} + + static void compression_idempotency_test(Compressor_t &c, Decompressor_t &d, +- String_t data) { ++ const std::string &data) { + auto debug_string = concat( + binary_log::transaction::compression::type_to_string(c.get_type_code()), + " ", data.size()); +@@ -104,8 +104,8 @@ class TransactionPayloadCompressionTest : public ::testing::Test { + + // Check decompressed data + ASSERT_EQ(managed_buffer.read_part().size(), data.size()) << debug_string; +- ASSERT_EQ(data, String_t(managed_buffer.read_part().begin(), +- managed_buffer.read_part().end())) ++ ASSERT_EQ(data, std::string(managed_buffer.read_part().begin(), ++ managed_buffer.read_part().end())) + << debug_string; + + // Check that we reached EOF +@@ -118,7 +118,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressZstdTest) { + for (auto size : buffer_sizes) { + binary_log::transaction::compression::Zstd_dec d; + binary_log::transaction::compression::Zstd_comp c; +- String_t data{TransactionPayloadCompressionTest::constant_data(size)}; ++ std::string data{TransactionPayloadCompressionTest::constant_data(size)}; + TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data); + c.set_compression_level(22); + TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data); +@@ -129,7 +129,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressNoneTest) { + for (auto size : buffer_sizes) { + binary_log::transaction::compression::None_dec d; + binary_log::transaction::compression::None_comp c; +- String_t data{TransactionPayloadCompressionTest::constant_data(size)}; ++ std::string data{TransactionPayloadCompressionTest::constant_data(size)}; + TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data); + } + } \ No newline at end of file diff --git a/pkgs/servers/teleport/15/default.nix b/pkgs/servers/teleport/15/default.nix index 7062e418a628..6eb714ae1892 100644 --- a/pkgs/servers/teleport/15/default.nix +++ b/pkgs/servers/teleport/15/default.nix @@ -2,10 +2,10 @@ args: import ../generic.nix ( args // { - version = "15.4.21"; - hash = "sha256-n5dAJ5ilq5nHo3neQzCUFnDRwLhArwleMSho4/g0MT4="; - vendorHash = "sha256-bW8ztNeSzxUNtbuBtxIya9TeGfktC+/fz9iXB0GL0Mg="; - yarnHash = "sha256-ZaLLrcwAeq6TQ1SaA2few4s0HqktOZEpxCTcNGloGfk="; + version = "15.4.26"; + hash = "sha256-LxMwCI/8otH32bRJvz9p1zWw4QzF/wrqeboZ6B3aw9o="; + vendorHash = "sha256-VG9b1M3zdtRXY3eCFC7izejSSs4nTjtR9/wOc36PFnA="; + yarnHash = "sha256-kmjY7KQfSzmlNS7ZK25YItZct/Tg7CWKfoRfubFBGlY="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/servers/teleport/16/Cargo.lock b/pkgs/servers/teleport/16/Cargo.lock index 8aa4042cfe85..d489f1b01796 100644 --- a/pkgs/servers/teleport/16/Cargo.lock +++ b/pkgs/servers/teleport/16/Cargo.lock @@ -204,9 +204,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-lc-rs" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" +checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" dependencies = [ "aws-lc-sys", "mirai-annotations", @@ -216,9 +216,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.20.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703" +checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62" dependencies = [ "bindgen 0.69.4", "cc", @@ -250,12 +250,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -396,9 +390,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cbc" @@ -838,19 +832,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -1260,13 +1254,142 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.5.0" +name = "icu_collections" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1310,6 +1433,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "getrandom", + "ironrdp-core", "ironrdp-graphics", "ironrdp-pdu", "ironrdp-session", @@ -1325,11 +1449,12 @@ dependencies = [ [[package]] name = "ironrdp-async" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +version = "0.2.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "bytes", "ironrdp-connector", + "ironrdp-core", "ironrdp-pdu", "tracing", ] @@ -1337,9 +1462,10 @@ dependencies = [ [[package]] name = "ironrdp-cliprdr" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "bitflags 2.6.0", + "ironrdp-core", "ironrdp-pdu", "ironrdp-svc", "thiserror", @@ -1348,27 +1474,36 @@ dependencies = [ [[package]] name = "ironrdp-connector" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +version = "0.2.1" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ + "ironrdp-core", "ironrdp-error", "ironrdp-pdu", "ironrdp-svc", "picky", - "picky-asn1-der 0.5.0", - "picky-asn1-x509 0.13.0", + "picky-asn1-der", + "picky-asn1-x509", "rand_core", "sspi", "tracing", "url", - "winapi", +] + +[[package]] +name = "ironrdp-core" +version = "0.1.1" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" +dependencies = [ + "ironrdp-error", ] [[package]] name = "ironrdp-displaycontrol" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ + "ironrdp-core", "ironrdp-dvc", "ironrdp-pdu", "ironrdp-svc", @@ -1378,8 +1513,9 @@ dependencies = [ [[package]] name = "ironrdp-dvc" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ + "ironrdp-core", "ironrdp-pdu", "ironrdp-svc", "slab", @@ -1389,18 +1525,18 @@ dependencies = [ [[package]] name = "ironrdp-error" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" [[package]] name = "ironrdp-graphics" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "bit_field", "bitflags 2.6.0", "bitvec", "byteorder", - "ironrdp-error", + "ironrdp-core", "ironrdp-pdu", "lazy_static", "num-derive", @@ -1410,13 +1546,14 @@ dependencies = [ [[package]] name = "ironrdp-pdu" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +version = "0.1.1" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "bit_field", "bitflags 2.6.0", "byteorder", "der-parser", + "ironrdp-core", "ironrdp-error", "md-5", "num-bigint", @@ -1433,9 +1570,10 @@ dependencies = [ [[package]] name = "ironrdp-rdpdr" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "bitflags 2.6.0", + "ironrdp-core", "ironrdp-error", "ironrdp-pdu", "ironrdp-svc", @@ -1445,9 +1583,10 @@ dependencies = [ [[package]] name = "ironrdp-rdpsnd" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "bitflags 2.6.0", + "ironrdp-core", "ironrdp-pdu", "ironrdp-svc", "tracing", @@ -1455,10 +1594,11 @@ dependencies = [ [[package]] name = "ironrdp-session" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +version = "0.2.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "ironrdp-connector", + "ironrdp-core", "ironrdp-displaycontrol", "ironrdp-dvc", "ironrdp-error", @@ -1470,17 +1610,18 @@ dependencies = [ [[package]] name = "ironrdp-svc" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +version = "0.1.1" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "bitflags 2.6.0", + "ironrdp-core", "ironrdp-pdu", ] [[package]] name = "ironrdp-tls" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "tokio", "tokio-rustls", @@ -1489,8 +1630,8 @@ dependencies = [ [[package]] name = "ironrdp-tokio" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" +version = "0.2.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" dependencies = [ "bytes", "ironrdp-async", @@ -1505,9 +1646,9 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "iso7816" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3af73ac9c821e7aea3280532118e15cdf9e7bb45c923cbf0e319ae25b27d20c" +checksum = "c75f5d3f2d959c5d37b382ed9b5a32d0a0e6112ab6ac9eb8fce82359db6f2367" dependencies = [ "delog", "heapless", @@ -1548,9 +1689,9 @@ dependencies = [ [[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", ] @@ -1581,9 +1722,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libloading" @@ -1607,6 +1748,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lock_api" version = "0.4.12" @@ -1950,14 +2097,14 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "picky" -version = "7.0.0-rc.9" +version = "7.0.0-rc.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9b488630f493840c2e6ef270c3619a3dc2ad0953eb978d6e4273a8337fee5e" +checksum = "f62f11977ee3ab76e48f7465f035a607e61b7421b154384b71607cb85a26d5dd" dependencies = [ "aes", "aes-gcm", "aes-kw", - "base64 0.22.1", + "base64", "cbc", "des", "digest", @@ -1971,9 +2118,9 @@ dependencies = [ "p384", "p521", "pbkdf2", - "picky-asn1 0.9.0", - "picky-asn1-der 0.5.0", - "picky-asn1-x509 0.13.0", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", "rand", "rand_core", "rc2", @@ -1990,20 +2137,9 @@ dependencies = [ [[package]] name = "picky-asn1" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295eea0f33c16be21e2a98b908fdd4d73c04dd48c8480991b76dbcf0cb58b212" -dependencies = [ - "oid", - "serde", - "serde_bytes", -] - -[[package]] -name = "picky-asn1" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360019b238b11b8c0e88cd9db3a6677f1af122e3422d0a26a2b576f084d9be36" +checksum = "d061c9f67e256511d8d69b86730a506bed100db520c8812e789cf91d9c6a16cc" dependencies = [ "oid", "serde", @@ -2014,50 +2150,26 @@ dependencies = [ [[package]] name = "picky-asn1-der" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" +checksum = "e15b90fb132c46ded79c39277afa93151691d9df6e7ff369c071890b36478392" dependencies = [ - "picky-asn1 0.8.0", - "serde", - "serde_bytes", -] - -[[package]] -name = "picky-asn1-der" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04784987e157b5a8f832ce68b3364915dc6ef4bed94a6e10e241fa1bae3db2e3" -dependencies = [ - "picky-asn1 0.9.0", + "picky-asn1", "serde", "serde_bytes", ] [[package]] name = "picky-asn1-x509" -version = "0.12.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" +checksum = "f702973074c654cef724d7430e2852acdb8b0e897ed9c4120727446a1bda1464" dependencies = [ - "base64 0.21.7", - "oid", - "picky-asn1 0.8.0", - "picky-asn1-der 0.4.1", - "serde", -] - -[[package]] -name = "picky-asn1-x509" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3384ff768b1c4a04532916be77935f634a4738d3b2138da98798e90352fadf4" -dependencies = [ - "base64 0.22.1", + "base64", "num-bigint-dig", "oid", - "picky-asn1 0.9.0", - "picky-asn1-der 0.5.0", + "picky-asn1", + "picky-asn1-der", "serde", "widestring", "zeroize", @@ -2065,9 +2177,9 @@ dependencies = [ [[package]] name = "picky-krb" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2213fd3942a9d3366b3e108b6d02db2227c80937a55f79a71e1719ab075bb77" +checksum = "f5f3c62393fbe5538020af4f8b07d1647f99748becd207476417f8d2aa8900cd" dependencies = [ "aes", "byteorder", @@ -2078,9 +2190,9 @@ dependencies = [ "num-bigint-dig", "oid", "pbkdf2", - "picky-asn1 0.9.0", - "picky-asn1-der 0.5.0", - "picky-asn1-x509 0.13.0", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", "rand", "serde", "sha1", @@ -2274,6 +2386,7 @@ dependencies = [ "env_logger", "ironrdp-cliprdr", "ironrdp-connector", + "ironrdp-core", "ironrdp-displaycontrol", "ironrdp-dvc", "ironrdp-pdu", @@ -2288,8 +2401,9 @@ dependencies = [ "log", "parking_lot 0.12.3", "picky", - "picky-asn1-der 0.4.1", - "picky-asn1-x509 0.12.0", + "picky-asn1-der", + "picky-asn1-x509", + "picky-krb", "rand", "rand_chacha", "reqwest", @@ -2354,11 +2468,11 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-channel", "futures-core", @@ -2420,9 +2534,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" dependencies = [ "const-oid", "digest", @@ -2471,27 +2585,26 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "aws-lc-rs", "log", "once_cell", - "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -2500,9 +2613,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -2517,21 +2630,21 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.22.1", + "base64", "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" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "aws-lc-rs", "ring", @@ -2776,9 +2889,9 @@ dependencies = [ [[package]] name = "sspi" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1734839082c6d33f8368b40a40d0d5cc1ed10fbde00dc8a404f64e70272ed3f6" +checksum = "b94e3c7aa94f5b440eedeab677686629bddcb43edf52ef3703038cce98e2bf70" dependencies = [ "async-dnssd", "async-recursion", @@ -2796,9 +2909,9 @@ dependencies = [ "num-traits", "oid", "picky", - "picky-asn1 0.9.0", - "picky-asn1-der 0.5.0", - "picky-asn1-x509 0.13.0", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", "picky-krb", "portpicker", "rand", @@ -2816,7 +2929,7 @@ dependencies = [ "url", "uuid", "windows", - "windows-sys 0.52.0", + "windows-sys 0.59.0", "winreg", "zeroize", ] @@ -2917,9 +3030,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -2991,20 +3104,15 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.6.1" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tls_codec" version = "0.4.1" @@ -3028,9 +3136,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.39.3" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -3222,27 +3330,12 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - [[package]] name = "universal-hash" version = "0.5.1" @@ -3261,15 +3354,21 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + [[package]] name = "utf16string" version = "0.2.0" @@ -3279,6 +3378,12 @@ dependencies = [ "byteorder", ] +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -3287,9 +3392,9 @@ 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" dependencies = [ "getrandom", "serde", @@ -3324,9 +3429,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", @@ -3335,9 +3440,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", @@ -3362,9 +3467,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", @@ -3372,9 +3477,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", @@ -3385,15 +3490,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 = "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", @@ -3681,6 +3786,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -3714,6 +3831,51 @@ dependencies = [ "tls_codec", ] +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + [[package]] name = "zeroize" version = "1.8.1" @@ -3733,3 +3895,25 @@ dependencies = [ "quote", "syn 2.0.68", ] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index b13d17699943..ac6564030e3f 100644 --- a/pkgs/servers/teleport/16/default.nix +++ b/pkgs/servers/teleport/16/default.nix @@ -2,15 +2,15 @@ args: import ../generic.nix ( args // { - version = "16.4.6"; - hash = "sha256-TdOCFs6YeqINM8aPryrjYPaXEjc/gIqu7kzVYDnMsjg="; - vendorHash = "sha256-iyYfht0aB9Vv2hsaqrieFHXbDhlotKQYfLn4JFqpve8="; - pnpmHash = "sha256-NF45Wp4itYud01VzxC8bRHZ3xZ1T1du1QmZTDMS5nOk="; + version = "16.4.14"; + hash = "sha256-9X4PLN5y1pJMNGL7o+NR/b3yUYch/VVEMmGmWbEO1CA="; + vendorHash = "sha256-nJdtllxjem+EA77Sb1XKmrAaWh/8WrL3AuvVxgBRkxI="; + pnpmHash = "sha256-+eOfGS9m3c9i7ccOS8q6KM0IrBIJZKlxx7h3qqxTJHE="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8="; - "ironrdp-async-0.1.0" = "sha256-DOwDHavDaEda+JK9M6kbvseoXe2LxJg3MLTY/Nu+PN0="; + "ironrdp-async-0.2.0" = "sha256-s0WdaEd3J2r/UmSVBktxtspIytlfw6eWUW3A4kOsTP0="; }; }; } diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 83c984455883..26c3467c7973 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -2,7 +2,7 @@ callPackages, lib, wasm-bindgen-cli_0_2_92, - wasm-bindgen-cli_0_2_93, + wasm-bindgen-cli_0_2_95, ... }@args: let @@ -17,7 +17,7 @@ let teleport_16 = import ./16 ( args // { - wasm-bindgen-cli = wasm-bindgen-cli_0_2_93; + wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; } ); teleport = teleport_16; @@ -29,6 +29,6 @@ callPackages f' ( builtins.removeAttrs args [ "callPackages" "wasm-bindgen-cli_0_2_92" - "wasm-bindgen-cli_0_2_93" + "wasm-bindgen-cli_0_2_95" ] ) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 5c5f6dfbd29b..e98e32143842 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -4,6 +4,7 @@ rustPlatform, fetchFromGitHub, fetchYarnDeps, + fetchpatch, makeWrapper, CoreFoundation, AppKit, @@ -116,6 +117,14 @@ let ] ); + patches = lib.optional (lib.versionAtLeast version "16") [ + (fetchpatch { + name = "disable-wasm-opt-for-ironrdp.patch"; + url = "https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1"; + hash = "sha256-Y5SVIUQsfi5qI28x5ccoRkBjpdpeYn0mQk8sLO644xo="; + }) + ]; + configurePhase = '' runHook preConfigure @@ -244,6 +253,7 @@ buildGoModule rec { tomberek freezeboy techknowlogick + juliusfreudenberger ]; platforms = platforms.unix; # go-libfido2 is broken on platforms with less than 64-bit because it defines an array diff --git a/pkgs/servers/teleport/tsh.patch b/pkgs/servers/teleport/tsh.patch index f510b21d5dec..d35c7c99ccaa 100644 --- a/pkgs/servers/teleport/tsh.patch +++ b/pkgs/servers/teleport/tsh.patch @@ -2,10 +2,10 @@ diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go index 5de21c69d0..3995c19e3c 100644 --- a/tool/tsh/common/tsh.go +++ b/tool/tsh/common/tsh.go -@@ -1084,10 +1084,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error { +@@ -1231,10 +1231,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error { + } var err error - - cf.executablePath, err = os.Executable() + tempBinaryPath, err := os.Executable() if err != nil { diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index 0991d8e7894a..1fc1579f3327 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -19,14 +19,14 @@ let }: buildNpmPackage rec { pname = name; - version = "2024.10.0"; + version = "2025.1.0"; nodejs = nodejs_18; src = fetchFromGitHub { owner = "bitwarden"; repo = "directory-connector"; rev = "v${version}"; - hash = "sha256-jisMEuIpTWCy+N1QeERf+05tsugY0f+H2ntcRcFKkgo="; + hash = "sha256-4Bt+E0lkmRXY4yIq6DwCyggcu7/8QtaYE9QHNTUhM+8="; }; postPatch = '' @@ -38,7 +38,7 @@ let --replace-fail "AppImage" "dir" ''; - npmDepsHash = "sha256-Zi7EHzQSSrZ6XGGV1DOASuddYA4svXQc1eGmchcLFBc="; + npmDepsHash = "sha256-vvVZIfRZw5C4pLUkNHS+kgD7MzoImvsf8CGxdH2xXOs="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index e8e191baceeb..0509becadd54 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "auth"; - version = "2.168.0"; + version = "2.169.0"; src = fetchFromGitHub { owner = "supabase"; repo = "auth"; rev = "v${version}"; - hash = "sha256-XPfqb1kO4sJbREZhCJ/FMTNeNtooqSWQJvNPjjS/gAE="; + hash = "sha256-SPX4cdzz72Vd0d4fukxgZYQvESiXBzTKGEkDI5+tj04="; }; vendorHash = "sha256-em1dBnNHsVPI7owd2gjERcJnrQbiVtZGtIqnFyker6M="; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 0be74e21dd25..ed3cbe37b2c0 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "plan9port"; - version = "2024-10-22"; + version = "2025-01-29"; src = fetchFromGitHub { owner = "9fans"; repo = pname; - rev = "61e362add9e1485bec1ab8261d729016850ec270"; - hash = "sha256-Hpz9yuBktgJEOQ4ZD03c37pO9wgbvtYjIreYusr0Dzw="; + rev = "a5d6857a3b912b43c88ef298c28d13d4623f9ef0"; + sha256 = "0c23z56zygrsyr96ml7907mpfgx80vnsy99nqr3nmfw1a045mjgv"; }; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2615e12b3e69..30b7ff9f10f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6380,8 +6380,6 @@ with pkgs; withQt = true; }; - lessc = nodePackages.less; - lobster = callPackage ../development/compilers/lobster { inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa AudioToolbox OpenGL Foundation ForceFeedback; @@ -7536,6 +7534,7 @@ with pkgs; electron_31-bin electron_32-bin electron_33-bin + electron_34-bin ; inherit (callPackages ../development/tools/electron/chromedriver { }) @@ -7544,6 +7543,7 @@ with pkgs; electron-chromedriver_31 electron-chromedriver_32 electron-chromedriver_33 + electron-chromedriver_34 ; electron_24 = electron_24-bin; @@ -7554,9 +7554,10 @@ with pkgs; electron_31 = electron_31-bin; electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin; electron_33 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_33 then electron-source.electron_33 else electron_33-bin; - electron = electron_33; - electron-bin = electron_33-bin; - electron-chromedriver = electron-chromedriver_33; + electron_34 = electron_34-bin; + electron = electron_34; + electron-bin = electron_34-bin; + electron-chromedriver = electron-chromedriver_34; autoconf = callPackage ../development/tools/misc/autoconf { }; autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; @@ -16310,10 +16311,6 @@ with pkgs; # used as base package for iortcw forks iortcw_sp = callPackage ../games/iortcw/sp.nix { }; - ja2-stracciatella = callPackage ../games/ja2-stracciatella { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - katagoWithCuda = katago.override { backend = "cuda"; cudaPackages = cudaPackages_12; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac5fe8a827ab..123386ff9ef6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11017,6 +11017,8 @@ self: super: with self; { podcats = callPackage ../development/python-modules/podcats { }; + podgen = callPackage ../development/python-modules/podgen { }; + podman = callPackage ../development/python-modules/podman { }; poetry-core = callPackage ../development/python-modules/poetry-core { }; @@ -16330,6 +16332,8 @@ self: super: with self; { titlecase = callPackage ../development/python-modules/titlecase { }; + tivars = callPackage ../development/python-modules/tivars { }; + tld = callPackage ../development/python-modules/tld { }; tlds = callPackage ../development/python-modules/tlds { };