diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 1cf2a615ebd6..0738666c20bb 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -132,6 +132,8 @@ - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld. +- `pcp` has been removed because the upstream repo was archived and it hasn't been updated since 2021. + - `navidrome` 0.58.0 introduces [multi-library support](https://www.navidrome.org/docs/usage/multi-library/) and backwards incompatible database migrations. Ensure backups are valid and run a Full Scan after starting the new version. @@ -154,6 +156,8 @@ - `inspircd` has been updated to the v4 release series. Please refer to the upstream documentation for [general information](https://docs.inspircd.org/4/overview/#v4-overview) and a list of [breaking changes](https://docs.inspircd.org/4/breaking-changes/). +- `proton-caller` has been removed due to lack of upstream maintenance. + - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input. - `mongodb-6_0` was removed as it is end of life as of 2025-07-31. diff --git a/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md b/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md index a10c3dc36709..a9755e4bf752 100644 --- a/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md +++ b/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md @@ -40,12 +40,18 @@ An example of how to build an image: } ``` -## Nix Store Partition {#sec-image-repart-store-partition} +## Nix Store Paths {#sec-image-repart-store-paths} + +If you want to rewrite Nix store paths, e.g., to remove the `/nix/store` prefix +or to nest it below a parent path, you can do that through the +`nixStorePrefix` option. + +### Nix Store Partition {#sec-image-repart-store-partition} You can define a partition that only contains the Nix store and then mount it under `/nix/store`. Because the `/nix/store` part of the paths is already -determined by the mount point, you have to set `stripNixStorePrefix = true;` so -that the prefix is stripped from the paths before copying them into the image. +determined by the mount point, you have to set `nixStorePrefix = "/"` so +that `/nix/store` is stripped from the paths before copying them into the image. ```nix { @@ -54,7 +60,7 @@ that the prefix is stripped from the paths before copying them into the image. image.repart.partitions = { "store" = { storePaths = [ config.system.build.toplevel ]; - stripNixStorePrefix = true; + nixStorePrefix = "/"; repartConfig = { Type = "linux-generic"; Label = "nix-store"; @@ -65,6 +71,42 @@ that the prefix is stripped from the paths before copying them into the image. } ``` +### Nix Store Subvolume {#sec-image-repart-store-subvolume} + +Alternatively, you can create a Btrfs subvolume `/@nix-store` containing the +Nix store and mount it on `/nix/store`: + +```nix +{ + fileSystems."/" = { + device = "/dev/disk/by-partlabel/root"; + fsType = "btrfs"; + options = [ "subvol=/@" ]; + }; + + fileSystems."/nix/store" = { + device = "/dev/disk/by-partlabel/root"; + fsType = "btrfs"; + options = [ "subvol=/@nix-store" ]; + }; + + image.repart.partitions = { + "root" = { + storePaths = [ config.system.build.toplevel ]; + nixStorePrefix = "/@nix-store"; + repartConfig = { + Type = "root"; + Label = "root"; + Format = "btrfs"; + Subvolumes = "/@ /@nix-store"; + MakeDirectories = "/@ /@nix-store"; + # ... + }; + }; + }; +} +``` + ## Appliance Image {#sec-image-repart-appliance} The `image/repart.nix` module can also be used to build self-contained [software diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 65538f95d773..3ddfa1b1c385 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -326,9 +326,15 @@ "sec-image-repart": [ "index.html#sec-image-repart" ], + "sec-image-repart-store-paths": [ + "index.html#sec-image-repart-store-paths" + ], "sec-image-repart-store-partition": [ "index.html#sec-image-repart-store-partition" ], + "sec-image-repart-store-subvolume": [ + "index.html#sec-image-repart-store-subvolume" + ], "sec-image-repart-appliance": [ "index.html#sec-image-repart-appliance" ], diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index b353e7b58a6d..ff226b9342a6 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -12,6 +12,8 @@ - The default PostgreSQL version for new NixOS installations (i.e. with `system.stateVersion >= 25.11`) is v17. +- Added `nixos-init`, a Rust-based bashless initialization system for systemd initrd. This allows to build NixOS systems without any interpreter. Enable via `system.nixos-init.enable = true;`. + - The NetworkManager module does not ship with a default set of VPN plugins anymore. All required VPN plugins must now be explicitly configured in [`networking.networkmanager.plugins`](#opt-networking.networkmanager.plugins). - The Qt 5-based versions of KDE Gear, Plasma, Maui and Deepin have been removed. Users are advised to migrate to Plasma 6 and Gear 25.08, available under `kdePackages`. diff --git a/nixos/modules/image/amend-repart-definitions.py b/nixos/modules/image/amend-repart-definitions.py index fa9b1544ae85..4ca8c3156f8a 100644 --- a/nixos/modules/image/amend-repart-definitions.py +++ b/nixos/modules/image/amend-repart-definitions.py @@ -36,11 +36,11 @@ def add_contents_to_definition( def add_closure_to_definition( - definition: Path, closure: Path | None, strip_nix_store_prefix: bool | None + definition: Path, closure: Path | None, nix_store_prefix: str | None ) -> None: """Add CopyFiles= instructions to a definition for all paths in the closure. - If strip_nix_store_prefix is True, `/nix/store` is stripped from the target path. + Replace `/nix/store` with the value of nix_store_prefix. """ if not closure: return @@ -52,10 +52,12 @@ def add_closure_to_definition( continue source = Path(line.strip()) - target = str(source.relative_to("/nix/store/")) - target = f":/{target}" if strip_nix_store_prefix else "" + option = f"CopyFiles={source}" + if nix_store_prefix: + target = nix_store_prefix / source.relative_to("/nix/store/") + option = f"{option}:{target}" - copy_files_lines.append(f"CopyFiles={source}{target}\n") + copy_files_lines.append(f"{option}\n") with open(definition, "a") as f: f.writelines(copy_files_lines) @@ -102,8 +104,8 @@ def main() -> None: add_contents_to_definition(definition, contents) closure = config.get("closure") - strip_nix_store_prefix = config.get("stripNixStorePrefix") - add_closure_to_definition(definition, closure, strip_nix_store_prefix) + nix_store_prefix = config.get("nixStorePrefix") + add_closure_to_definition(definition, closure, nix_store_prefix) print(target_dir.absolute()) diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index a44a2e5f9ea3..bc8689ef6dde 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -15,69 +15,83 @@ let inherit (utils.systemdUtils.lib) GPTMaxLabelLength; - partitionOptions = { - options = { - storePaths = lib.mkOption { - type = with lib.types; listOf path; - default = [ ]; - description = "The store paths to include in the partition."; - }; - - stripNixStorePrefix = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to strip `/nix/store/` from the store paths. This is useful - when you want to build a partition that only contains store paths and - is mounted under `/nix/store`. - ''; - }; - - contents = lib.mkOption { - type = - with lib.types; - attrsOf (submodule { - options = { - source = lib.mkOption { - type = types.path; - description = "Path of the source file."; - }; - }; - }); - default = { }; - example = lib.literalExpression '' - { - "/EFI/BOOT/BOOTX64.EFI".source = - "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; - - "/loader/entries/nixos.conf".source = systemdBootEntry; - } - ''; - description = "The contents to end up in the filesystem image."; - }; - - repartConfig = lib.mkOption { - type = - with lib.types; - attrsOf (oneOf [ - str - int - bool - (listOf str) - ]); - example = { - Type = "home"; - SizeMinBytes = "512M"; - SizeMaxBytes = "2G"; + partitionOptions = + { config, ... }: + { + options = { + storePaths = lib.mkOption { + type = with lib.types; listOf path; + default = [ ]; + description = "The store paths to include in the partition."; }; - description = '' - Specify the repart options for a partiton as a structural setting. - See {manpage}`repart.d(5)` - for all available options. - ''; + + # Superseded by `nixStorePrefix`. Unfortunately, `mkChangedOptionModule` + # does not support submodules. + stripNixStorePrefix = lib.mkOption { + default = "_mkMergedOptionModule"; + visible = false; + }; + + nixStorePrefix = lib.mkOption { + type = lib.types.path; + default = "/nix/store"; + description = '' + The prefix to use for store paths. Defaults to `/nix/store`. This is + useful when you want to build a partition that only contains store + paths and is mounted under `/nix/store` or if you want to create the + store paths below a parent path (e.g., `/@nix/nix/store`). + ''; + }; + + contents = lib.mkOption { + type = + with lib.types; + attrsOf (submodule { + options = { + source = lib.mkOption { + type = types.path; + description = "Path of the source file."; + }; + }; + }); + default = { }; + example = lib.literalExpression '' + { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + + "/loader/entries/nixos.conf".source = systemdBootEntry; + } + ''; + description = "The contents to end up in the filesystem image."; + }; + + repartConfig = lib.mkOption { + type = + with lib.types; + attrsOf (oneOf [ + str + int + bool + (listOf str) + ]); + example = { + Type = "home"; + SizeMinBytes = "512M"; + SizeMaxBytes = "2G"; + }; + description = '' + Specify the repart options for a partiton as a structural setting. + See {manpage}`repart.d(5)` + for all available options. + ''; + }; + }; + + config = lib.mkIf (config.stripNixStorePrefix == true) { + nixStorePrefix = "/"; }; }; - }; mkfsOptionsToEnv = opts: @@ -350,7 +364,7 @@ in } ) cfg.partitions; - warnings = lib.filter (v: v != null) ( + warnings = lib.flatten ( lib.mapAttrsToList ( fileName: partitionConfig: let @@ -358,20 +372,23 @@ in suggestedMaxLabelLength = GPTMaxLabelLength - 2; labelLength = builtins.stringLength repartConfig.Label; in - if (repartConfig ? Label && labelLength >= suggestedMaxLabelLength) then - '' - The partition label '${repartConfig.Label}' - defined for '${fileName}' is ${toString labelLength} characters long. - The suggested maximum label length is ${toString suggestedMaxLabelLength}. + lib.optional (repartConfig ? Label && labelLength >= suggestedMaxLabelLength) '' + The partition label '${repartConfig.Label}' + defined for '${fileName}' is ${toString labelLength} characters long. + The suggested maximum label length is ${toString suggestedMaxLabelLength}. - If you use sytemd-sysupdate style A/B updates, this might - not leave enough space to increment the version number included in - the label in a future release. For example, if your label is - ${toString GPTMaxLabelLength} characters long (the maximum enforced by UEFI) and - you're at version 9, you cannot increment this to 10. - '' - else - null + If you use sytemd-sysupdate style A/B updates, this might + not leave enough space to increment the version number included in + the label in a future release. For example, if your label is + ${toString GPTMaxLabelLength} characters long (the maximum enforced by UEFI) and + you're at version 9, you cannot increment this to 10. + '' + ++ lib.optional (partitionConfig.stripNixStorePrefix != "_mkMergedOptionModule") '' + The option definition `image.repart.paritions.${fileName}.stripNixStorePrefix` + has changed to `image.repart.paritions.${fileName}.nixStorePrefix` and now + accepts the path to use as prefix directly. Use `nixStorePrefix = "/"` to + achieve the same effect as setting `stripNixStorePrefix = true`. + '' ) cfg.partitions ); }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 043132db23c2..2576a9b96409 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1237,7 +1237,6 @@ ./services/networking/mmsd.nix ./services/networking/modemmanager.nix ./services/networking/monero.nix - ./services/networking/morty.nix ./services/networking/mosquitto.nix ./services/networking/mozillavpn.nix ./services/networking/mptcpd.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 10651b211405..99a6fc75f827 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -211,6 +211,9 @@ in "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "morty" ] + "services.morty has been removed from NixOS. As the morty package was unmaintained and removed and searxng, its main consumer, dropped support for it." + ) (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. diff --git a/nixos/modules/services/networking/firezone/server.nix b/nixos/modules/services/networking/firezone/server.nix index 3206d1d30e76..b83b8b5da94c 100644 --- a/nixos/modules/services/networking/firezone/server.nix +++ b/nixos/modules/services/networking/firezone/server.nix @@ -143,7 +143,7 @@ let }; commonServiceConfig = { - AmbientCapablities = [ ]; + AmbientCapabilities = [ ]; CapabilityBoundingSet = [ ]; LockPersonality = true; MemoryDenyWriteExecute = true; diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix deleted file mode 100644 index 99aab2f263f1..000000000000 --- a/nixos/modules/services/networking/morty.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - - cfg = config.services.morty; - -in - -{ - - ###### interface - - options = { - - services.morty = { - - enable = mkEnableOption "Morty proxy server. See "; - - ipv6 = mkOption { - type = types.bool; - default = true; - description = "Allow IPv6 HTTP requests?"; - }; - - key = mkOption { - type = types.str; - default = ""; - description = '' - HMAC url validation key (hexadecimal encoded). - Leave blank to disable. Without validation key, anyone can - submit proxy requests. Leave blank to disable. - Generate with `printf %s somevalue | openssl dgst -sha1 -hmac somekey` - ''; - }; - - timeout = mkOption { - type = types.int; - default = 2; - description = "Request timeout in seconds."; - }; - - package = mkPackageOption pkgs "morty" { }; - - port = mkOption { - type = types.port; - default = 3000; - description = "Listing port"; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "The address on which the service listens"; - }; - - }; - - }; - - ###### Service definition - - config = mkIf config.services.morty.enable { - - users.users.morty = { - description = "Morty user"; - createHome = true; - home = "/var/lib/morty"; - isSystemUser = true; - group = "morty"; - }; - users.groups.morty = { }; - - systemd.services.morty = { - description = "Morty sanitizing proxy server."; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "morty"; - ExecStart = '' - ${cfg.package}/bin/morty \ - -listen ${cfg.listenAddress}:${toString cfg.port} \ - ${optionalString cfg.ipv6 "-ipv6"} \ - ${optionalString (cfg.key != "") "-key " + cfg.key} \ - ''; - }; - }; - environment.systemPackages = [ cfg.package ]; - - }; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 78a96746f8b5..9b5a91cb36f4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -935,7 +935,6 @@ in moosefs = runTest ./moosefs.nix; mopidy = runTest ./mopidy.nix; morph-browser = runTest ./morph-browser.nix; - morty = runTest ./morty.nix; mosquitto = runTest ./mosquitto.nix; movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; }; mpd = runTest ./mpd.nix; diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix deleted file mode 100644 index b8e490fbbcb5..000000000000 --- a/nixos/tests/morty.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, ... }: - -{ - name = "morty"; - meta = with pkgs.lib.maintainers; { - maintainers = [ leenaars ]; - }; - - nodes = { - mortyProxyWithKey = - - { ... }: - { - services.morty = { - enable = true; - key = "78a9cd0cfee20c672f78427efb2a2a96036027f0"; - port = 3001; - }; - }; - - }; - - testScript = - { ... }: - '' - mortyProxyWithKey.wait_for_unit("default.target") - mortyProxyWithKey.wait_for_open_port(3001) - mortyProxyWithKey.succeed("curl -fL 127.0.0.1:3001 | grep MortyProxy") - ''; - -} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7c72a3142071..1c98e93803df 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13705,6 +13705,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + sidekick-nvim = buildVimPlugin { + pname = "sidekick.nvim"; + version = "2025-09-27"; + src = fetchFromGitHub { + owner = "folke"; + repo = "sidekick.nvim"; + rev = "242b2bd216191c151d24f665cc8f596cb63288ea"; + sha256 = "11qg13y57437pjwdsg0khj0wrwp86m779847isnb3a35kia7b2cc"; + }; + meta.homepage = "https://github.com/folke/sidekick.nvim/"; + meta.hydraPlatforms = [ ]; + }; + sideways-vim = buildVimPlugin { pname = "sideways.vim"; version = "2025-07-28"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b0b01208a15a..42435a4233df 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -73,6 +73,8 @@ gitMinimal, # Preview-nvim dependencies md-tui, + # sidekick-nvim dependencies + copilot-language-server, # sved dependencies glib, gobject-introspection, @@ -3123,6 +3125,16 @@ assertNoAdditions { ]; }; + sidekick-nvim = super.sidekick-nvim.overrideAttrs { + runtimeDeps = [ + copilot-language-server + ]; + + nvimSkipModules = [ + "sidekick.docs" + ]; + }; + skim-vim = super.skim-vim.overrideAttrs { dependencies = [ self.skim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 626164676424..9f10a2b1b71b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1052,6 +1052,7 @@ https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, https://github.com/osyo-manga/shabadou.vim/,, +https://github.com/folke/sidekick.nvim/,HEAD, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/skim-rs/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index 054f65b8b908..483cf4c68f62 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "1.94.0"; - hash = "sha256-VLTEDDD0/nadlMKYeeUKdGh3p1JXQoGhUQ6aXGpT10U="; + version = "1.96.0"; + hash = "sha256-VnPCVcV3UFZZWOTk52Z4hfAgzzqk7G6cMGiScEHb0Y8="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 892c2201f772..3990d6e3aa81 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -379,8 +379,8 @@ let mktplcRef = { name = "cue"; publisher = "asdine"; - version = "0.3.2"; - hash = "sha256-jMXqhgjRdM3UG/9NtiwWAg61mBW8OYVAKDWgb4hzhA4="; + version = "0.3.4"; + hash = "sha256-X+CFRKAZmjzf5dkE/AGd3A/voX/XHfMP5WEt8sJll8U="; }; meta = { description = "Cue language support for Visual Studio Code"; @@ -673,8 +673,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.28.0"; - hash = "sha256-NAQD6DK1c13nA/O0QHNxFraImE6C0+Jzj9+f06EkiW0="; + version = "1.29.0"; + hash = "sha256-qjfZ2/otO2BAIbhjqicHI2H0KKdpji55K+2XfOrzUIw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog"; @@ -1003,8 +1003,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.10.1"; - hash = "sha256-TD2lWGZCKTj9qbwV9elue+jyoQLEOmPBuePpOXH8wEg="; + version = "1.11.0"; + hash = "sha256-gyhvLFFGVUxOYr33SeWJIlVYQGEDUkuGyATylI+loUM="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; @@ -1137,8 +1137,8 @@ let mktplcRef = { publisher = "DanielGavin"; name = "ols"; - version = "0.1.43"; - hash = "sha256-b5jBEj4Kw5Nmm1L1RSNIZsqbpdo3EkOGaSH/7QK8y84="; + version = "0.1.44"; + hash = "sha256-b8zf6p5N51VHSgyFWsFBmCd3GvRgBeFpikt8GfoG7J0="; }; meta = { description = "Visual Studio Code extension for Odin language"; @@ -1152,8 +1152,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.14.110"; - hash = "sha256-8qTKmtnDFCCYwZPE2E3fDNDPTTvHVMqbNL5BybN58X8="; + version = "3.14.118"; + hash = "sha256-jAFlmF7HE0pfYx5jqnUjObM+awdc62DvayV9FdEx70E="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1743,8 +1743,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.27.7"; - hash = "sha256-1h/u0MBPtRYIStv3ZR1kbIaiRszavjWs5+oB1huwJBs="; + version = "0.28.1"; + hash = "sha256-VO3rJsKKZJWGBrNYnRXh5QedN13RR7qdcYmDn5WmOkg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -1834,8 +1834,8 @@ let mktplcRef = { publisher = "funkyremi"; name = "vscode-google-translate"; - version = "1.4.13"; - hash = "sha256-9Vo6lwqD1eE3zY0Gi9ME/6lPwmwuJ3Iq9StHPvncnM4="; + version = "1.5.0"; + hash = "sha256-t6USs2mZE3g802BRwP56eH/Wj/cyAcA+h/V+++NtHnA="; }; meta = { description = "Visual Studio Code extension using google translation to helping you quickly translate text right in your code rocket"; @@ -3002,8 +3002,8 @@ let mktplcRef = { name = "rainbow-csv"; publisher = "mechatroner"; - version = "3.21.0"; - hash = "sha256-IPgPE5vM9tzHPioRBZeJs4hqut6t++SjZJlHnz/ismA="; + version = "3.22.0"; + hash = "sha256-7X7tqoN3VUa/63qfCioRdODxAanvtb2wTMQbcWsqupQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mechatroner.rainbow-csv/changelog"; @@ -3765,8 +3765,8 @@ let mktplcRef = { name = "pico8-ls"; publisher = "PollywogGames"; - version = "0.6.0"; - hash = "sha256-qruXJjT2C45LFgFc1xV+h9b6kRZzeh/kS/BZNz6L+x8="; + version = "0.6.1"; + hash = "sha256-TlULqIKb3R+bvjN3f4Bwha0bewqCHpPVFiePHNV2kmE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/PollywogGames.pico8-ls/changelog"; @@ -3844,8 +3844,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "25.8.1"; - hash = "sha256-TXXOuayVohQPp+yQAHbsZDr/UYtyHmUkaLU+lADpjDU="; + version = "25.9.0"; + hash = "sha256-Z0oUhqoHfVALG5k1dbSBpJiq0AEjaqeh8yLJ8FjvfcY="; }; meta = { description = "Ansible language support"; @@ -4075,8 +4075,8 @@ let mktplcRef = { name = "sas-lsp"; publisher = "SAS"; - version = "1.16.0"; - hash = "sha256-+nB+J5exzxso6LM41HDH6SEjAUtDPZXhdZLdydYvFBk="; + version = "1.17.0"; + hash = "sha256-lhvSAPbvRmNwrAB0Lk4oKVu7+o3H7TJSQbBlURH2SCA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; @@ -4767,8 +4767,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.90.8"; - hash = "sha256-0I4jf9Ba8PlNM0eUYHaMyCvuHZ5U3+RvT8aIbHJu9KU="; + version = "0.91.0"; + hash = "sha256-nvcISWilvPXIm/er3QnM2aOhrWn2BgOL0aXpGHpDw9M="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; @@ -5088,8 +5088,8 @@ let mktplcRef = { name = "vscode-java-pack"; publisher = "vscjava"; - version = "0.29.2024091906"; - hash = "sha256-A0WHSqqYVkRN1C3WI7Gd7DZJFDJPYDVsEygDCG67GoQ="; + version = "0.30.2"; + hash = "sha256-uC3hf2OjncMqTRc9KTfrVvTwZOoPT0QXX7HCBTdblnQ="; }; meta = { description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; @@ -5168,8 +5168,8 @@ let mktplcRef = { name = "volar"; publisher = "Vue"; - version = "3.0.7"; - hash = "sha256-Uwgb+7Zxy4HaE97WdNpTaaCQNARpuu8cae3uDCjZYcA="; + version = "3.0.8"; + hash = "sha256-ZzNsoYfDVDIBEByZZcn1IAV7WijF/w6CEqZdS6qu/zk="; }; meta = { changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 690e55daf50d..7c82d89ee4a4 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.31.0"; - hash = "sha256-jMy6mjPUxz3p1dvrveZ/9tyn+KZ6rBLJinZMBUUb9QY="; + version = "0.31.3"; + hash = "sha256-Kvg5gmvAcz+K6mWBzWoNnkqEWAPRgC+w0idUC6RzM0g="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 8b7c5600f667..da65cec3a2e0 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2025.7.1"; - hash = "sha256-0lPbu5amiqk/O0XIFxJpTBKQEbU8mamnjBGsaalTyh8="; + version = "2025.8.2"; + hash = "sha256-Z2R7gUZw1S2iL3KX/3fB326lFzE39v9LGq17Ec2aHCA="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index 8ae694f9ea43..d6cdd508ce51 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "0.20.0"; - hash = "sha256-oRbNML3+Ynnv7rQamv03TJphun3nAKVeDtVxRXTkoK0="; + version = "0.22.1"; + hash = "sha256-eUtl1x3HqpFEUGkBVb8EOHneWV7DfYHHWGmM5gOGYcg="; }; meta = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 84f804dcc332..b9e9bc1c5736 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -243,13 +243,13 @@ "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8=" }, "checkly": { - "hash": "sha256-hZn0kNk2CtgaCfwrrnbBhdAO54d5QoP40rmxSliqJN0=", + "hash": "sha256-nKD9qjIRudq/MK+c8eC+hv8oDiW+ycYVnDO8+DHg3W4=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.13.0", + "rev": "v1.14.0", "spdx": null, - "vendorHash": "sha256-BPkpXDckVv/rtR1WCqKthmTCPzy+yAjgqUFYY3RT/+E=" + "vendorHash": "sha256-Lz8ixBnWqecxBqS+XVrpkVg1X2Ew28axO+jmo+Zb8cE=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -1165,13 +1165,13 @@ "vendorHash": null }, "sakuracloud": { - "hash": "sha256-8fNQ1g+XAu0K0adZSCLwhuLNk4qxUbcDNVYXVhOwNk8=", + "hash": "sha256-hS4hXmi30yiIkWNqXKhuIE3UtzcWrfu4w6XR6B9Vebc=", "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", "owner": "sacloud", "repo": "terraform-provider-sakuracloud", - "rev": "v2.29.1", + "rev": "v2.30.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-Icua01a4ILF+oAO5nMeCGPZrWc3V/SVObWydO72CU3I=" + "vendorHash": "sha256-at8i4gCFrJxE9fVIL5uI7iSFex0gLXu1SnlPKlZAmrY=" }, "scaleway": { "hash": "sha256-FiC5FAag+ycf8Ti1iDXsJM5cb7xQUx8RLlv0gJ3+cNA=", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 079094595b7e..ee1c5084c27d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,24 +9,24 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.110"; + stable = "0.0.111"; ptb = "0.0.161"; canary = "0.0.761"; - development = "0.0.85"; + development = "0.0.89"; } else { - stable = "0.0.359"; - ptb = "0.0.190"; - canary = "0.0.858"; - development = "0.0.97"; + stable = "0.0.362"; + ptb = "0.0.192"; + canary = "0.0.867"; + development = "0.0.100"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-WwMEtpMlaR5psraDsvTNOb4nPwnGnVif4DgmdE9gCtc="; + hash = "sha256-o4U6i223Agtbt1N9v0GO/Ivx68OQcX/N3mHXUX2gruA="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; @@ -38,25 +38,25 @@ let }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-GW5LrPMr0uS5ko+FwKfU++4hhzqBQ6FDYBoM2fxDQcE="; + hash = "sha256-ZMsBR0LAISrM3dib8fehW/eZGkwSCinQF60jJG76O7M="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-bxKzOPiljJaY78aiX2BklfMHXgwKrLuWEQVmrNk3TdE="; + hash = "sha256-DHe0WwJOB3mm1HbQwEOJ9NWqxzhOBQynhjJXYSNvA/k="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-2Y95SW9b6SeZdeTUmIedAQYJ/5WylL4soGAbUSdDyuQ="; + hash = "sha256-AZ9enKJf6WZLELFLKrzeyAR/Q/pzD8SGvCPcInS8vsk="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-/dVr7ZS6bRccLPz85xxoniZEbkK1qQ3lqedhGuaBIRk="; + hash = "sha256-67B2wZRZEOKutMPsrRlc96UZWShYLAgwOoF2/QzBgzE="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-BVTQPr3Oox/mTNE7LTJfYuKhI8PlkJlznKiOffqpECs="; + hash = "sha256-PknNHr9txxp3+nO7FgHH7n04qx6p6Jzbs92/Hcfh13Y="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/video/kodi/addons/plex-for-kodi/default.nix b/pkgs/applications/video/kodi/addons/plex-for-kodi/default.nix new file mode 100644 index 000000000000..086dce6bc82b --- /dev/null +++ b/pkgs/applications/video/kodi/addons/plex-for-kodi/default.nix @@ -0,0 +1,51 @@ +{ + lib, + addonDir, + buildKodiAddon, + fetchFromGitHub, + addonUpdateScript, + kodi-six, + six, + requests, +}: + +buildKodiAddon rec { + pname = "plex"; + namespace = "script.plex"; + version = "0.7.9-rev4"; + + src = fetchFromGitHub { + owner = "pannal"; + repo = "plex-for-kodi"; + rev = "v${version}"; + sha256 = "sha256-rNxTz3SKHHBm0WDCoZ/foJN2pBBiyI3a/tOdQdOCuXA="; + }; + + # Plex for Kodi writes to its own directory by default, needs to be patched to a non-store path. + # Once https://github.com/pannal/plex-for-kodi/pull/219 is merged, this can be replaced with a smaller patch that just sets the environment variable INSTALLATION_DIR_AVOID_WRITE, e.g. adding to main.py: + # import os; os.environ("INSTALLATION_DIR_AVOID_WRITE") = True + patches = [ ./plex-template-dir.patch ]; + + propagatedBuildInputs = [ + six + requests + kodi-six + ]; + + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.plex"; + }; + }; + + postInstall = '' + mv /build/source/addon.xml $out${addonDir}/${namespace}/ + ''; + + meta = with lib; { + homepage = "https://www.plex.tv"; + description = "Unofficial Plex for Kodi add-on"; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/plex-for-kodi/plex-template-dir.patch b/pkgs/applications/video/kodi/addons/plex-for-kodi/plex-template-dir.patch new file mode 100644 index 000000000000..28309f8f1226 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/plex-for-kodi/plex-template-dir.patch @@ -0,0 +1,79 @@ +diff --git a/lib/_included_packages/plexnet/gdm.py b/lib/_included_packages/plexnet/gdm.py +index ccc540ae..3dce02a3 100644 +--- a/lib/_included_packages/plexnet/gdm.py ++++ b/lib/_included_packages/plexnet/gdm.py +@@ -28,7 +28,7 @@ class GDMDiscovery(object): + from . import plexapp + return util.INTERFACE.getPreference("gdm_discovery", True) and self.thread and self.thread.is_alive() + +- ''' ++ r''' + def discover(self): + # Only allow discovery if enabled and not currently running + self._close = False +diff --git a/lib/templating/core.py b/lib/templating/core.py +index 30a53392..e0249e1d 100644 +--- a/lib/templating/core.py ++++ b/lib/templating/core.py +@@ -7,6 +7,7 @@ from kodi_six import xbmcvfs, xbmc + from ibis.context import ContextDict + from lib.logging import log as LOG, log_error as ERROR + from .util import deep_update ++from ..util import PROFILE + from lib.os_utils import fast_iglob + from .filters import * + +@@ -59,11 +60,22 @@ class TemplateEngine(object): + TEMPLATES = None + + def init(self, target_dir, template_dir, custom_template_dir): +- self.target_dir = target_dir ++ # Redirect template write target_dir to writable addon_data ++ writable_base = os.path.join(PROFILE, "resources/skins/Main/1080i") ++ os.makedirs(writable_base, exist_ok=True) ++ # Link media dir into addon dir, so templates can access it via relative path ++ link_path = os.path.join(PROFILE, "resources/skins/Main/media") ++ if not os.path.exists(link_path): ++ os.symlink( ++ os.path.join(os.path.dirname(target_dir), "media"), ++ link_path, ++ True ++ ) ++ self.target_dir = writable_base + self.template_dir = template_dir + self.custom_template_dir = custom_template_dir + self.get_available_templates() +- paths = [custom_template_dir, template_dir] ++ paths = [custom_template_dir, self.template_dir] + + LOG("Looking for templates in: {}", paths) + self.prepare_loader(paths) +diff --git a/lib/windows/kodigui.py b/lib/windows/kodigui.py +index be7ef154..e8cc09b9 100644 +--- a/lib/windows/kodigui.py ++++ b/lib/windows/kodigui.py +@@ -4,6 +4,7 @@ from __future__ import absolute_import + import threading + import time + import traceback ++import os + + from kodi_six import xbmc + from kodi_six import xbmcgui +@@ -41,13 +42,14 @@ class BaseFunctions(object): + + @classmethod + def open(cls, **kwargs): +- window = cls(cls.xmlFile, cls.path, cls.theme, cls.res, **kwargs) ++ window = cls(cls.xmlFile, util.PROFILE, cls.theme, cls.res, **kwargs) + window.modal() + return window + + @classmethod + def create(cls, show=True, **kwargs): +- window = cls(cls.xmlFile, cls.path, cls.theme, cls.res, **kwargs) ++ window = cls(cls.xmlFile, util.PROFILE, cls.theme, cls.res, **kwargs) ++ + if show: + window.show() + if xbmcgui.getCurrentWindowId() < 13000: diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index 559a00a907ac..f81a7db70d85 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "15.0.2"; + version = "15.0.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-mQq0zLfv8bbXBAnpqn+kEZh3rF9dELohnphGCrPk1us="; + hash = "sha256-n1XsEPCpH7ZHmrTtKzelJEWu6RdwaiONFwtSIMAi/kM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ba/bazel-remote/package.nix b/pkgs/by-name/ba/bazel-remote/package.nix index 91a84898b204..48ea38654f86 100644 --- a/pkgs/by-name/ba/bazel-remote/package.nix +++ b/pkgs/by-name/ba/bazel-remote/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "buchgr"; repo = "bazel-remote"; rev = "v${version}"; - hash = "sha256-TKfoQEUYsLDJL9sINoCOBeB7SgH5MyyuUIOAhRoZLfU="; + hash = "sha256-9vPaTm/HTJ3ftlFg+AkcwXX7xyhmGTgKL3PXhtUHRDk="; }; - vendorHash = "sha256-bM545QqUXg8io6SNK4dtT+UL/MTvQW7pi+Mb3rb7R48="; + vendorHash = "sha256-uh8ST1AQ8OsFMfXly23TMMcheNmhb1MknmPMjB76GIQ="; subPackages = [ "." ]; diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix index f287f60f9262..40e24646d585 100644 --- a/pkgs/by-name/bl/bluesky-pds/package.nix +++ b/pkgs/by-name/bl/bluesky-pds/package.nix @@ -21,13 +21,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pds"; - version = "0.4.169"; + version = "0.4.182"; src = fetchFromGitHub { owner = "bluesky-social"; repo = "pds"; tag = "v${finalAttrs.version}"; - hash = "sha256-CInfhE9PeAbScVtMvvEyA5f6q0WIChTHf49/vh+Kqwc="; + hash = "sha256-FNfM3kr0PTJp9mKYtzd6uH5mUfupqv0aA3sAPRq+pF4="; }; sourceRoot = "${finalAttrs.src.name}/service"; @@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - fetcherVersion = 1; - hash = "sha256-bBGumJBpTWaSPpo4WUNvdF2PCOS6w60Xn6kgS12y6PU="; + fetcherVersion = 2; + hash = "sha256-pUCICsuuc3CeWGeJ6il0etLQkntPF9MKRiJsiNDfroo="; }; buildPhase = '' diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index 24e2ee0d798b..021d03c96ca1 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -8,6 +8,7 @@ testers, installShellFiles, stdenv, + writableTmpDirAsHomeHook, }: let version = "2.10.2"; @@ -31,8 +32,6 @@ buildGo125Module { vendorHash = "sha256-wjcmWKVmLBAybILUi8tKEDnFbhtybf042ODH7jEq6r8="; - subPackages = [ "cmd/caddy" ]; - ldflags = [ "-s" "-w" @@ -48,6 +47,10 @@ buildGo125Module { nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + + __darwinAllowLocalNetworking = true; + postInstall = '' install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index 753c2013a2fd..e74943cc599d 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.25.18"; + version = "0.25.19"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; tag = "v${version}"; - hash = "sha256-1CHUkXjb8+wOFQWo/04KcLaJcv/dLiDYwPrSnzWucXI="; + hash = "sha256-CroarDNmLSMQJy4Hy7TcK8LYcqQ+xVFj8iG8HLTKS60="; }; - cargoHash = "sha256-ESaESon1oJAlvsv6+TIb/lLsOQmjgheQWm82Lr0mJOE="; + cargoHash = "sha256-4Y1wTgS5C4VadOWb9Uv5Jrblfjz6Caqv+XQUETalIH0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/carl/package.nix b/pkgs/by-name/ca/carl/package.nix index 836a598c876a..7c44f0db531c 100644 --- a/pkgs/by-name/ca/carl/package.nix +++ b/pkgs/by-name/ca/carl/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "carl"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "b1rger"; repo = "carl"; rev = "v${version}"; - hash = "sha256-+l11eP+1qKrWbZhyUJgQ8FgQ+2rncx778F5RPzCfvV4="; + hash = "sha256-bUSQArlCfgJr/XJuuyMVNFOZzJlmpInaEGHHxRZsDW4="; }; doCheck = false; - cargoHash = "sha256-kzHMjrLCiiMLMTSozKq5jMWq3rGb+xsXhZoOuod7qGE="; + cargoHash = "sha256-KueQLeqiHZfjyEdpURKXp6MigAcXdov8Z/KwKsiqv9Y="; meta = { description = "cal(1) with more features and written in rust"; diff --git a/pkgs/by-name/ce/celestegame/celeste/default.nix b/pkgs/by-name/ce/celestegame/celeste/default.nix new file mode 100644 index 000000000000..e56467ec5e04 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/celeste/default.nix @@ -0,0 +1,171 @@ +{ + lib, + stdenvNoCC, + requireFile, + makeWrapper, + copyDesktopItems, + makeDesktopItem, + unzip, + yq, + dotnet-runtime_8, + + executableName ? "Celeste", + desktopItems ? null, + everest ? null, + overrideSrc ? null, + writableDir ? null, + launchFlags ? "", + launchEnv ? "", + # If we leave it to be the default (log.txt), + # Everest will try to delete log.txt when it starts, + # which doesn't work because the file system is read-only. + # https://github.com/EverestAPI/Everest/blob/050b4a1b4a7918b22d3d5140224f9c0472e1655a/Celeste.Mod.mm/Patches/Celeste.cs#L140-L155 + everestLogFilename ? "everest-log.txt", +}: + +# TODO: It appears that it is possible to package Celeste for aarch devices: +# https://github.com/pixelomer/Celeste-ARM64 +# However, I don't have an aarch device to do that. +# The ARM support doesn't seem promising because the builder needs to fetch fmod libraries somehow, which requires an account. +# Though this whole process of registration and downloading can possibly be automated, this is probably against the TOS. +let + pname = "celeste-unwrapped"; + version = "1.4.0.0"; + downloadPage = "https://maddymakesgamesinc.itch.io/celeste"; + description = "2D platformer game about climing a mountain"; + phome = "$out/lib/Celeste"; + + launchFlags' = + if launchFlags != "" && everest == null then + lib.warn "launchFlags is useless without Everest." "" + else + launchFlags; + launchEnv' = + if launchEnv != "" && everest == null then + lib.warn "launchEnv is useless without Everest." "" + else + '' + EVEREST_LOG_FILENAME=${everestLogFilename} + EVEREST_TMPDIR=${writableDir} + ${launchEnv} + ''; +in +stdenvNoCC.mkDerivation { + pname = "celeste-unwrapped"; + version = version; + + src = + if overrideSrc == null then + requireFile { + name = "celeste-linux.zip"; + hash = "sha256-phNDBBHb7zwMRaBHT5D0hFEilkx9F31p6IllvLhHQb8="; + url = downloadPage; + } + else + overrideSrc; + dontUnpack = true; + + nativeBuildInputs = [ + unzip + yq + makeWrapper + copyDesktopItems + ]; + desktopItems = + if desktopItems != null then + desktopItems + else + [ + (makeDesktopItem { + name = "Celeste"; + desktopName = "Celeste"; + genericName = "Celeste"; + comment = description; + exec = "${executableName}"; + icon = "Celeste"; + categories = [ "Game" ]; + }) + ]; + + postInstall = '' + mkdir -p ${phome} + unzip -q $src -d ${phome} + '' + + lib.optionalString (everest != null) '' + cp -r ${everest}/* $out + chmod -R +w ${phome} # Files copied from other derivations are not writable by default + + # There will still be a runtime error saying chmod failed for the splash, + # but it doesn't matter because we make it executable here. + # https://github.com/EverestAPI/Everest/blob/050b4a1b4a7918b22d3d5140224f9c0472e1655a/Celeste.Mod.mm/Mod/Everest/EverestSplashHandler.cs#L73-L81 + chmod +x ${phome}/EverestSplash/EverestSplash-linux + + # Everest determines whether it is FNA or XNA by the existence of the file. + # Creating this now prevents it from creating it in the future + # when the file system is read-only. + # https://github.com/EverestAPI/Everest/blob/050b4a1b4a7918b22d3d5140224f9c0472e1655a/Celeste.Mod.mm/Patches/Celeste.cs#L41-L47 + touch ${phome}/BuildIsFNA.txt + + # Please Piton by having the runtime. + # Otherwise it will try to download it. + # https://github.com/Popax21/Piton/blob/21c7868d06007f0c5e7d9030a0109fe892df1bf3/apphost/src/runtime.rs#L82-L89 + mkdir ${phome}/piton-runtime + ln -s ${dotnet-runtime_8}/share/dotnet/* -t ${phome}/piton-runtime + platform=linux-x86_64 + echo -n "$platform $(yq -r .\"$platform\".version ${phome}/piton-runtime.yaml)" > ${phome}/piton-runtime/piton-runtime-id.txt + + chmod +x ${phome}/MiniInstaller-linux + ${phome}/MiniInstaller-linux + + echo "${launchFlags'}" > ${phome}/everest-launch.txt + echo "${launchEnv'}" > ${phome}/everest-env.txt + '' + + ( + if writableDir != null then + '' + mv ${phome}/Celeste ${phome}/Celeste-unwrapped + ln -s ${writableDir}/Celeste ${phome}/Celeste + '' + else + '' + ln -s ${phome}/Celeste ${phome}/Celeste-unwrapped + '' + ) + + '' + makeWrapper ${phome}/Celeste-unwrapped $out/bin/${executableName} ${ + # If ${phome}/lib64-linux is not present in LD_LIBRARY_PATH, Everest will try to restart: + # https://github.com/EverestAPI/Everest/blob/7bd41c26850bbdfef937e2ed929174e864101c4c/Celeste.Mod.mm/Mod/Everest/BOOT.cs#L188-L201 + # It is hardcoded that it launches Celeste instead of Celeste-unwrapped. + # Therefore, we need to prevent it from restarting. + lib.optionalString (everest != null) "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux" + } --chdir ${phome} + + icon=$out/share/icons/hicolor/512x512/apps/Celeste.png + mkdir -p $(dirname $icon) + ln -s ${phome}/Celeste.png $icon + ''; + + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + postFixup = + lib.optionalString (everest != null) '' + rm -r ${phome}/Mods # Currently it is empty. + ln -s "${writableDir}"/{Mods,LogHistory,CrashLogs,${everestLogFilename}} -t ${phome} + '' + + lib.optionalString (writableDir != null) '' + ln -s "${writableDir}/log.txt" -t ${phome} + ''; + + meta = { + inherit downloadPage description; + homepage = "https://www.celestegame.com"; + license = with lib.licenses; [ unfree ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ ulysseszhan ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + }; +} diff --git a/pkgs/by-name/ce/celestegame/everest-bin/default.nix b/pkgs/by-name/ce/celestegame/everest-bin/default.nix new file mode 100644 index 000000000000..19909557f3f2 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/everest-bin/default.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenvNoCC, + fetchzip, + icu, + autoPatchelfHook, +}: + +let + pname = "everest"; + version = "5806"; + phome = "$out/lib/Celeste"; +in +stdenvNoCC.mkDerivation { + inherit pname version; + src = fetchzip { + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5806.0/main.zip"; + extension = "zip"; + hash = "sha256-Hw/BNvWfhdO7bvYrY/Px12BRG1SYcCBeAXBH4QnKyeY="; + }; + buildInputs = [ + icu + ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; + postInstall = '' + mkdir -p ${phome} + cp -r * ${phome} + ''; + dontAutoPatchelf = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + postFixup = '' + autoPatchelf ${phome}/MiniInstaller-linux + ''; + meta = { + description = "Celeste mod loader"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ ulysseszhan ]; + homepage = "https://everestapi.github.io"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; + +} diff --git a/pkgs/by-name/ce/celestegame/everest/default.nix b/pkgs/by-name/ce/celestegame/everest/default.nix new file mode 100644 index 000000000000..5ef0ee79b589 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/everest/default.nix @@ -0,0 +1,107 @@ +{ + lib, + fetchurl, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + autoPatchelfHook, + mono, + git, + icu, +}: + +let + pname = "everest"; + version = "5806"; + phome = "$out/lib/Celeste"; +in +buildDotnetModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "EverestAPI"; + repo = "Everest"; + rev = "e47f67fc8c4b0b60b0a75112c5c90704ed371040"; + fetchSubmodules = true; + leaveDotGit = true; # MonoMod.SourceGen.Internal needs .git + hash = "sha256-uxb9LwCDGJIc+JN2EqNqHdLLwULnG7Bd/Az3H1zKf3E="; + }; + + nativeBuildInputs = [ + git + autoPatchelfHook + ]; + + buildInputs = [ + icu # For autoPatchelf + mono # See upstream README + ]; + + postPatch = '' + # MonoMod.ILHelpers.Patcher complains at build phase: You must install .NET to run this application. + sed -i 's|||' Celeste.Mod.mm/Celeste.Mod.mm.csproj + + autoPatchelf lib-ext/piton/piton-linux_x64 + ''; + + dotnet-sdk = dotnetCorePackages.sdk_9_0; + + preConfigure = '' + # Microsoft.SourceLink.GitHub complains: Unable to determine repository url, the source code won't be available via source link. + cd external/MonoMod + git -c safe.directory='*' remote add origin https://github.com/MonoMod/MonoMod.git + cd ../.. + ''; + + nugetDeps = ./deps.json; + + # Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814 + linkNugetPackages = true; + + # Microsoft.NET.Sdk complains: The process cannot access the file xxx because it is being used by another process. + enableParallelBuilding = false; + + preBuild = '' + # See .azure-pipelines/prebuild.ps1 + sed -i 's|0\.0\.0-dev|1.${version}.0-nixos-'$(git rev-parse --short=5 HEAD)'|' Celeste.Mod.mm/Mod/Everest/Everest.cs + cat Celeste.Mod.mm/Mod/Everest/Everest.cs + cat <<-EOF > Celeste.Mod.mm/Mod/Helpers/EverestVersion.cs + namespace Celeste.Mod.Helpers { + internal static class EverestBuild${version} { + public static string EverestBuild = "EverestBuild${version}"; + } + } + EOF + ''; + + installPath = builtins.replaceStrings [ "$out" ] [ (placeholder "out") ] phome; + + postInstall = '' + mkdir tmp-EverestSplash + mv ${phome}/EverestSplash* tmp-EverestSplash + mv tmp-EverestSplash ${phome}/EverestSplash + cp ${phome}/piton-runtime.yaml ${phome}/EverestSplash + ''; + + executables = [ ]; + + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + dontAutoPatchelf = true; + + meta = { + description = "Celeste mod loader"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ ulysseszhan ]; + homepage = "https://everestapi.github.io"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ + binaryNativeCode + fromSource + ]; + }; +} diff --git a/pkgs/by-name/ce/celestegame/everest/deps.json b/pkgs/by-name/ce/celestegame/everest/deps.json new file mode 100644 index 000000000000..b969cfd4b5a4 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/everest/deps.json @@ -0,0 +1,1037 @@ +[ + { + "pname": "DotNetZip", + "version": "1.16.0", + "hash": "sha256-RlzHkO7DxCvRkr+gpM8Abs34XbovmBTmXfO7LtnE75E=" + }, + { + "pname": "IsExternalInit", + "version": "1.0.3", + "hash": "sha256-UfyGrj+hAfsvS/R7tlugTToD//ax9Fy0CameinRn1AU=" + }, + { + "pname": "Jdenticon-net", + "version": "3.1.2", + "hash": "sha256-tee3C3lYVDiic/8zZkNSuz8fNx7DXQFReIdrlQWRmww=" + }, + { + "pname": "KeraLua", + "version": "1.3.2", + "hash": "sha256-15C9K/S9L3yzB4wmDRNWQoWNskUVcm6qZjCbQQFGMPI=" + }, + { + "pname": "MAB.DotIgnore", + "version": "3.0.2", + "hash": "sha256-iAX3oCX2092oKXEASUhMkh2A1kh1cBRSkkMJ6BmszRA=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "3.0.1", + "hash": "sha256-y4VQ8teCZOnCJyg0rh3s1SbbqfoEclB5T6lCfMrxWUw=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "3.1.10", + "hash": "sha256-51D1XkqFMPHJzOmt1HQ0Bf1n9K0auwEyxTJuqA/8xHY=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "5.0.0", + "hash": "sha256-z22ZDldoIlDUYeF9Rje0aVPlYAGKIpdj5wDzn1CW+jQ=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "7.0.20", + "hash": "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.19", + "hash": "sha256-QySX2bih1UvwmLcn9cy1j+RuvZZwbcFKggL5Y/WcTnw=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "3.0.3", + "hash": "sha256-CbtnZSF+lvyeIfEUC8a0Jf4EMvYAxa9mvWF9lyLymMk=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "3.1.32", + "hash": "sha256-OV3Ie8JGTEwNI4Y6DJFh+ZUrBTwrSdFjEbfljfAwn3s=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "5.0.17", + "hash": "sha256-iHn2yGpaL5EM8L7nJJ2aRCIZ+kE98NS+KWUvrWnjzhg=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "6.0.36", + "hash": "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "7.0.20", + "hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.19", + "hash": "sha256-u50rdLuoADSDCthx2Fg+AnT192TalHhFrzFCfMgmTn4=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "1.1.0", + "hash": "sha256-cwZU5VeF6aRZJqoIevJtF9hdYC1rKEf1GuqgCmoVAzE=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "8.0.0", + "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + }, + { + "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", + "version": "3.3.4", + "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.12.0", + "hash": "sha256-mm/OKG3zPLAeTVGZtuLxSG+jpQDOchn1oyHqBBJW2Ho=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.12.0", + "hash": "sha256-m1i1Q5pyEq4lAoYjNE9baEjTplH8+bXx5wSA+eMmehk=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.CodeStyle", + "version": "4.12.0", + "hash": "sha256-c9JyQNTMTr8WoNGzk3KDyaQuZjpkyBnM5I3P5oJwIkU=" + }, + { + "pname": "Microsoft.Net.Compilers.Toolset", + "version": "4.12.0", + "hash": "sha256-/iTvMab/y3xJOD0v02J2Pe4pGtm52YzAwZ74AgO5nrw=" + }, + { + "pname": "Microsoft.NET.HostModel", + "version": "3.1.16", + "hash": "sha256-42cFtaZFzM93I0gZjuDbcEYWM5Pld+kx2MkWu0J66ww=" + }, + { + "pname": "Microsoft.NET.Sdk.IL", + "version": "8.0.0", + "hash": "sha256-guQcVwSaVwJ0uJvUYZqk1bZ9ATLBk3zWHZmTW7EV1KM=" + }, + { + "pname": "Microsoft.NETCore.App", + "version": "2.1.0", + "hash": "sha256-RJksv5W7LhWJYGmkwYHfiU0s9XLCvT05KxSMz6U1/OE=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "3.0.3", + "hash": "sha256-hIdA8ncOXoDM6/ryKCTVz/vZrqFLffxAgpN/qfl2L6Y=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "3.1.32", + "hash": "sha256-ajR6pZv0zuzWDyxEnWtAuhasV5biV5lvweEbefTISiM=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "5.0.17", + "hash": "sha256-exMpVamk8ZzfCQDQcDmQDYJplDcOOU99ic7NSDKUgtE=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "6.0.36", + "hash": "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "7.0.20", + "hash": "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.19", + "hash": "sha256-a9t/bX+WIKOu9q2R52b/hPGwOpkAgpYuP42SW2QXTak=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "3.0.0", + "hash": "sha256-PHovvd+mPN9HoCF0rFEnS015p7Yj76+e9cfSU4JAI+I=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "3.1.0", + "hash": "sha256-nuAvHwmJ2s3Ob1qNDH1+uV3awOZaWlaV3FenTmPUWyM=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "5.0.0", + "hash": "sha256-kQ8wpR4crWoqy/jrskat34Y3Nr3nbxoSpEPMnxycwtw=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "7.0.20", + "hash": "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.19", + "hash": "sha256-4ymel0R1c0HrX0plAWubJPzev52y0Fsx1esyQ1R7bXc=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "3.0.3", + "hash": "sha256-mxA9JF2WyEDV8yahdwhe4qfCTbIFroUfmMzPBa91b/o=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "3.1.32", + "hash": "sha256-h4HjfRnvH81dW84S3TCPcCfxeQLiLN7b1ZleRNsprFY=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "5.0.17", + "hash": "sha256-2NpVvrbqct3M1fKiSe/zyt41mf1aV6WUdxIlJod27Ek=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "6.0.36", + "hash": "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "7.0.20", + "hash": "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.19", + "hash": "sha256-Ou51zUFTPESAAzP/z0+sLDAAXC54+oDlESBBT12M2lM=" + }, + { + "pname": "Microsoft.NETCore.DotNetAppHost", + "version": "2.1.0", + "hash": "sha256-LV8pnNFsKGFONyCTGsd8qB5A+EUIiyvbYWAr0eOEFoI=" + }, + { + "pname": "Microsoft.NETCore.DotNetHostPolicy", + "version": "2.1.0", + "hash": "sha256-FqQm4BLznzRmF1nhk3nEwrdeAdCY35eBmHk6/4+MCPY=" + }, + { + "pname": "Microsoft.NETCore.DotNetHostResolver", + "version": "2.1.0", + "hash": "sha256-5nQTmMhaEvbuT+1f7u0t0tEK3SCVUeXhsExq8tiYBI0=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "2.1.0", + "hash": "sha256-v09ltBAKTX8iAKuU2nCl+Op/ilVJQ0POZUh2z+u0rVo=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "3.1.0", + "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "3.1.1", + "hash": "sha256-ByV7aEFjGR4L4Tudg4KaJ96lnzr7RhOxzWGE0p5XFRY=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "2.1.0", + "hash": "sha256-+KdWdA9I392SRqMb9KaiiRZatfvJ9RcdbtyGUkpHW7U=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies", + "version": "1.0.3", + "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net35", + "version": "1.0.3", + "hash": "sha256-sWFWERqIZw2Rp1f71GX8tIVuA0saTVI64sQaRw81ePk=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net452", + "version": "1.0.3", + "hash": "sha256-RTPuFG8D7gnwINEoEtAqmVm4oTW8K4Z87v1o4DDeLMI=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net461", + "version": "1.0.3", + "hash": "sha256-vVIonl+4dlCQuxibOZoGR3o1DAhjAYpFW15dnkUpjMk=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "1.1.0", + "hash": "sha256-bVbHHr6Mo1NUdaaQgfj1GvGPzrobRlYb2pI7f4VDslk=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "8.0.0", + "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "1.1.0", + "hash": "sha256-Y5zUGJfiSj8/rQ1lK0t5Zje8rjoUhgbWrR8IpwtzB34=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "8.0.0", + "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "8.0.0", + "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ=" + }, + { + "pname": "Mono.Cecil", + "version": "0.10.4", + "hash": "sha256-NFGkoRKoG+C/drjcK8o5as3wRV2AyJYeeQPOH7NcKpo=" + }, + { + "pname": "Mono.Cecil", + "version": "0.11.5", + "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA=" + }, + { + "pname": "MonoMod.Backports", + "version": "1.1.0", + "hash": "sha256-ruRX10/u+lRfMKr0UMbCVYS/nUK5fzV4+8ujJXBnles=" + }, + { + "pname": "MonoMod.Core", + "version": "1.0.0", + "hash": "sha256-Y55fgMd0d35qztqqC0drzn3NdSMYLiWie8IL9LbmFnc=" + }, + { + "pname": "MonoMod.ILHelpers", + "version": "1.0.0", + "hash": "sha256-N6ybnOMkEtxXy/PdJAEkqHggHYSLETbCMF+mgNGXAvo=" + }, + { + "pname": "MonoMod.Patcher", + "version": "25.0.0-prerelease.1", + "hash": "sha256-+5kddzc3FheDIRNoTPWQREc1ufVFjfPFiiKrXTPCTWQ=" + }, + { + "pname": "MonoMod.RuntimeDetour", + "version": "25.0.0", + "hash": "sha256-yyP3kTN+OcOoO8xmHZfebKB/EtWNi7V6aJnXUTjVU/8=" + }, + { + "pname": "MonoMod.RuntimeDetour.HookGen", + "version": "22.7.31.1", + "hash": "sha256-kjxLqU4/DprV1vyPfvC7nTTa6ShLS3HBFGiDXmHAEJw=" + }, + { + "pname": "MonoMod.Utils", + "version": "25.0.0", + "hash": "sha256-PL7/F0zXnLRb5icD5zl/QCeMyTEsJZKOvSBvM1t8BEY=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + }, + { + "pname": "NuGetizer", + "version": "1.2.3", + "hash": "sha256-KxvcV650WNBqpSn3S6xVjH95PT5mnUb3pPYBPleWHRM=" + }, + { + "pname": "Nullable", + "version": "1.3.1", + "hash": "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM=" + }, + { + "pname": "PolySharp", + "version": "1.14.1", + "hash": "sha256-l6hz+SG+cEO817xTMq4DbJSJVnRe6Ffr+uJGVj/t170=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.App", + "version": "2.1.0", + "hash": "sha256-qFtPLe3t/V9DZTaYhAO6MbVsyzH4hcQQUvyIJ6ywbEw=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost", + "version": "2.1.0", + "hash": "sha256-NMuEFKc68Vn4bVoX6kdGSQeyDpktUYliUg6Lbj4E8FU=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", + "version": "2.1.0", + "hash": "sha256-U/WlbUpImqPjZf075WgBOb1o1i1H3VOL4QbzHfQ9Itk=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", + "version": "2.1.0", + "hash": "sha256-vcB6FY1GDP+kTsmp9OXpPg50sXKqOSJzWUSuNlN1+rs=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", + "version": "6.0.0", + "hash": "sha256-i/UcSf9HhYBtscSZKsaPReL/ntN8EQhmEpFIkEfoGhQ=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", + "version": "6.0.0", + "hash": "sha256-flN7eEFoqIUmbuGHgVu/R1F7trwjOXwxmBVw/+Jv2Hg=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.Immutable", + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Drawing.Common", + "version": "8.0.0", + "hash": "sha256-xPNnKUTcZiqnTtRgI2YazMoZgay/prwKrJjbZUbVmcg=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.3.0", + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.7.0", + "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.7.0", + "hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.7.0", + "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.5.0", + "hash": "sha256-wM75ACJUeypeOdaBUj4oTYiSWmg7A1usMpwRQXjSGK8=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "8.0.0", + "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.3.0", + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.3", + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.3.0", + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Security.AccessControl", + "version": "4.7.0", + "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Permissions", + "version": "4.7.0", + "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.7.0", + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "4.7.1", + "hash": "sha256-OUA8ttAKGgqD5KUwtnO2OewBF/tJI0nO3YcunK5qMPg=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "7.0.0", + "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.0", + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.3.0", + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, + { + "pname": "System.Windows.Extensions", + "version": "4.7.0", + "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, + { + "pname": "YamlDotNet", + "version": "16.1.3", + "hash": "sha256-xsti5h1ZUCS9Jvb4UGKdHrEudJIQXrbOe0USxSjWqjc=" + } +] diff --git a/pkgs/by-name/ce/celestegame/package.nix b/pkgs/by-name/ce/celestegame/package.nix new file mode 100644 index 000000000000..dd9afc490cff --- /dev/null +++ b/pkgs/by-name/ce/celestegame/package.nix @@ -0,0 +1,222 @@ +{ + lib, + callPackage, + buildFHSEnv, + fetchzip, + makeDesktopItem, + writeShellScript, + autoPatchelfHook, + runtimeShell, + + overrideSrc ? null, + # A package. Omit to build without Everest. + everest ? null, + # If build with Everest, must set writableDir to the path of a writable dir + # so that the mods can be installed there. + # It must be an absolute path. + # Example: "/home/kat/.local/share/Everest" + writableDir ? null, + # Optionally set paths of symlinks to the installation dir of Celeste. + # You can use this in Olympus so that you don't have to change installation dir path + # every time the nix store path changes. + # The links are updated every time the command `Celeste` is run. + gameDir ? [ ], + # This will be appended to everest-launch.txt. + launchFlags ? "", + # This will be appended to everest-env.txt. + launchEnv ? "", +}: + +# For those who would like to use steam-run or alike to launch Celeste +# (useful when using the `olympus` package with its `celesteWrapper` argument overridden), +# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`, and if you want Everest, +# override `everest` to `celestegame.passthru.everest-bin` instead of `celestegame.passthru.everest` +# (steam-run cannot launch the latter for some currently unclear reason). +# For those who would like to launch Celeste without the need of any additional wrapper like steam-run, +# install `celestegame` with the `writableDir` argument overridden. + +let + pname = "celeste"; + phome = "$out/${celesteHomeRelative}"; + executableName = "Celeste"; + + writableDir' = + if writableDir == null && everest != null then + lib.warn "writableDir is not set, so mods will not work." "/tmp" + else + writableDir; + gameDir' = lib.toList gameDir; + + everestLogFilename = "everest-log.txt"; + + celeste = callPackage ./celeste { + inherit + executableName + everest + overrideSrc + launchFlags + launchEnv + everestLogFilename + ; + desktopItems = [ desktopItem ]; + writableDir = writableDir'; + }; + celesteHomeRelative = "lib/Celeste"; + celesteHome = "${celeste}/${celesteHomeRelative}"; + + desktopItem = makeDesktopItem { + name = "Celeste"; + desktopName = "Celeste"; + genericName = "Celeste"; + comment = celeste.meta.description; + exec = executableName; + icon = "Celeste"; + categories = [ "Game" ]; + }; + +in +buildFHSEnv { + inherit pname executableName; + version = celeste.version + (lib.optionalString (everest != null) "+everest.${everest.version}"); + + multiPkgs = + pkgs: + with pkgs; + [ + glib + glibc_multi + kdePackages.wayland + libxkbcommon + libgcc + mesa + libdrm + expat + alsa-lib + at-spi2-atk + libGL + pcre2 + libffi + zlib + util-linux.lib + libselinux + nspr + systemd + gtk3 + pango + harfbuzz + fontconfig + fribidi + cairo + libepoxy + tinysparql + libthai + libpng + freetype + pixman + libcap + graphite2 + bzip2 + brotli + libjpeg + json-glib + libxml2 + sqlite + libdatrie + ffmpeg + nss + dbus.lib + acl + attr + gmp + readline + libpulseaudio + pipewire + vulkan-loader + ] + ++ (with xorg; [ + libX11 + libXcomposite + libXdamage + libXfixes + libXext + libxcb + libXcursor + libXinerama + libXi + libXrandr + libXScrnSaver + libXxf86vm + libXau + libXdmcp + ]); + + targetPkgs = pkgs: [ celeste ]; + + extraInstallCommands = '' + icon=$out/share/icons/hicolor/512x512/apps/Celeste.png + mkdir -p $(dirname $icon) + ln -s ${celesteHome}/Celeste.png $icon + cp -r ${desktopItem}/* $out + ''; + + extraPreBwrapCmds = '' + export NIX_CELESTE_LAUNCHER=$(realpath --no-symlinks $0) + ''; + + runScript = writeShellScript executableName ( + lib.optionalString (writableDir' != null) '' + mkdir -p "${writableDir'}" + touch "${writableDir'}/log.txt" + + # This script is symlinked to gameDir/Celeste, which gets launched by Olympus + # (if the user set up Olympus to use gameDir as the location of Celeste). + # Writing the script like this makes Olympus able to launch Celeste wihout any wrapper without any problems. + echo "#! ${runtimeShell} + exec $NIX_CELESTE_LAUNCHER"' "$@"' > "${writableDir'}/Celeste" + chmod +x "${writableDir'}/Celeste" + '' + + lib.optionalString (everest != null) '' + mkdir -p "${writableDir'}"/{LogHistory,Mods,CrashLogs} + touch "${writableDir'}/${everestLogFilename}" + + # Needed to prevent restarting; see comments in postInstall of ./celeste/default.nix. + export LD_LIBRARY_PATH="${celesteHome}/lib64-linux:$LD_LIBRARY_PATH" + '' + + lib.optionalString (gameDir' != [ ]) ( + lib.concatMapStrings (link: '' + mkdir -p "$(dirname "${link}")" + if [ -L "${link}" ]; then + if [ ${celesteHome} != "$(readlink "${link}")" ]; then + rm "${link}" + ln -s ${celesteHome} "${link}" + fi + else + rm -r "${link}" + ln -s ${celesteHome} "${link}" + fi + '') gameDir' + ) + + '' + cd /${celesteHomeRelative} + exec ./Celeste-unwrapped "$@" + '' + ); + + passthru.celeste-unwrapped = celeste; + passthru.everest = callPackage ./everest { }; + passthru.everest-bin = callPackage ./everest-bin { }; + + passthru.updateScript = ./update.sh; + + meta = { + inherit (celeste.meta) + homepage + downloadPage + description + license + sourceProvenance + platforms + ; + maintainers = with lib.maintainers; [ ulysseszhan ]; + }; +} diff --git a/pkgs/by-name/ce/celestegame/update.sh b/pkgs/by-name/ce/celestegame/update.sh new file mode 100755 index 000000000000..2a1aefdc7675 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -eu -o pipefail + +branch=stable # set to one of dev, beta, stable +case $branch in + dev) branches='"dev", "beta", "stable"' ;; + beta) branches='"beta", "stable"' ;; + stable) branches='"stable"' ;; +esac + +endpoint=$(curl -s https://everestapi.github.io/everestupdater.txt) +endpoint="$endpoint$([[ "$endpoint" == *"?"* ]] && echo '&' || echo '?')supportsNativeBuilds=true" + +latest=$(curl -s "$endpoint" | jq -r "map(select(.branch | IN($branches))) | max_by(.date)") +commit=$(echo "$latest" | jq -r .commit) +version=$(echo "$latest" | jq -r .version) +url=$(echo "$latest" | jq -r .mainDownload) + +update-source-version celestegame.passthru.everest $version --rev=$commit +"$(nix-build --attr celestegame.passthru.everest.fetch-deps --no-out-link)" +update-source-version celestegame.passthru.everest-bin $version "" $url diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 699f650eb86d..09b812473b71 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.6.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; tag = "v.${finalAttrs.version}"; - hash = "sha256-j4WYdLQvNZAMb+16zO4M24CNKJFTITN9VXa1jFKduOk="; + hash = "sha256-HlSM1QhkBuB7JGdCeVoi3HVAGa3drxictbtPayrDNUo="; }; outputs = [ diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix index f60fb44710e5..56ef195e8f7a 100644 --- a/pkgs/by-name/cl/clickhouse-backup/package.nix +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.6.35"; + version = "2.6.39"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-GQH9yV1CdOmdboxH16sIBvj+7dDMLt4q2C2xSFjvbi8="; + hash = "sha256-fx300EyGm9iy4kozcffh8KZz/EYF6yqkdNLSqW1dYQg="; }; - vendorHash = "sha256-je1iVJW+yHMcIm8Y0vd5Ti/JGp1yvmA1lLMvvw81qag="; + vendorHash = "sha256-MwyjjEePxcwcESfBhmFtYy8aOI50HL7x05cJyGk5gGg="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 23d42815dfb1..1ffbca17e0c2 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -16,20 +16,20 @@ let sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/linux/x64/Cursor-1.5.11-x86_64.AppImage"; - hash = "sha256-PlZPgcDe6KmEcQYDk1R4uXh1R34mKuPLBh/wbOAYrAY="; + url = "https://downloads.cursor.com/production/3ccce8f55d8cca49f6d28b491a844c699b8719a3/linux/x64/Cursor-1.6.45-x86_64.AppImage"; + hash = "sha256-MlrevU26gD6hpZbqbdKQwnzJbm5y9SVSb3d0BGnHtpc="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/linux/arm64/Cursor-1.5.11-aarch64.AppImage"; - hash = "sha256-a1M9KumU8wLN5t6hrqMfkcbfPyt9maqCsAW8xTS+0BY="; + url = "https://downloads.cursor.com/production/3ccce8f55d8cca49f6d28b491a844c699b8719a3/linux/arm64/Cursor-1.6.45-aarch64.AppImage"; + hash = "sha256-eFHYRwVXhWB3zCnJFYodIxjR2ewP8ETgwyjBdB86oTk="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-HotafPJPDywp9UAnQUsQurfxtfPepZWAegAmwNp9J2Q="; + url = "https://downloads.cursor.com/production/3ccce8f55d8cca49f6d28b491a844c699b8719a3/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-UGmMX9Wr69i2EqQSLkj9/ROs8HpLtc/x0IYDJdzvD6U="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-LZxahFX3e7YQtUPcjxKYsOrjZSuPKyPKyIrJxC5XYLw="; + url = "https://downloads.cursor.com/production/3ccce8f55d8cca49f6d28b491a844c699b8719a3/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-lcuJiAgHXPEUZHNeanBq10znXKFKJ6yrluuZjdaQbyA="; }; }; @@ -39,7 +39,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = finalCommandLineArgs; - version = "1.5.11"; + version = "1.6.45"; pname = "cursor"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix index b4cb49acaca6..f5d69221eba4 100644 --- a/pkgs/by-name/da/dapr-cli/package.nix +++ b/pkgs/by-name/da/dapr-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - hash = "sha256-LX2X9L+aEIFr1lYV7lAlVZM/nQMmdLY9f8XBMm31be0="; + hash = "sha256-Z8Fuisx2hK6QAJ5NDh0f11t/hoHhbD2+/mZMsUFxPaQ="; }; vendorHash = "sha256-qEbuu4+pQ6g3m1FtisYc26lG/4zY/boQM8d6qA5c1eo="; diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix index 528b02fd54da..91fb72806781 100644 --- a/pkgs/by-name/da/davis/package.nix +++ b/pkgs/by-name/da/davis/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "davis"; - version = "5.1.3"; + version = "5.2.0"; src = fetchFromGitHub { owner = "tchapi"; repo = "davis"; tag = "v${finalAttrs.version}"; - hash = "sha256-2gM6G1ZqHOUNmFjo3icHdV7xX/kbi0MO98GDzsBTGGo="; + hash = "sha256-Ih06CKwgR2ljw3w9YfgVUdBCjt5Nbs34fMsErRUkfcc="; }; - vendorHash = "sha256-RNvFviWu1ZNPWguzL9MbOsWctKfPeJGWZJ8Y2HDEXkI="; + vendorHash = "sha256-e0qSI5naqM/mUSMduiku0yQkYMGw1y9Uwa5oYlxaDzs="; composerNoPlugins = false; diff --git a/pkgs/by-name/de/devspace/package.nix b/pkgs/by-name/de/devspace/package.nix index 0cba8fd7831c..89ab36c97249 100644 --- a/pkgs/by-name/de/devspace/package.nix +++ b/pkgs/by-name/de/devspace/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.17"; + version = "6.3.18"; src = fetchFromGitHub { owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - hash = "sha256-b0eRiPt4g8JEoQPdl3qXsEXuYIy+VvVBU8/cPIqW/20="; + hash = "sha256-33uhg2OY0owgP1rzdxcZzpN0cuYPRfX8vcwCJF9MVoo="; }; vendorHash = null; diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix index fbee6757311d..d399e7686b81 100644 --- a/pkgs/by-name/di/discordo/package.nix +++ b/pkgs/by-name/di/discordo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "discordo"; - version = "0-unstable-2025-08-06"; + version = "0-unstable-2025-09-27"; src = fetchFromGitHub { owner = "ayn2op"; repo = "discordo"; - rev = "cdd97ff900a099ca520e5a720c547780dd6de162"; - hash = "sha256-dJwinbkSVXxcNV9zXZaNnyZi1XorfNBITuYb9D987Vk="; + rev = "5cecfddae7a092a1cbb91a8bdec1ce27d013467f"; + hash = "sha256-jbZJAUrwgbwcc1vugrTzW1P74Ll3OWh+5MQCdwnAVrw="; }; - vendorHash = "sha256-6JpLXLoozkPWl7z0KGFIgr78bMR4DegvyEWODBKuWpE="; + vendorHash = "sha256-RASyQEesppDckC/bE1vbKiVqZ4f72RI8IAbSTGGgzmo="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 8b7e32d5ef52..b81ca34bac16 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -12,24 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "easytier"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "EasyTier"; repo = "EasyTier"; tag = "v${version}"; - hash = "sha256-89uRsLeSNR2I+QX0k1VJ0sMrUYLbApEJClk3aFr0faY="; + hash = "sha256-vGQHrpImPMF44LXVnKRpj47Nr534wTlVZJiBDm4GkGs="; }; - # remove if rust 1.89 merged - postPatch = '' - substituteInPlace easytier/Cargo.toml \ - --replace-fail 'rust-version = "1.89.0"' "" - substituteInPlace easytier-rpc-build/Cargo.toml \ - --replace-fail 'rust-version = "1.89.0"' "" - ''; - - cargoHash = "sha256-rioo3Eg5xGg4PI4beXWheeymVNq+zZP9uhbfU584u0g="; + cargoHash = "sha256-B9GkvSXyZXTBsnV7wbipjdZ0EkVrL/aw8Ff7uUvfKPo="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index 2ac0efe095f1..e9c2d499ea42 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -24,13 +24,13 @@ buildGoModule rec { pname = "ecapture"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-vVDr0KKfjFg282FLt23foYWoW5XSFdEgGfXgdiWrfk4="; + hash = "sha256-1FyZMUII+bPQDmNK1eJkfeoTjdhe/jj2qiooWuNFsNg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ex/expliot/package.nix b/pkgs/by-name/ex/expliot/package.nix index ca03735602ec..4cbddc41bd9f 100644 --- a/pkgs/by-name/ex/expliot/package.nix +++ b/pkgs/by-name/ex/expliot/package.nix @@ -1,79 +1,52 @@ { lib, - fetchFromGitHub, fetchFromGitLab, python3, }: -let - py = python3.override { - self = py; - packageOverrides = self: super: { - - cmd2 = super.cmd2.overridePythonAttrs (oldAttrs: rec { - version = "1.5.0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-cBqMmXXEq8ReXROQarFJ+Vn4EoaRBjRzI6P4msDoKmI="; - }; - dependencies = oldAttrs.dependencies ++ [ - python3.pkgs.attrs - python3.pkgs.colorama - ]; - doCheck = false; - }); - - paho-mqtt = super.paho-mqtt.overridePythonAttrs (oldAttrs: rec { - version = "1.6.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - tag = "v${version}"; - hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; - }; - build-system = with self; [ setuptools ]; - doCheck = false; - }); - }; - }; -in -with py.pkgs; - +with python3.pkgs; buildPythonApplication rec { pname = "expliot"; - version = "0.9.8"; + version = "0.11.1"; pyproject = true; src = fetchFromGitLab { owner = "expliot_framework"; repo = "expliot"; tag = version; - hash = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY="; + hash = "sha256-aFJVT5vE9YKirZEINKFzYWDffoVgluoUyvMmOifLq1M="; }; - pythonRelaxDeps = [ - "pymodbus" - "pynetdicom" - "cryptography" - "python-can" - "pyparsing" - "zeroconf" + build-system = [ + poetry-core ]; - build-system = [ setuptools ]; + pythonRelaxDeps = [ + "cryptography" + "paho-mqtt" + "pynetdicom" + "setuptools" + "xmltodict" + "zeroconf" + ]; dependencies = [ aiocoap awsiotpythonsdk bluepy - python-can cmd2 cryptography + distro + jsonschema paho-mqtt pyi2cflash pymodbus pynetdicom pyparsing - pyserial pyspiflash + python-can + python-magic + pyudev + setuptools upnpy xmltodict zeroconf @@ -84,7 +57,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "expliot" ]; - meta = with lib; { + meta = { description = "IoT security testing and exploitation framework"; longDescription = '' EXPLIoT is a Framework for security testing and exploiting IoT @@ -95,8 +68,8 @@ buildPythonApplication rec { purpose of the framework i.e. IoT exploitation. ''; homepage = "https://expliot.readthedocs.io/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "expliot"; }; } diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix index a6b84032a51d..8ac15a2f1a5b 100644 --- a/pkgs/by-name/fo/fosrl-newt/package.nix +++ b/pkgs/by-name/fo/fosrl-newt/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "newt"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "fosrl"; repo = "newt"; tag = version; - hash = "sha256-uIlBAqe93MqMSN0Nghlfa1cLbMlcg3iMCzIu0U16h5o="; + hash = "sha256-CtE4Ug1659Xu90CRMIxXeqfVaw9kOK4WpsW/u3S0ztA="; }; - vendorHash = "sha256-FeDNv1mLTvXYUDOHzyPP7uA+fOt/j0VT7CM6IyoMuTQ="; + vendorHash = "sha256-VR5YOprMP3wvwb0lnW9KyUWGs/4Zm5GKBe4vnkN32cY="; postPatch = '' substituteInPlace main.go \ diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix index 1cba17d66d1f..2ea4efd1c053 100644 --- a/pkgs/by-name/fo/fosrl-olm/package.nix +++ b/pkgs/by-name/fo/fosrl-olm/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "olm"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "fosrl"; repo = "olm"; tag = version; - hash = "sha256-yGknbxoBMaI6GwIf8hVfWmgFAgI4kxYrNq/puy4aG2M="; + hash = "sha256-9QqVfq7tYOtPsKMgH0YAhpiwMHh+yJT4npF0f9yl5wU="; }; - vendorHash = "sha256-DqZU64jwg2AHmze1oWOmDgltB+k1mLSHQyAxnovLaVo="; + vendorHash = "sha256-4j7l1vvorcdbHE4XXOUH2MaOSIwS70l8w7ZBmp3a/XQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index 807f10243d04..4bcef84d11e2 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -29,16 +29,16 @@ in buildNpmPackage (finalAttrs: { pname = "pangolin"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "fosrl"; repo = "pangolin"; tag = finalAttrs.version; - hash = "sha256-fXswhcnspyayyvvl1HEuQylKHzdgwucm1ClokJMeqys="; + hash = "sha256-o55S9Fr1gnyuXFAVgugrnFyJIv7nKMZ3Lc4+m/aVrII="; }; - npmDepsHash = "sha256-ivG/7KTmWPjnXzO+ISc+2bsNqW/0VPhFbg1229A64cw="; + npmDepsHash = "sha256-0vqH3nAB4HqfwS7Oy/qewzLyx48vS+rKiAwwbTkSOOc="; nativeBuildInputs = [ esbuild diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index d24d9bf22c1e..512738906806 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "gf"; - version = "0-unstable-2025-04-11"; + version = "0-unstable-2025-09-21"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "162249220bde1c9fef7d87f8bb9128be9323d93f"; - hash = "sha256-wP8ELlqtMwYv6/jQzKahaX7vlMKLUBgxm5Io49tphsM="; + rev = "5fc7f422c8344277601860646c6ff6e72c8e7041"; + hash = "sha256-YdeF4pBKLn3r3xM7ppX30D196RmO/P8WDj0Zsh7Vdmc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/git-credential-oauth/package.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix index df1abb977d41..28f1ae37b76d 100644 --- a/pkgs/by-name/gi/git-credential-oauth/package.nix +++ b/pkgs/by-name/gi/git-credential-oauth/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "hickford"; repo = "git-credential-oauth"; rev = "v${version}"; - hash = "sha256-9AoIyQ05Y/usG0Tlehn7U8zjBxC1BYNjNVRtgWgzLbo="; + hash = "sha256-T10QGMp6keneUzdz7p/4huySIJFp4AmX253pZ3hYSYY="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 9c42d3918216..23d0a1e0c561 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-4kBxVPiK3HoPvh8wR7xMUt0Zy5u4LRK6KfQCdk3q7fk="; + hash = "sha256-BAfOenO/LrMfOPI+DStKdPp14t4+1AP8Z8/uoqU6Wfw="; }; - cargoHash = "sha256-r0ccEi81Znjhod87Ax5yBlKXEVT44kN4wr3HzMqyezo="; + cargoHash = "sha256-yqmXXkviRbY9YS+JjAx5iXLu6cvMWotcf/PsrpfER5k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/glabels/package.nix b/pkgs/by-name/gl/glabels/package.nix deleted file mode 100644 index 04453acfb028..000000000000 --- a/pkgs/by-name/gl/glabels/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - barcode, - gnome, - gnome-common, - autoreconfHook, - gtk3, - gtk-doc, - libxml2, - librsvg, - libtool, - libe-book, - gsettings-desktop-schemas, - intltool, - itstool, - makeWrapper, - pkg-config, - yelp-tools, - qrencode, -}: - -stdenv.mkDerivation rec { - pname = "glabels"; - version = "3.4.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; - }; - - patches = [ - # Pull patch pending upstream inclusion for -fno-common toolchain support: - # https://github.com/jimevins/glabels/pull/76 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/jimevins/glabels/commit/f64e3f34e3631330fff2fb48ab271ff9c6160229.patch"; - sha256 = "13q6g4bxzvzwjnvzkvijds2b6yvc4xqbdwgqnwmj65ln6ngxz8sa"; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - makeWrapper - intltool - ]; - buildInputs = [ - barcode - gtk3 - gtk-doc - yelp-tools - gnome-common - gsettings-desktop-schemas - itstool - libxml2 - librsvg - libe-book - libtool - qrencode - ]; - - preFixup = '' - wrapProgram "$out/bin/glabels-3" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Create labels and business cards"; - homepage = "https://github.com/jimevins/glabels"; - license = with licenses; [ - gpl3Plus - lgpl3Plus - ]; - platforms = platforms.unix; - maintainers = [ maintainers.nico202 ]; - }; -} diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 38f0691a5313..7b2c720408e4 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.5.5"; + version = "3.6.2"; outputs = [ "out" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-OPA0diWAtB8MCaw2DOyh89DVi7lQmyCsQ2gqfK7dGW8="; + hash = "sha256-KiX7yHwuy2AWLqqmiHz9YhbvRBEusE9TuXKtaA9YsME="; }; # TODO: build this from source diff --git a/pkgs/by-name/gn/gnome-commander/package.nix b/pkgs/by-name/gn/gnome-commander/package.nix index d714f1ea93c4..0e9b29b98274 100644 --- a/pkgs/by-name/gn/gnome-commander/package.nix +++ b/pkgs/by-name/gn/gnome-commander/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-commander"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-commander"; tag = finalAttrs.version; - hash = "sha256-rSaj1Fg2seZKlzlERZZmz80kxJT1vZ+INiJlWfZ9m6g="; + hash = "sha256-4l+hw9zPYhkaOpXMEnn4vXF1q0JLE0CB4oRGr2iXqtw="; }; # hard-coded schema paths diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix index 8bf797737061..1e5454430544 100644 --- a/pkgs/by-name/go/gose/package.nix +++ b/pkgs/by-name/go/gose/package.nix @@ -7,13 +7,13 @@ lib, }: let - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { repo = "gose"; owner = "stv0g"; tag = "v${version}"; - hash = "sha256-dcx1uLLLFepqGTIJQNf3I1GzbXwrVPt7Jb8TW3AGnhU="; + hash = "sha256-T6PD6MI1IOAgtPOJuPSZp4te9BokKfj+TZHLRqt2FCo="; }; frontend = buildNpmPackage { @@ -37,7 +37,7 @@ buildGoModule { inherit version; inherit src; - vendorHash = "sha256-cvZLR5c8WqarhnXBFAyxUUQtqX2fhveonUtsrFjFmq0="; + vendorHash = "sha256-PTu4OzVjGVExuNDsK01p3/gAwNhDZbPewhI476m5i/M="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix index 499838ab3892..b19fe0f056b5 100644 --- a/pkgs/by-name/gr/grpc_cli/package.nix +++ b/pkgs/by-name/gr/grpc_cli/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.75.0"; + version = "1.75.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-2SeL/O6FaAnrPXMHAPKCSzx3hlcKLuC5y+ljJ1gewkE="; + hash = "sha256-SnKK52VLO4MM/ftfmzRV/LeLfOucdIyHMyWk6EKRfvM="; fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index 9199db9cfe2d..f740a2dadd21 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hexpatch"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "Etto48"; repo = "HexPatch"; tag = "v${version}"; - hash = "sha256-Q9OrI48CbC7fVbngKYtQq9IKa6HbdAcT3JcJlmNvH+I="; + hash = "sha256-ThHRf3zLNpOiIpB7drLqMBdyRl6MqW45oFpz44uBwsY="; }; - cargoHash = "sha256-LGWIzbzP4+uY+4QL1tdNMLHtvrVGpFtbmVUbmdn8oAI="; + cargoHash = "sha256-kMLLtrXjduQ2nyiNtiZOhlEfADhn1IKysF29WO6R8CE="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/hp/hping/package.nix b/pkgs/by-name/hp/hping/package.nix index ff8d2a72302b..23edf38d2a76 100644 --- a/pkgs/by-name/hp/hping/package.nix +++ b/pkgs/by-name/hp/hping/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Command-line oriented TCP/IP packet assembler/analyzer"; - homepage = "http://www.hping.org/"; + homepage = "https://github.com/antirez/hping"; license = licenses.gpl2Only; platforms = platforms.unix; }; diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 4be01da58be8..767b8056f247 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.150.0"; + version = "0.150.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-TWBwF/GPNPLNSEBmG0wVvqY+mgQpZk2MiQoLxB+dBuU="; + hash = "sha256-FNAGdau+czPy+4jtugs+ZHtHrMCsXoZZgJIG4a4r0bs="; }; vendorHash = "sha256-/jbShK+wEybD8hh5+1+Qd+NJkmp3w+BYf2UsTPEgwhw="; diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 93f4f8e6fd05..b8efe38c1b14 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.13.0"; + version = "1.13.2"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-wcJogDi93tuFbVdwI5YZEyVQGzO4QC/ASDsRquVq31s="; + hash = "sha256-AoRqlTEwcS+RhN59/opqlYAftihmN20mW6Vn6RbLzSw="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-GtX2mRfw4eo3WKfxdMoOAryQKHddFPcVCuXhHmLA/Oc="; + npmDepsHash = "sha256-ZH1D0Q5SCoOwr8CLe2HLMy4xJoO3VLha4MfE9fBmhec="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index e4953f51ffad..231b8217a495 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { owner = "openwall"; repo = "john"; rev = "f9fedd238b0b1d69181c1fef033b85c787e96e57"; - hash = "sha256-zvoN+8Sx6qpVg2JeRLOIH1ehfl3tFTv7r5wQZ44Qsbc="; + hash = "sha256-XMT5Sbp2XrAnfTHxXyJdw0kA/ZtfOiYrX/flCFLHJ6s="; }; patches = lib.optionals withOpenCL [ @@ -130,15 +130,18 @@ stdenv.mkDerivation { done ''; - meta = with lib; { + meta = { description = "John the Ripper password cracker"; - license = [ licenses.gpl2Plus ] ++ lib.optionals enableUnfree [ licenses.unfreeRedistributable ]; + license = [ + lib.licenses.gpl2Plus + ] + ++ lib.optionals enableUnfree [ lib.licenses.unfreeRedistributable ]; homepage = "https://github.com/openwall/john/"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ offline matthewbauer cherrykitten ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/jq/jqp/package.nix b/pkgs/by-name/jq/jqp/package.nix index 25dc3356d295..2c7442258216 100644 --- a/pkgs/by-name/jq/jqp/package.nix +++ b/pkgs/by-name/jq/jqp/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = "jqp"; rev = "v${version}"; - sha256 = "sha256-i22qALVa8EUaTwgN6DocGJArNyOvkQbFuH++EQKBuIc="; + sha256 = "sha256-pCWvmX6VvcKlPoMkVGfVkPTOx+sE+v2ey39/jOhgtsg="; }; - vendorHash = "sha256-GbY0x4BgV0+QdVMkITLF/W//oO72FbjV6lNJRm6ecys="; + vendorHash = "sha256-FBAf+np/8Zy+p1mPyP1O8md2sAkkeiFu60UYtkszG8g="; subPackages = [ "." ]; diff --git a/pkgs/by-name/kc/kcli/package.nix b/pkgs/by-name/kc/kcli/package.nix deleted file mode 100644 index ab609f2d8752..000000000000 --- a/pkgs/by-name/kc/kcli/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "kcli"; - version = "1.8.3"; - - src = fetchFromGitHub { - owner = "cswank"; - repo = "kcli"; - rev = version; - sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; - }; - - vendorHash = null; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Kafka command line browser"; - homepage = "https://github.com/cswank/kcli"; - license = licenses.mit; - maintainers = with maintainers; [ cswank ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check - }; -} diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix index 15aa4a760d6f..cded2b298a30 100644 --- a/pkgs/by-name/ku/kubecolor/package.nix +++ b/pkgs/by-name/ku/kubecolor/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kubecolor"; repo = "kubecolor"; rev = "v${version}"; - sha256 = "sha256-FyHTceFpB3Osj8SUw+IRk+JWnoREVZgl8YHczDyY+Ak="; + sha256 = "sha256-T0xqcDDmp/XjDxUnh/wCfs+b4cQG78d/61rdypCEDoY="; }; - vendorHash = "sha256-eF0NcymLmRsFetkI67ZVUfOcIYtht0iYFcPIy2CWr+M="; + vendorHash = "sha256-QenYTQTNXaBvzpyVHOCx3lEheiWZMfulEfzB+ll+q+4="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubernetes-kcp/package.nix b/pkgs/by-name/ku/kubernetes-kcp/package.nix index ee5a10dc922e..a42e8b34e71f 100644 --- a/pkgs/by-name/ku/kubernetes-kcp/package.nix +++ b/pkgs/by-name/ku/kubernetes-kcp/package.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "kubernetes-kcp"; - version = "0.28.1"; + version = "0.28.3"; src = fetchFromGitHub { owner = "kcp-dev"; repo = "kcp"; tag = "v${version}"; - hash = "sha256-GwfrFaGLrfUTxLoacGCHHzJ41+tA7flb4wvjWJntj+g="; + hash = "sha256-gZMheiMvAUAV3YqWNA1WmOWpV5hEU7GtQzz57F4rX38="; }; - vendorHash = "sha256-mJaWEZhuMiIy8NYlRJDc39nKfWxP4xlFuM9jiqmkJ0c="; + vendorHash = "sha256-w7mC3CJv/UKQe6jOqwzSZSYIu0K/Z4aNUnAcSg6MwG0="; subPackages = [ "cmd/kcp" ]; diff --git a/pkgs/by-name/li/libcerf/package.nix b/pkgs/by-name/li/libcerf/package.nix index 8e49899bed6c..d405eeddf822 100644 --- a/pkgs/by-name/li/libcerf/package.nix +++ b/pkgs/by-name/li/libcerf/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libcerf"; - version = "3.1"; + version = "3.2"; src = fetchurl { url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; - sha256 = "sha256-TAfiqOK00OTUjbng/JGRtDoOEg5XfVXYfibe6HRcb6s="; + sha256 = "sha256-6o0RDXPsJKZDBCyjlARhzLsbZUHiExDstwq05NwUSu8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix index d32b458a3c28..11b83ef7a87c 100644 --- a/pkgs/by-name/li/libfabric/package.nix +++ b/pkgs/by-name/li/libfabric/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "2.2.0"; + version = "2.3.0"; enableParallelBuilding = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = "libfabric"; rev = "v${version}"; - sha256 = "sha256-BY3a7CxtMJl5/+7t4BzJRTbMnDs1oL3UhDOPRB+D3+U="; + sha256 = "sha256-pxSv6mg51It4+P1nAgXdWizTGpI31rn5+n3f4vD6ooY="; }; outputs = [ diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index 75bac29f308f..e6781ce540fa 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/frontend/yarn.lock"; - hash = "sha256-712mc/xksjXgnc0inthxE+ztSDl/4107oXw3vKcZD2g="; + hash = "sha256-e+3LCoOzfjSG4CjzOLXTcXGkmzNwFTLCrN0l5odOBMs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index bed561c1c343..7a141243ed9c 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -11,12 +11,12 @@ }: let - version = "3.1.2"; + version = "3.2.1"; src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; tag = "v${version}"; - hash = "sha256-8ZLXXA4NKR7GaCdgk8XDMjAssQsKP1wZpEZPYWpglwk="; + hash = "sha256-LIWubw+iO17giSvGCl5LzI429725sisp5u4Z4usJOGA="; }; frontend = callPackage (import ./mealie-frontend.nix src version) { }; diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index c45fa665d84a..cfd958959841 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "4.10.0"; + version = "4.10.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-r3sV066IzJ/dQomt/HPxWPcUYXohoOhP4g3Jn/5HXyg="; + hash = "sha256-JGiPCvfWsluWeJk14cbAVUJO69OKXG/+93FrGMRlCxU="; }; - cargoHash = "sha256-zGyWj1SgaoCT4OvMrhMgOD49glBBYQKLGoeanhl8W9U="; + cargoHash = "sha256-DmQo/DDD5b1bpBiB5JfpIDD9cQ+ColorY4kTW1Xh9lo="; # require running database doCheck = false; diff --git a/pkgs/by-name/mk/mkcal/package.nix b/pkgs/by-name/mk/mkcal/package.nix index 5dab56aada40..c0ba8cd527f1 100644 --- a/pkgs/by-name/mk/mkcal/package.nix +++ b/pkgs/by-name/mk/mkcal/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mkcal"; - version = "0.7.27"; + version = "0.7.28"; src = fetchFromGitHub { owner = "sailfishos"; repo = "mkcal"; tag = finalAttrs.version; - hash = "sha256-7QgkGULCqlsao91WmqHjVYJDN0b1JFEmPMRs2SvFv3k="; + hash = "sha256-tL42f8egP/anB4jOaAjmIh7C2pQyR3fgTDJ1E9t8EWk="; }; outputs = [ diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix index 647e53b7d8a5..d9529c76e3bb 100644 --- a/pkgs/by-name/mo/morgen/package.nix +++ b/pkgs/by-name/mo/morgen/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.6.17"; + version = "3.6.18"; src = fetchurl { name = "morgen-${version}.deb"; url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-k1JaAYE63bLMwTBH+TmhHa8KBY5YL12GhXrRS0WiilA="; + hash = "sha256-OvV+GNKQBzUpHEOfaBV6SGRxA/gvRWFkP5D7CihY7pU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/morty/package.nix b/pkgs/by-name/mo/morty/package.nix deleted file mode 100644 index 9e210f3a78c3..000000000000 --- a/pkgs/by-name/mo/morty/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - nixosTests, -}: - -buildGoModule { - pname = "morty"; - version = "unstable-2021-04-22"; - - src = fetchFromGitHub { - owner = "asciimoo"; - repo = "morty"; - rev = "f5bff1e285d3f973cacf73318e55175edafd633f"; - sha256 = "sha256-ik2VAPdxllt76UVFt77c1ltxIwFNahAKjn3FuErNFYo="; - }; - - vendorHash = "sha256-3sllcoTDYQBAyAT7e9KeKNrlTEbgnoZc0Vt0ksQByvo="; - - passthru.tests = { inherit (nixosTests) morty; }; - - meta = with lib; { - description = "Privacy aware web content sanitizer proxy as a service"; - mainProgram = "morty"; - longDescription = '' - Morty rewrites web pages to exclude malicious HTML tags and attributes. - It also replaces external resource references to prevent third party information leaks. - - The main goal of morty is to provide a result proxy for searx, but it can be used as a standalone sanitizer service too. - ''; - homepage = "https://github.com/asciimoo/morty"; - maintainers = with maintainers; [ - leenaars - SuperSandro2000 - ]; - license = licenses.agpl3Only; - }; -} diff --git a/pkgs/by-name/mp/mpd-notification/package.nix b/pkgs/by-name/mp/mpd-notification/package.nix index f488d46f4e5b..1dcb84f8d8e2 100644 --- a/pkgs/by-name/mp/mpd-notification/package.nix +++ b/pkgs/by-name/mp/mpd-notification/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mpd-notification"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "eworm-de"; repo = "mpd-notification"; rev = version; - hash = "sha256-8iBG1IdbERB2gOALvVBNJ3/hhiou3D/azSRkRD+u9O8="; + hash = "sha256-2rnZkVKrk8jgZz/EcZGQ34tLZrVttjq3tq8k2xSl00A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix index f4f3b4c35f7a..7ee3f0b750e8 100644 --- a/pkgs/by-name/my/mydumper/package.nix +++ b/pkgs/by-name/my/mydumper/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "mydumper"; - version = "0.19.3-3"; + version = "0.20.1-2"; src = fetchFromGitHub { owner = "mydumper"; repo = "mydumper"; tag = "v${version}"; - hash = "sha256-CrjI6jwktBxKn7hgL8+pCikbtCFUK6z90Do9fWmLZlQ="; + hash = "sha256-ypFXxmKnG1yiJjvHGmYJJz5ZjhhGHCRklG7y83jypms="; # as of mydumper v0.16.5-1, mydumper extracted its docs into a submodule fetchSubmodules = true; }; diff --git a/pkgs/by-name/ne/nerdfetch/package.nix b/pkgs/by-name/ne/nerdfetch/package.nix index b0ba6d8a74f2..1c883297567d 100644 --- a/pkgs/by-name/ne/nerdfetch/package.nix +++ b/pkgs/by-name/ne/nerdfetch/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "nerdfetch"; - version = "8.4.0"; + version = "8.4.2"; src = fetchFromGitHub { owner = "ThatOneCalculator"; repo = "NerdFetch"; - rev = "v${finalAttrs.version}"; - hash = "sha256-KMu/cMjRFEyfRxoKDGn4PfubGCrotVsKQ9wwc1wQaVM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-G1BWggVPxpIKK82pKHD4Jxyis4CY156Jox2/xHRQfrI="; }; dontUnpack = true; @@ -30,6 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { description = "POSIX *nix (Linux, macOS, Android, *BSD, etc) fetch script using Nerdfonts"; homepage = "https://github.com/ThatOneCalculator/NerdFetch"; + changelog = "https://github.com/ThatOneCalculator/NerdFetch/releases/tag/${finalAttrs.version}"; maintainers = with maintainers; [ ByteSudoer ]; license = licenses.mit; mainProgram = "nerdfetch"; diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix index 3be0b399a04a..45c7fb599a65 100644 --- a/pkgs/by-name/ne/netpbm/package.nix +++ b/pkgs/by-name/ne/netpbm/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.11.1"; + version = "11.12.0"; outputs = [ "bin" @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "5104"; - sha256 = "sha256-zgA3EZPrXD8JOO9O2nuLt4ouPbbUJAlFKlX+2QOz8Uw="; + rev = "5121"; + sha256 = "sha256-u5/chGsu+imk6GtptDz/EIyCe3CmoWiQ6CAcLASqpqU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 6afc055a3350..63af415a6d6d 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -117,13 +117,13 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-D3b3ddW6s9NqV8mJZboQ/z8IkId8h7a4eTh/MkjPNqg="; + hash = "sha256-ooDGwTklGJ/wzDlAY3uJiqpZUxT1cCsqVNJKU8BAPbQ="; }; vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4="; diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/oneDNN/package.nix index c8e011b94cc1..e196a0acb4f9 100644 --- a/pkgs/by-name/on/oneDNN/package.nix +++ b/pkgs/by-name/on/oneDNN/package.nix @@ -11,13 +11,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.9"; + version = "3.9.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-YSHHdXZaSHb1vVRI8MTW2BFoSSUEzIpb/AhhuAQYJls="; + hash = "sha256-DbLW22LgG8wrBNMsxoUGlacHLcfIBwqyiv+HOmFDtxc="; }; outputs = [ diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index fcb3614180df..e3703d050cca 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "opentelemetry-cpp"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-vprHCexKtXvbiHz7JfuTbVFyLy0VL1s4e/hNyaN3nY0="; + hash = "sha256-4SmKB2368I/2WTKYCqsZAAdkJygA15zCT+I7/RF8Knk="; }; patches = [ diff --git a/pkgs/tools/misc/parallel/wrapper.nix b/pkgs/by-name/pa/parallel-full/package.nix similarity index 100% rename from pkgs/tools/misc/parallel/wrapper.nix rename to pkgs/by-name/pa/parallel-full/package.nix diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/by-name/pa/parallel/package.nix similarity index 89% rename from pkgs/tools/misc/parallel/default.nix rename to pkgs/by-name/pa/parallel/package.nix index cc9dacc51e94..b9ff9d0d9e85 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/by-name/pa/parallel/package.nix @@ -10,12 +10,12 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "parallel"; version = "20250822"; src = fetchurl { - url = "mirror://gnu/parallel/parallel-${version}.tar.bz2"; + url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2"; hash = "sha256-AZ0yhyKGfP/pGMRJNkMIwN8EhFbGkpm5FFGj5vrJFno="; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { description = "Shell tool for executing jobs in parallel"; longDescription = '' GNU Parallel is a shell tool for executing jobs in parallel. A job @@ -78,12 +78,12 @@ stdenv.mkDerivation rec { programs. ''; homepage = "https://www.gnu.org/software/parallel/"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ pSub tomberek ]; mainProgram = "parallel"; }; -} +}) diff --git a/pkgs/by-name/pc/pcp/package.nix b/pkgs/by-name/pc/pcp/package.nix deleted file mode 100644 index a8d6e1c58ba9..000000000000 --- a/pkgs/by-name/pc/pcp/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "pcp"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "dennis-tra"; - repo = "pcp"; - rev = "v${version}"; - sha256 = "sha256-aZO8VuOiYhOPctFKZ6a2psJB0lKHlPc+NLy2RWDU4JI="; - }; - - vendorHash = "sha256-3bkzBQ950Phg4A9p+IjeUx7Xw7eVmUbeYnQViNjghFk="; - - meta = with lib; { - description = "Command line peer-to-peer data transfer tool based on libp2p"; - homepage = "https://github.com/dennis-tra/pcp"; - license = licenses.asl20; - maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.linux; - mainProgram = "pcp"; - }; -} diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index f3be5276cbed..0285d45612d5 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "25.2.8"; + version = "25.2.9"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-jJzERpVCAQtTxuC2J7F9SHq9NuyihLzQjLzIcSfXziE="; + hash = "sha256-Ey1APUOGw2zAVdn5C96bIwe5+PHXzMtXVI5f1xHISFU="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 2f05e92a7722..8fe7204c1a75 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -11,18 +11,18 @@ buildGo125Module (finalAttrs: { pname = "pocket-id"; - version = "1.10.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-YAQT7ORRg27ORh57NTE8F89iNfw+3gd1xPM8f4zHKm4="; + hash = "sha256-thKPYbHx9w75hUgWkLS5fX4R3QLLqFtAJqcvfTxAFiY="; }; sourceRoot = "${finalAttrs.src.name}/backend"; - vendorHash = "sha256-eNUhk76YLHtXCFaxiavM6d8CMeE+YQ+vOecDUCiTh5k="; + vendorHash = "sha256-+HF1zAWA6Ak7uJqWCcTXrttTy1sPA8bN+/No95eqFTU="; env.CGO_ENABLED = 0; ldflags = [ @@ -49,7 +49,7 @@ buildGo125Module (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-Gjj2iFQ15Tso0gXihFH96nW49GJleOU323shBE7VgJ4="; + hash = "sha256-IVrp5qWYMgud9ryLidrUowWWBHZ2lMrJp0cfPPHpXls="; }; env.BUILD_OUTPUT_PATH = "dist"; diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix deleted file mode 100644 index f45ddae59769..000000000000 --- a/pkgs/by-name/pr/proton-caller/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "proton-caller"; - version = "3.1.2"; - - src = fetchFromGitHub { - owner = "caverym"; - repo = "proton-caller"; - rev = version; - sha256 = "sha256-srzahBMihkEP9/+7oRij5POHkCcH6QBh4kGz42Pz0nM="; - }; - - cargoHash = "sha256-AZp6Mbm9Fg+EVr31oJe6/Z8LIwapYhos8JpZzPMiwz0="; - - meta = { - description = "Run Windows programs with Proton"; - changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}"; - homepage = "https://github.com/caverym/proton-caller"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; - mainProgram = "proton-call"; - }; -} diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix index 89c5701e3880..536fa62d66a4 100644 --- a/pkgs/by-name/rd/rdkafka/package.nix +++ b/pkgs/by-name/rd/rdkafka/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdkafka"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-37lCQ+CFeTRQwL6FCl79RSGw+nRKr0DeuXob9CjiVnk="; + sha256 = "sha256-Hg0l44wFQSk8x14V4CxJN80aGrhaj3CIFOYBfNUbG3E="; }; outputs = [ diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix index e5dea94261e9..7813baddc5c4 100644 --- a/pkgs/by-name/re/readsb/package.nix +++ b/pkgs/by-name/re/readsb/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "readsb"; - version = "3.16.2"; + version = "3.16.3"; src = fetchFromGitHub { owner = "wiedehopf"; repo = "readsb"; tag = "v${finalAttrs.version}"; - hash = "sha256-SjfVnWE5q3uaisRdR4ynVKC9U2mS9LmfLXbA2ecil7M="; + hash = "sha256-IjARj2qC1/kwoVvc5SXkJmoDN2m1fjPWj7jVgHG8cWI="; }; strictDeps = true; diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix index d478ce982312..546a58753349 100644 --- a/pkgs/by-name/ri/rime-wanxiang/package.nix +++ b/pkgs/by-name/ri/rime-wanxiang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-wanxiang"; - version = "12.4.1"; + version = "12.6.13"; src = fetchFromGitHub { owner = "amzxyz"; repo = "rime_wanxiang"; tag = "v" + finalAttrs.version; - hash = "sha256-Z4rHSWN784+djARztQK7b24pLk42kUwCm9mct3ojPM4="; + hash = "sha256-wOCfJG/k30fyO7jxRpjQBTN6Xc/gusuwerjYykDl2JQ="; }; installPhase = '' diff --git a/pkgs/by-name/sf/sftool/package.nix b/pkgs/by-name/sf/sftool/package.nix index b120150aa26c..58676d2fa6a2 100644 --- a/pkgs/by-name/sf/sftool/package.nix +++ b/pkgs/by-name/sf/sftool/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sftool"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "OpenSiFli"; repo = "sftool"; tag = finalAttrs.version; - hash = "sha256-/5RVBWHrZpPK2R4khnvZAnFyMfSZStCnQO5g7Ao9Ck4="; + hash = "sha256-xheGgtE9hZVNa4ceqQCrfiYJwlIuXm00J//0VeZ/afE="; }; - cargoHash = "sha256-fteBYld3JzsTn/KMy5w/6Ts7x1PsYmi8zhBvgYVw5os="; + cargoHash = "sha256-pimr4OL709EWIoLk/Wq+QAiveLyR/V70nPuzYfZSH/o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix index bb9ca470d6d6..f03e1139e6e0 100644 --- a/pkgs/by-name/si/signal-cli/package.nix +++ b/pkgs/by-name/si/signal-cli/package.nix @@ -12,12 +12,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "signal-cli"; - version = "0.13.19"; + version = "0.13.20"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${finalAttrs.version}/signal-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-+vO/6bn5416HdqM9x2tJQ6v4KP9hcxX1G31icBOcB58="; + hash = "sha256-MFgR2c+XhzgxO6jv7e30rTf7bRVa5gxnzVOLnemXYY8="; }; buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index b5af92437126..aba5dcbd06de 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250916"; + version = "20250925"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = version; - hash = "sha256-iUX1d/bWR6JKn1CESCnp0QoEnTYA+yEXRWhB4WUowSs="; + hash = "sha256-xukBIxndZPkg54u5MIJgLzQcJFwy2iwaLQRLB6EML2M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index 23fd9b524789..a52d60dc6c4c 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2025-09-09"; + version = "2.0.0-unstable-2025-09-23"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "b19e390fcfc5cd468a4af3abf94b046bdadfa348"; - hash = "sha256-IM62oDUe09UnokitxHvIL3kUUXBOekIG+eKuYKu2dsg="; + rev = "c835e6be266168807fd82fb13129c4728c9a0cab"; + hash = "sha256-IB9lVQnFVDkluCpuzrZJ/9xZjF8Q/FIM3NpVi+ZQ2e0="; }; buildInputs = [ diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index 0ead497b42d5..a93cd5a902ae 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "spider"; - version = "2.37.136"; + version = "2.37.159"; src = fetchFromGitHub { owner = "spider-rs"; repo = "spider"; tag = "v${finalAttrs.version}"; - hash = "sha256-QWOqxIQfRGpxgw/R2yPDdHNDXG8RQb+JV/1gEtWJNVo="; + hash = "sha256-5e6PK+PQnIEm7qpJGW8kmO6GugQMU3phWIsqFSGIj48="; }; - cargoHash = "sha256-bd3pHEwLPwICv61kg3stYJAOjffPYlxoxhupmJ+BC4s="; + cargoHash = "sha256-ffT8SQh6CjIqxMSGahGSiUha1e8wwUbbC3eTEUMx14s="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/stretchly/package.nix b/pkgs/by-name/st/stretchly/package.nix index 6c983dfef6c6..9d18760f2bcb 100644 --- a/pkgs/by-name/st/stretchly/package.nix +++ b/pkgs/by-name/st/stretchly/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "stretchly"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${finalAttrs.version}/stretchly-${finalAttrs.version}.tar.xz"; - hash = "sha256-xmGiGzA4Ol3bteYKrdbmRzh+pwpOOeKmGC70fV1f9Yw="; + hash = "sha256-eHhOxocAQAiuvfJsD4ifFw09B7bry4DWIOA9S6pP+jw="; }; icon = fetchurl { diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index 56b39c91b1dd..c0da19f43ca3 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = "stylua"; rev = "v${version}"; - sha256 = "sha256-PBe3X4YUFUV2xQdYYOdPNgJCnCOzrzogP/2sECef4ck="; + sha256 = "sha256-iyZ30Gc32TQsQyMLwArfIRtM0NkbXkqmca46nI0526M="; }; - cargoHash = "sha256-C9g6kA+xc0nixiPAijc5MIF9xHbbeXBHtmdM4QRdf/Q="; + cargoHash = "sha256-H50/e/XyFvXHhwrKUbKZFZwSHfwAkAtddEvFiOr5220="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/by-name/sy/symphony/package.nix b/pkgs/by-name/sy/symphony/package.nix index e7a840ba1e06..8dbe496aa554 100644 --- a/pkgs/by-name/sy/symphony/package.nix +++ b/pkgs/by-name/sy/symphony/package.nix @@ -4,42 +4,45 @@ fetchFromGitHub, coin-utils, coinmp, - gfortran, - libtool, glpk, osi, + gfortran, + libtool, pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "symphony"; - version = "5.7.2"; + version = "5.7.3"; outputs = [ "out" ]; src = fetchFromGitHub { owner = "coin-or"; repo = "SYMPHONY"; - rev = "releases/${version}"; - hash = "sha256-OdTUMG3iVhjhw5uKtUnsLCZ4DfMjYHm8+/ozfmw7J6c="; + tag = "releases/${finalAttrs.version}"; + hash = "sha256-f97LICRykxhiZiSsSBE9IJBLL/ApWV+utvlHuUhx1PI="; }; nativeBuildInputs = [ + gfortran libtool pkg-config - glpk - gfortran - coinmp - osi + ]; + + buildInputs = [ coin-utils + coinmp + glpk + osi ]; meta = { description = "Open-source solver, callable library, and development framework for mixed-integer linear programs (MILPs)"; homepage = "https://www.coin-or.org/SYMPHONY/index.htm"; - changelog = "https://github.com/coin-or/SYMPHONY/blob/${version}/CHANGELOG.md"; - platforms = [ "x86_64-linux" ]; + changelog = "https://github.com/coin-or/SYMPHONY/blob/${finalAttrs.version}/CHANGELOG.md"; + platforms = lib.platforms.linux; license = lib.licenses.epl20; maintainers = with lib.maintainers; [ b-rodrigues ]; }; -} +}) diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 356da6d8d8fa..2aebd67b86a0 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tabby-agent"; - version = "0.31.1"; + version = "0.31.2"; src = fetchFromGitHub { owner = "TabbyML"; repo = "tabby"; tag = "v${finalAttrs.version}"; - hash = "sha256-RbTX8QKiyzERDVS57Looj9xjS9didNKLdiTkDcyQ/uw="; + hash = "sha256-dVQ/OLJnXgkzWfX3p6Cplw9hti2jXoMKCvKhm6YNzAI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 558cd3df919a..85757c2ee00a 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -62,7 +62,7 @@ let stdenv.cc.cc stdenv.cc.libc ]; - version = "1.0.44"; + version = "1.0.46"; in stdenv.mkDerivation { pname = "tana"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-HtubHH0ENiC+8s8VlpiaNekmzRUtnfmd+CZl5UjJo1U="; + hash = "sha256-WBPTJ2eca5XuccblC31DZ5mCdFm46cXjP4GHyakSalY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix index 7d45195b42e9..c8134d45c859 100644 --- a/pkgs/by-name/td/tdb/package.nix +++ b/pkgs/by-name/td/tdb/package.nix @@ -28,11 +28,11 @@ in stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.13"; + version = "1.4.14"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-XuJ252RNcT4Z5LatwAtECvtYUf8h5lgh/67YnhWl4Wc="; + hash = "sha256-FE9AfULteg7BRwpA7xetQRM/6RC86GXdn+CE1JyQdSY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tt/tt-metal/sfpi.nix b/pkgs/by-name/tt/tt-metal/sfpi.nix index c85b4e282777..d00f3c0c9179 100644 --- a/pkgs/by-name/tt/tt-metal/sfpi.nix +++ b/pkgs/by-name/tt/tt-metal/sfpi.nix @@ -33,11 +33,11 @@ runCommand "sfpi-${version}" { aarch64-linux = fetchurl { url = "https://github.com/tenstorrent/sfpi/releases/download/v${version}/sfpi_${version}_aarch64.txz"; - hash = "sha256-3DQrQewrKnbWNCBw3r7lkwylpKZnouLRG/QXcB6OhDU="; + hash = "sha256-MzI159hiitk1iyeGfQaDOQZhqGjfafpCMz6zmM3HrYs="; }; x86_64-linux = fetchurl { url = "https://github.com/tenstorrent/sfpi/releases/download/v${version}/sfpi_${version}_x86_64.txz"; - hash = "sha256-eRGNHeKM2T4ZylN4tTghR0vN9F3BY1tfam2puvwVmuM="; + hash = "sha256-rQfFveg1ht+jLfk3ZOJadX26+ODE3WW5E0/18eIl7RQ="; }; } ."${stdenv.hostPlatform.system}" or (throw "SFPI does not support ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json index 55d7ad670b3d..164467be61cc 100644 --- a/pkgs/by-name/up/upsun/versions.json +++ b/pkgs/by-name/up/upsun/versions.json @@ -1,19 +1,19 @@ { - "version": "5.3.0", + "version": "5.5.0", "darwin-amd64": { - "hash": "sha256-R+UjM8jmet+qf9Q5JZsUs7UfXf7IWpaqmulEWSKsaLY=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_darwin_all.tar.gz" + "hash": "sha256-aLBaRBahtAcf9KArjrfuhPHNnUTko+kxhoaY5QeKB5E=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-R+UjM8jmet+qf9Q5JZsUs7UfXf7IWpaqmulEWSKsaLY=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_darwin_all.tar.gz" + "hash": "sha256-aLBaRBahtAcf9KArjrfuhPHNnUTko+kxhoaY5QeKB5E=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-52hfP1pgZkpLvVLelKJtELUOUug3gOw3juCdRRMSt/w=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_linux_amd64.tar.gz" + "hash": "sha256-RJuOddfXtT3yyphDSJ8sN8ibX30ALL9kRohGaw9jaeg=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-4rFYjh6lgbtD9h3yUtcJGpTvy/F+BW/7q1fvZWtRc/c=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_linux_arm64.tar.gz" + "hash": "sha256-GbfYckZ91ki1D8e50fF3HRJ6NtTXgqkZe2PrbODAfcw=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/vi/video-compare/package.nix b/pkgs/by-name/vi/video-compare/package.nix index e9741a049d99..a1c2563ea447 100644 --- a/pkgs/by-name/vi/video-compare/package.nix +++ b/pkgs/by-name/vi/video-compare/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "video-compare"; - version = "20250825"; + version = "20250928"; src = fetchFromGitHub { owner = "pixop"; repo = "video-compare"; tag = version; - hash = "sha256-4sfRTb/FkGL3WdJMW6P9H/EHW5oTw+GTQZhKrWS+ptM="; + hash = "sha256-md+h39tMbd07pHZzQ1eae5QCkqYErMoD6oEYov9lLBU="; }; postPatch = '' diff --git a/pkgs/by-name/vo/vokoscreen-ng/package.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix index e53a0342fbfa..f8fea38b93f4 100644 --- a/pkgs/by-name/vo/vokoscreen-ng/package.nix +++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "vokoscreen-ng"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; tag = version; - hash = "sha256-avn7ywYJNZdUe1aTLmT2t1BB6Lvn5eUiQBMZCQnNFKs="; + hash = "sha256-GMiiO+uKaf87X3dLmkEbFd2GdfHf5wFAyhe9wd8NQeI="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; diff --git a/pkgs/by-name/vo/voxinput/package.nix b/pkgs/by-name/vo/voxinput/package.nix index 604ceb5dabea..ec769c62ecdd 100644 --- a/pkgs/by-name/vo/voxinput/package.nix +++ b/pkgs/by-name/vo/voxinput/package.nix @@ -17,16 +17,16 @@ buildGoModule (finalAttrs: { pname = "voxinput"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "richiejp"; repo = "VoxInput"; tag = "v${finalAttrs.version}"; - hash = "sha256-fNlvCyjg4aOTRypKf/6nQeDyNYN+ojo1WekVPLhdyJQ="; + hash = "sha256-aFsAAT3hNbTSSkeMH65+jnhpjJRxVvfRUiiXdKIvZqM="; }; - vendorHash = "sha256-HOXjD4mwvK3jcFmpZyvKB7WOfpCIDlUWJTJSTN7wFXM="; + vendorHash = "sha256-jopDuqIuc45zT36B7D7WCtYtdZUn4hvE45s/FLBGrms="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/vs/vsftpd/package.nix b/pkgs/by-name/vs/vsftpd/package.nix index aed7cb231734..1e9b8c79d155 100644 --- a/pkgs/by-name/vs/vsftpd/package.nix +++ b/pkgs/by-name/vs/vsftpd/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, libcap, libseccomp, openssl, @@ -10,13 +11,13 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vsftpd"; version = "3.0.5"; src = fetchurl { - url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz"; - sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM="; + url = "https://security.appspot.com/downloads/vsftpd-${finalAttrs.version}.tar.gz"; + hash = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM="; }; buildInputs = [ @@ -27,7 +28,16 @@ stdenv.mkDerivation rec { libxcrypt ]; - patches = [ ./CVE-2015-1419.patch ]; + patches = [ + ./CVE-2015-1419.patch + + # Fix build with gcc15 + (fetchpatch { + name = "vsftpd-correct-the-definition-of-setup_bio_callbacks-in-ssl.patch"; + url = "https://src.fedoraproject.org/rpms/vsftpd/raw/c31087744900967ff4d572706a296bf6c8c4a68e/f/0076-Correct-the-definition-of-setup_bio_callbacks-in-ssl.patch"; + hash = "sha256-eYiY2eKQ+qS3CiRZYGuRHcnAe32zLDdb/GwF6NyHch4="; + }) + ]; postPatch = '' sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h @@ -54,11 +64,11 @@ stdenv.mkDerivation rec { tests = { inherit (nixosTests) vsftpd; }; }; - meta = with lib; { + meta = { description = "Very secure FTP daemon"; mainProgram = "vsftpd"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index ecdcf4d69b91..d44e68afa92c 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-1Wbznj4UQtb6r3k3UdfsfYfhh+2Q+8N5KaaHrkcBlDE="; + x86_64-linux = "sha256-HQ9d0yUaYRh20/OczwQzshbyO8wMh5vRh+RRNwNIx74="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "18.6"; + version = "18.7"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index d341218101fe..d808ae3690a8 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.8.1"; + version = "0.8.5"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${version}"; - hash = "sha256-GMRtvAG6jdnm+WxXOZb5eOyX1rEqzk7tHZbjSI9/47g="; + hash = "sha256-ef63PVG0JOHY4zyq5M5oAAcxtfhm1XOvpsxgSeXvgDo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ckzg/default.nix b/pkgs/development/python-modules/ckzg/default.nix index 939b96703bdf..bd4b07e4cc10 100644 --- a/pkgs/development/python-modules/ckzg/default.nix +++ b/pkgs/development/python-modules/ckzg/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ckzg"; - version = "2.1.2"; + version = "2.1.4"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "c-kzg-4844"; tag = "v${version}"; - hash = "sha256-B06Nm3D3+m2dEkQthDFowY0MfOOW5TUo324zO5PVSlA="; + hash = "sha256-692u5EFiA3sfJbd3CUdTO/9LP2y4+WjLZZaFkY9vlP4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 7b19da5033d5..0aeb5535f799 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.11.0"; + version = "2.11.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "confluentinc"; repo = "confluent-kafka-python"; tag = "v${version}"; - hash = "sha256-s4UeuFXieyUcFJsYHTaJBKfUssYZ7mt4YoHgXN7bZKI="; + hash = "sha256-WpvWv6UG7T0yJ1ZKZweHbWjh+C0PbEIYbbMAS4yyhzg="; }; buildInputs = [ rdkafka ]; @@ -82,6 +82,7 @@ buildPythonPackage rec { authlib cachetools httpx + orjson ]; }; @@ -111,7 +112,7 @@ buildPythonPackage rec { "tests/schema_registry/_async/test_config.py" "tests/schema_registry/_sync/test_config.py" # crashes the test runner on shutdown - "tests/test_KafkaError.py" + "tests/test_kafka_error.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 31a38588fc9c..ccddedf731c3 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.48.1"; + version = "2.48.2"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-hXVEjToV6YMIJ1XYPhkZjYMbZPf10KmtYDuwBA0N/Hw="; + hash = "sha256-nZ9uPy6H8VhtoC7TXuFfXHefqvQ72jfUSwM6VmuFyxo="; }; build-system = [ diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 9515619827df..da2e50226b23 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, defusedxml, + fastjsonschema, fetchFromGitHub, jsonschema, pytestCheckHook, - pythonOlder, pyyaml, semantic-version, setuptools, @@ -14,22 +14,21 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.8.7"; + version = "0.8.8"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "anthonyharrison"; repo = "lib4sbom"; tag = "v${version}"; - hash = "sha256-qHKedDh7G6yvk6LOs5drJJbkLo20/dP49GG7Q/pOmBw="; + hash = "sha256-JfY47bskOnQeh5ueQfBtQz8Hmi9mPjCMoaFrzpxQMhU="; }; build-system = [ setuptools ]; dependencies = [ defusedxml + fastjsonschema jsonschema pyyaml semantic-version diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix index be625ea4f3d1..8e89b1f83bb6 100644 --- a/pkgs/development/python-modules/llama-cloud-services/default.nix +++ b/pkgs/development/python-modules/llama-cloud-services/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "llama-cloud-services"; - version = "0.6.66"; + version = "0.6.69"; pyproject = true; src = fetchFromGitHub { owner = "run-llama"; repo = "llama_cloud_services"; tag = "v${version}"; - hash = "sha256-6UskoqlnmfoDFeWem8gjKJPE9vg5DtOrzVHQ1Q0eEA4="; + hash = "sha256-+90b/EwG8OfpjG/MJM5shvQHLsLpLe+TviufwoWI7mg="; }; sourceRoot = "${src.name}/py"; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index a44ea022a763..e3e6072c0794 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.6.8"; + version = "0.7.0"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-AwbZxv4ClJYNgeX4UydcOZcAb+8UUc34u/BNHUGSeiI="; + hash = "sha256-wWn3y/NEb71N2hCcd06iof7favJxcVHZmBCvP4UQJl8="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/mammoth/default.nix b/pkgs/development/python-modules/mammoth/default.nix index ed1fc588da84..b90aaa8a5a0a 100644 --- a/pkgs/development/python-modules/mammoth/default.nix +++ b/pkgs/development/python-modules/mammoth/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mammoth"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "mwilliamson"; repo = "python-mammoth"; tag = version; - hash = "sha256-I+PHag4e+RA6EppRTyBe/ywFsRhS+pZZHTh+g151l7Y="; + hash = "sha256-x1wSudTD/C1uHnudaCCrhi9fyQInCej+Kd7CyBI2sus="; }; postPatch = '' diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 70c10fc9d993..77141d5675fb 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.16"; + version = "7.2.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; tag = version; - hash = "sha256-NyHdZKHyok7CbzNZscUJm67+LK4hYkMp/p14M5vm7og="; + hash = "sha256-SP681EBKSyLl9V1TaI/7jsQOLPKKI+XwkR6hpoaSG/Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/numbagg/default.nix b/pkgs/development/python-modules/numbagg/default.nix index 2b0a92699a0c..8ec945dd890f 100644 --- a/pkgs/development/python-modules/numbagg/default.nix +++ b/pkgs/development/python-modules/numbagg/default.nix @@ -21,7 +21,7 @@ }: buildPythonPackage rec { - version = "0.9.2"; + version = "0.9.3"; pname = "numbagg"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "numbagg"; repo = "numbagg"; tag = "v${version}"; - hash = "sha256-W5c0tZUggNyP9O+t9+S14nz9acR53cLIWaBwXJo1dcg="; + hash = "sha256-MEgSxxKZaL0sPhERFa8DWF+Vkc/VuHDyyB2yfFv/uYw="; }; build-system = [ diff --git a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix index 513c958bb98c..6b3f56135673 100644 --- a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix +++ b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "proton-vpn-local-agent"; - version = "1.4.5"; + version = "1.4.8"; pyproject = false; withDistOutput = false; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ProtonVPN"; repo = "python-proton-vpn-local-agent"; rev = version; - hash = "sha256-njulvM8CNURy5Gy8thOT08y4cq9T68Ktl6wlfvg5I4w="; + hash = "sha256-AHY2b0JaYaLhgnNkTsm9ERkw0s0NWnpbPAPgw+r2Gz4="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -28,7 +28,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-RrMhkOZyG0JBEk+ikRpQtsNVR6Jt94u71+srQ6qMq5U="; + hash = "sha256-zzUZsF0R0QGhxe4To6xSHYUVJTIDddf+UdTJg7E9Ef8="; }; sourceRoot = "${src.name}/python-proton-vpn-local-agent"; diff --git a/pkgs/development/python-modules/rapidocr/default.nix b/pkgs/development/python-modules/rapidocr/default.nix index 7e567d93bf0c..5734de8c8bc6 100644 --- a/pkgs/development/python-modules/rapidocr/default.nix +++ b/pkgs/development/python-modules/rapidocr/default.nix @@ -23,13 +23,13 @@ requests, }: let - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "RapidAI"; repo = "RapidOCR"; tag = "v${version}"; - hash = "sha256-yeDWs9axfVl1SlsVwqztlP7BXV+6w6dMpLmlpWaqVko="; + hash = "sha256-Q8QtjI+5QDv6zQ96aXLyEepHfMh75DR+ZWj/ygVx3o0="; }; models = diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix index 65bca92865c5..9e2139840643 100644 --- a/pkgs/development/python-modules/readabilipy/default.nix +++ b/pkgs/development/python-modules/readabilipy/default.nix @@ -29,6 +29,12 @@ buildPythonPackage rec { hash = "sha256-FYdSbq3rm6fBHm5fDRAB0airX9fNcUGs1wHN4i6mnG0="; }; + patches = [ + # Fix test failures with Python 3.13.6 + # https://github.com/alan-turing-institute/ReadabiliPy/pull/116 + ./python3.13.6-compatibility.patch + ]; + javascript = buildNpmPackage { pname = "readabilipy-javascript"; inherit version; diff --git a/pkgs/development/python-modules/readabilipy/python3.13.6-compatibility.patch b/pkgs/development/python-modules/readabilipy/python3.13.6-compatibility.patch new file mode 100644 index 000000000000..91e3ddb3c3d1 --- /dev/null +++ b/pkgs/development/python-modules/readabilipy/python3.13.6-compatibility.patch @@ -0,0 +1,115 @@ +diff --git a/readabilipy/simplifiers/html.py b/readabilipy/simplifiers/html.py +index f68aafd..5c8d95c 100644 +--- a/readabilipy/simplifiers/html.py ++++ b/readabilipy/simplifiers/html.py +@@ -284,6 +284,10 @@ def wrap_bare_text(soup): + # - we are adding additional structure that was not present in the original document + if element.parent.name in block_level_whitelist() and len(element.parent.contents) == 1: + pass ++ # title elements should not have their text wrapped in

tags ++ # as they can only contain text content according to HTML spec. ++ elif element.parent.name == 'title': ++ pass + # ... otherwise wrap them in

tags + else: + p_element = soup.new_tag("p") +diff --git a/tests/data/addictinginfo.com-1_simple_article_from_full_page.json b/tests/data/addictinginfo.com-1_simple_article_from_full_page.json +index 3e58c1e..37b4ccf 100644 +--- a/tests/data/addictinginfo.com-1_simple_article_from_full_page.json ++++ b/tests/data/addictinginfo.com-1_simple_article_from_full_page.json +@@ -2,8 +2,8 @@ + "title": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video", + "byline": null, + "date": "2018-10-15T12:13:54", +- "content": "

<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", +- "plain_content": "
<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "plain_content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", + "plain_text": [ + {"text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, + {"text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, +diff --git a/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest.json b/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest.json +index 4531c15..8650a7e 100644 +--- a/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest.json ++++ b/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest.json +@@ -2,8 +2,8 @@ + "title": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video", + "byline": null, + "date": "2018-10-15T12:13:54", +- "content": "
<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", +- "plain_content": "
<p data-content-digest=\"ccdf3c0529ffdbc11eff7fbebc390f64dc12d9f8eb458b8b11225fa77a583faa\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p data-content-digest=\"fdba4f206dce87355a1a1d677ebe2de75ae6b80894984256907f8d6bde6e9421\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "plain_content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", + "plain_text": [ + {"text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, + {"text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, +diff --git a/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest_node_indexes.json b/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest_node_indexes.json +index 0ec8329..2e4a83d 100644 +--- a/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest_node_indexes.json ++++ b/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest_node_indexes.json +@@ -2,11 +2,11 @@ + "title": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video", + "byline": null, + "date": "2018-10-15T12:13:54", +- "content": "
<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", +- "plain_content": "
<p data-content-digest=\"ccdf3c0529ffdbc11eff7fbebc390f64dc12d9f8eb458b8b11225fa77a583faa\" data-node-index=\"0.1.1\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p data-content-digest=\"fdba4f206dce87355a1a1d677ebe2de75ae6b80894984256907f8d6bde6e9421\" data-node-index=\"0.2.1\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "plain_content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", + "plain_text": [ +- {"node_index": "0.1.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, +- {"node_index": "0.2.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, ++ {"node_index": "0.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, ++ {"node_index": "0.2", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, + {"node_index": "0.3.1.1.1.1.1", "text": "* About Us, * Contact Us, * Creative Commons License, * Privacy Policy, * Terms of Service,"}, + {"node_index": "0.3.1.1.2.1.1", "text": "* Home, * News, * Important Information, * Discredited Myths, * Historical Information, * Political Humor,"}, + {"node_index": "0.3.1.2.1.1.1", "text": "Current Issues, News"}, +diff --git a/tests/data/addictinginfo.com-1_simple_article_from_full_page_node_indexes.json b/tests/data/addictinginfo.com-1_simple_article_from_full_page_node_indexes.json +index f6b3026..b725000 100644 +--- a/tests/data/addictinginfo.com-1_simple_article_from_full_page_node_indexes.json ++++ b/tests/data/addictinginfo.com-1_simple_article_from_full_page_node_indexes.json +@@ -2,11 +2,11 @@ + "title": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video", + "byline": null, + "date": "2018-10-15T12:13:54", +- "content": "
<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", +- "plain_content": "
<p data-node-index=\"0.1.1\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p data-node-index=\"0.2.1\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "plain_content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", + "plain_text": [ +- {"node_index": "0.1.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, +- {"node_index": "0.2.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, ++ {"node_index": "0.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, ++ {"node_index": "0.2", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, + {"node_index": "0.3.1.1.1.1.1", "text": "* About Us, * Contact Us, * Creative Commons License, * Privacy Policy, * Terms of Service,"}, + {"node_index": "0.3.1.1.2.1.1", "text": "* Home, * News, * Important Information, * Discredited Myths, * Historical Information, * Political Humor,"}, + {"node_index": "0.3.1.2.1.1.1", "text": "Current Issues, News"}, +diff --git a/tests/data/conservativehq.com-1_simple_article_from_full_page.json b/tests/data/conservativehq.com-1_simple_article_from_full_page.json +index 619a697..544d9a0 100644 +--- a/tests/data/conservativehq.com-1_simple_article_from_full_page.json ++++ b/tests/data/conservativehq.com-1_simple_article_from_full_page.json +@@ -2,8 +2,8 @@ + "title": "Beware Soros's \"Rented Evangelicals\"", + "byline": null, + "date": null, +- "content": "
<p>Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com</p>
  • Login
  • New to CHQ?
  • Home
  • Exclusive CHQ News
  • In The Media
  • About Us
  • Join CHQ
  • Login to CHQ
  • Contact

Share This Article with a Friend!

Printer-friendly version

Beware Soros's \"Rented Evangelicals\"

  • American Association of Evangelicals (AAE)
  • anti-Judeo Christian agenda
  • Christian VOLAGs
  • flip Congress
  • George Soros
  • Hillary Clinton
  • human organ trafficking
  • Immigration
  • Jim Wallis
  • mascots
  • ministers
  • open borders
  • Open Society Foundation
  • PICO
  • Pope Francis
  • refugee resettlement
  • Rented Evangelicals
  • Same-sex marriage
  • Socialism
  • Sojourners
  • Soros ministers
  • transgender agenda
CHQ Staff | 10/17/18

As Soros-funded “ministers” are on buses through swing states to “flip Congress,” our friends with the American Association of Evangelicals (AAE) have just put out a 3-minute video, Soros’s “Rented Evangelicals.”* It provides a lot of info in a short time and is reaching many thousands of people each day through social media.

“Soros’s Rented Evangelicals” is a wake-up call that we urge you to share with your family, friends, church and club members to alert them to this assault on the Body of Christ.

This is a very complex story, however, as leaked documents obtained by our friends at AAE confirm, and as Rev. Jim Wallis of Sojourners eventually admitted, wealthy, anti-Christian foundations, following the lead of billionaire George Soros’s Open Society Foundation, fund and “rent” curious \"evangelical\" and \"Catholic\" \"mascots” serving as deceptive validators for their causes. The consequent realities include injury to countless people, the Church, the family, nation and the global Church including many martyrs.

Consider some of the consequences of 'Progressive' political activism over the past few decades documented by AAE:

A growth industry trafficking in human baby organs and body parts, funded and defended by the Democratic Party.

The abandonment of a biblical view of marriage that protected and liberated children and adults from centuries of pagan slavery, poverty, polygamy and non-life-giving sexuality.

The Transgender agenda including gender \"reorientation\" of our children, also being forced on our neighbors, businesses, schools, military and churches.

Socialism, higher taxes and government regulations. These policies stifle human creativity, productivity, family stability and generosity. Such policies increase joblessness, welfare dependency and national debt.

Heightened racial division and tension, and the growing phenomenon of paid demonstrators being recruited and dispatched to instigate protests that often become riots.

Open borders and lawless ‘sanctuary’ cities increasing drugs, disease, crime, gangs and terrorism.

Amnesty efforts that attempt to give voting rights to millions of non-citizens, giving the results of our elections and nation's future to many who disregarded our laws, customs, history, identity and values. This does not honor our long-standing tradition of legal immigration to those who come in good faith and to assimilate and bless America.

Forced refugee resettlement in hundreds of American cities without citizen consent, mandated by the Obama-era federal government in partnership with the United Nations. (Refugees were primarily non-assimilating Muslims, while authorities often reject persecuted Christians.)

Hostility towards Judeo-Christian religious liberty in our courts, large corporations, media and universities including the suppression of conservative speakers, free thought and moral education.

The growing recognition of a \"Deep State\" within our government, including ideological bureaucrats embedded in our DOJ, IRS, FBI and Department of State, that intimidates and seeks to subvert conservative, patriotic and Christian groups that disagree with the 'Progressive' political establishment.

After such demoralization and pain, asked AAE, why would any religious leader ask Christians to embrace, support or vote for a Progressive political agenda that is clearly anti-Christian?

When Hillary Clinton stated during a 2015 speech at the Women in the World Summit that religious beliefs “have to be changed,” she revealed the radical Left's war on Christian believers and the Church.

And now the Religious Left claims that supporting such a view is the Christian thing to do? This is spiritual abuse of human beings, the family, the Church and the nation.

“The framers of our Constitution meant we were to have freedom of religion, not freedom from religion.” Rev. Billy Graham

For many years, Soros’s Open Society and other liberal foundations have funded not only most of the disturbing campaigns mentioned above (1-10) but also the Religious Left, using and creating ostensibly evangelical and Catholic organizations to “message and mobilize” Christians into Progressive causes. They use the Marxist-Alinsky tactic of funding “ministers” who cherry-pick faith language to confuse and divide the Church’s morality, mission and vote.

At a time when many Christian ministries are struggling, a few of the Soros network “faith” and “interfaith” grantees are Jim Wallis of Sojourners, Richard Cizik’s New Evangelical Partnership, Telos, J Street to malign Israel, Catholics in Alliance for the Common Good, Faithful America and Gamaliel. Faith in Public Life to “counter” Christians and conservatives in the media and, with PICO, advocate for amnesty, mass Islamic migration, and even to attempt to influence the visit and priorities of the Vatican and Pope Francis himself. Billions of additional dollars to “Christian VOLAGs” for large scale “refugee” and migrant resettlement come from the Obama administration.

Joining “faith” fronts, the Soros network also funds thousands of other collaborators and projects that suggest a pattern and goal to demoralize America (and Europe). The list includes: film studios and hundreds of media outlets; attempts to control the Internet; racial and gender agitation; euthanasia; drug legalization and “injection zones;” abortion and the “sex worker” industry; Al Gore’s Climate campaign; pro-Palestinian and anti-Israel projects; the rights of jihadists and Sharia advocates.

In the ironic rhetoric of compassion, Soros and allies fund mass immigration, redistricting schemes, illegals' voting “rights,” protests and smears on Judge Kavanaugh and the Supreme Court, while financing the 2018 campaigns of Democrats Andrew Gillum (D-FL), Jon Tester (D-MT), Claire McCaskill (D-MO), Tim Kaine (D-VA), Kristen Gillibrand (D-NY), Krysten Sinema (D-AZ), Elizabeth Warren (D-MA) and many more. (Soros has long been a major donor to the Democratic Party, co-chairman of Ready for Hillary PAC and previously funded Al Gore, John Kerry, Barack Obama, Hillary Clinton, Al Franken and many far-Left Democrats).

One wonders if the end goal is the destruction of national identity through demoralization, open borders and debt, thus the “fundamental transformation” (weakening) of American civil society for their leveraged global power. (Soros broke the Bank of England, is a convicted felon in France, and is undermining many nations.)

We urge you to go to https://americanevangelicals.com/ for more information on Soros and his releationship with some who claim to be speaking for Evangelical Christians. We should all question the true intentions of persons or organizations that receive money from Soros and related globalist social engineers. We must not give America's future to him and his surrogates, for more harm.

*The phrase comes from the New America Foundation strategy, “Rent An Evangelical” and “Rent A General” as “mascots.”

  • Login or register to post comments

Fake Christians

Submitted by charlyc on Wed, 10/17/2018 - 12:17.

Jesus said you cannot serve God and mammon. (Mammon=wealth, riches) \"Rented Evangelicals\" transparently means mammon servers. Jesus also said, You shall know them by their fruits. What fruits are they producing? These are the tares (weeds) sown into the wheat that Jesus warned us about in the parable of the wheat and the tares (Matt 13:25). \"the tares are the children of The Evil One.\" (Matt 13:38) Just because someone goes to \"church\" on Sunday doesn't mean they're a true Christian. Even Satan can quote scripture. (Matt 4:6 in which he quotes Psalms 91:11-12)

  • Login or register to post comments

Fake Christians

Submitted by email_registrat... on Fri, 10/19/2018 - 14:08.

Yeshua says to: “BEWARE of false prophets, who come to you in sheep’s clothing, but inwardly they are ravenous wolves. YOU WILL KNOW THEM BY THEIR FRUITS. Do men gather grapes from thorn bushes or figs from thistles? Even so, EVERY GOOD TREE BEARS GOOD FRUIT, but A BAD TREE BEARS BAD FRUIT. A GOOD tree CANNOT BEAR BAD fruit, nor can a BAD tree BEAR GOOD fruit. Every tree that does not bear good fruit is cut down and thrown into the fire. THEREFORE BY THEIR FRUITS you WILL KNOW them” (Matthew 7:15-20) [emphasis mine].

  • Login or register to post comments

Learn How Conservatives Can Fight Back & Win in 2018

FOLLOW US on FACEBOOK, TWITTER

* Richard Viguerie on Twitter * ConservativeHQ on Facebook * Conservative TAKEOVER on Facebook

Login to CHQ

Register to become a ConservativeHQ.com member - click here. If you are already a member, please log-in by clicking here.

ConservativeHQ.com Officers: Richard A. Viguerie - Chairman

Editor:
George Rasley
Writers:
Mark Fitzgibbons
Ben Hart
George Rasley
Richard A. Viguerie

ConservativeHQ.com is the online news source for conservatives and Tea Partiers committed to bringing limited government constitutional conservatives to power.

  • Copyright © 2017 ConservativeHQ.com, Inc. To view our privacy policy, click here
", +- "plain_content": "
<p>Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com</p>
  • Login
  • New to CHQ?
  • Home
  • Exclusive CHQ News
  • In The Media
  • About Us
  • Join CHQ
  • Login to CHQ
  • Contact

Share This Article with a Friend!

Printer-friendly version

Beware Soros's \"Rented Evangelicals\"

  • American Association of Evangelicals (AAE)
  • anti-Judeo Christian agenda
  • Christian VOLAGs
  • flip Congress
  • George Soros
  • Hillary Clinton
  • human organ trafficking
  • Immigration
  • Jim Wallis
  • mascots
  • ministers
  • open borders
  • Open Society Foundation
  • PICO
  • Pope Francis
  • refugee resettlement
  • Rented Evangelicals
  • Same-sex marriage
  • Socialism
  • Sojourners
  • Soros ministers
  • transgender agenda
CHQ Staff | 10/17/18

As Soros-funded “ministers” are on buses through swing states to “flip Congress,” our friends with the American Association of Evangelicals (AAE) have just put out a 3-minute video, Soros’s “Rented Evangelicals.”* It provides a lot of info in a short time and is reaching many thousands of people each day through social media.

“Soros’s Rented Evangelicals” is a wake-up call that we urge you to share with your family, friends, church and club members to alert them to this assault on the Body of Christ.

This is a very complex story, however, as leaked documents obtained by our friends at AAE confirm, and as Rev. Jim Wallis of Sojourners eventually admitted, wealthy, anti-Christian foundations, following the lead of billionaire George Soros’s Open Society Foundation, fund and “rent” curious \"evangelical\" and \"Catholic\" \"mascots” serving as deceptive validators for their causes. The consequent realities include injury to countless people, the Church, the family, nation and the global Church including many martyrs.

Consider some of the consequences of 'Progressive' political activism over the past few decades documented by AAE:

A growth industry trafficking in human baby organs and body parts, funded and defended by the Democratic Party.

The abandonment of a biblical view of marriage that protected and liberated children and adults from centuries of pagan slavery, poverty, polygamy and non-life-giving sexuality.

The Transgender agenda including gender \"reorientation\" of our children, also being forced on our neighbors, businesses, schools, military and churches.

Socialism, higher taxes and government regulations. These policies stifle human creativity, productivity, family stability and generosity. Such policies increase joblessness, welfare dependency and national debt.

Heightened racial division and tension, and the growing phenomenon of paid demonstrators being recruited and dispatched to instigate protests that often become riots.

Open borders and lawless ‘sanctuary’ cities increasing drugs, disease, crime, gangs and terrorism.

Amnesty efforts that attempt to give voting rights to millions of non-citizens, giving the results of our elections and nation's future to many who disregarded our laws, customs, history, identity and values. This does not honor our long-standing tradition of legal immigration to those who come in good faith and to assimilate and bless America.

Forced refugee resettlement in hundreds of American cities without citizen consent, mandated by the Obama-era federal government in partnership with the United Nations. (Refugees were primarily non-assimilating Muslims, while authorities often reject persecuted Christians.)

Hostility towards Judeo-Christian religious liberty in our courts, large corporations, media and universities including the suppression of conservative speakers, free thought and moral education.

The growing recognition of a \"Deep State\" within our government, including ideological bureaucrats embedded in our DOJ, IRS, FBI and Department of State, that intimidates and seeks to subvert conservative, patriotic and Christian groups that disagree with the 'Progressive' political establishment.

After such demoralization and pain, asked AAE, why would any religious leader ask Christians to embrace, support or vote for a Progressive political agenda that is clearly anti-Christian?

When Hillary Clinton stated during a 2015 speech at the Women in the World Summit that religious beliefs “have to be changed,” she revealed the radical Left's war on Christian believers and the Church.

And now the Religious Left claims that supporting such a view is the Christian thing to do? This is spiritual abuse of human beings, the family, the Church and the nation.

“The framers of our Constitution meant we were to have freedom of religion, not freedom from religion.” Rev. Billy Graham

For many years, Soros’s Open Society and other liberal foundations have funded not only most of the disturbing campaigns mentioned above (1-10) but also the Religious Left, using and creating ostensibly evangelical and Catholic organizations to “message and mobilize” Christians into Progressive causes. They use the Marxist-Alinsky tactic of funding “ministers” who cherry-pick faith language to confuse and divide the Church’s morality, mission and vote.

At a time when many Christian ministries are struggling, a few of the Soros network “faith” and “interfaith” grantees are Jim Wallis of Sojourners, Richard Cizik’s New Evangelical Partnership, Telos, J Street to malign Israel, Catholics in Alliance for the Common Good, Faithful America and Gamaliel. Faith in Public Life to “counter” Christians and conservatives in the media and, with PICO, advocate for amnesty, mass Islamic migration, and even to attempt to influence the visit and priorities of the Vatican and Pope Francis himself. Billions of additional dollars to “Christian VOLAGs” for large scale “refugee” and migrant resettlement come from the Obama administration.

Joining “faith” fronts, the Soros network also funds thousands of other collaborators and projects that suggest a pattern and goal to demoralize America (and Europe). The list includes: film studios and hundreds of media outlets; attempts to control the Internet; racial and gender agitation; euthanasia; drug legalization and “injection zones;” abortion and the “sex worker” industry; Al Gore’s Climate campaign; pro-Palestinian and anti-Israel projects; the rights of jihadists and Sharia advocates.

In the ironic rhetoric of compassion, Soros and allies fund mass immigration, redistricting schemes, illegals' voting “rights,” protests and smears on Judge Kavanaugh and the Supreme Court, while financing the 2018 campaigns of Democrats Andrew Gillum (D-FL), Jon Tester (D-MT), Claire McCaskill (D-MO), Tim Kaine (D-VA), Kristen Gillibrand (D-NY), Krysten Sinema (D-AZ), Elizabeth Warren (D-MA) and many more. (Soros has long been a major donor to the Democratic Party, co-chairman of Ready for Hillary PAC and previously funded Al Gore, John Kerry, Barack Obama, Hillary Clinton, Al Franken and many far-Left Democrats).

One wonders if the end goal is the destruction of national identity through demoralization, open borders and debt, thus the “fundamental transformation” (weakening) of American civil society for their leveraged global power. (Soros broke the Bank of England, is a convicted felon in France, and is undermining many nations.)

We urge you to go to https://americanevangelicals.com/ for more information on Soros and his releationship with some who claim to be speaking for Evangelical Christians. We should all question the true intentions of persons or organizations that receive money from Soros and related globalist social engineers. We must not give America's future to him and his surrogates, for more harm.

*The phrase comes from the New America Foundation strategy, “Rent An Evangelical” and “Rent A General” as “mascots.”

  • Login or register to post comments

Fake Christians

Submitted by charlyc on Wed, 10/17/2018 - 12:17.

Jesus said you cannot serve God and mammon. (Mammon=wealth, riches) \"Rented Evangelicals\" transparently means mammon servers. Jesus also said, You shall know them by their fruits. What fruits are they producing? These are the tares (weeds) sown into the wheat that Jesus warned us about in the parable of the wheat and the tares (Matt 13:25). \"the tares are the children of The Evil One.\" (Matt 13:38) Just because someone goes to \"church\" on Sunday doesn't mean they're a true Christian. Even Satan can quote scripture. (Matt 4:6 in which he quotes Psalms 91:11-12)

  • Login or register to post comments

Fake Christians

Submitted by email_registrat... on Fri, 10/19/2018 - 14:08.

Yeshua says to: “BEWARE of false prophets, who come to you in sheep’s clothing, but inwardly they are ravenous wolves. YOU WILL KNOW THEM BY THEIR FRUITS. Do men gather grapes from thorn bushes or figs from thistles? Even so, EVERY GOOD TREE BEARS GOOD FRUIT, but A BAD TREE BEARS BAD FRUIT. A GOOD tree CANNOT BEAR BAD fruit, nor can a BAD tree BEAR GOOD fruit. Every tree that does not bear good fruit is cut down and thrown into the fire. THEREFORE BY THEIR FRUITS you WILL KNOW them” (Matthew 7:15-20) [emphasis mine].

  • Login or register to post comments

Learn How Conservatives Can Fight Back & Win in 2018

FOLLOW US on FACEBOOK, TWITTER

* Richard Viguerie on Twitter * ConservativeHQ on Facebook * Conservative TAKEOVER on Facebook

Login to CHQ

Register to become a ConservativeHQ.com member - click here. If you are already a member, please log-in by clicking here.

ConservativeHQ.com Officers: Richard A. Viguerie - Chairman

Editor:
George Rasley
Writers:
Mark Fitzgibbons
Ben Hart
George Rasley
Richard A. Viguerie

ConservativeHQ.com is the online news source for conservatives and Tea Partiers committed to bringing limited government constitutional conservatives to power.

  • Copyright © 2017 ConservativeHQ.com, Inc. To view our privacy policy, click here
", ++ "content": "
Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com
  • Login
  • New to CHQ?
  • Home
  • Exclusive CHQ News
  • In The Media
  • About Us
  • Join CHQ
  • Login to CHQ
  • Contact

Share This Article with a Friend!

Printer-friendly version

Beware Soros's \"Rented Evangelicals\"

  • American Association of Evangelicals (AAE)
  • anti-Judeo Christian agenda
  • Christian VOLAGs
  • flip Congress
  • George Soros
  • Hillary Clinton
  • human organ trafficking
  • Immigration
  • Jim Wallis
  • mascots
  • ministers
  • open borders
  • Open Society Foundation
  • PICO
  • Pope Francis
  • refugee resettlement
  • Rented Evangelicals
  • Same-sex marriage
  • Socialism
  • Sojourners
  • Soros ministers
  • transgender agenda
CHQ Staff | 10/17/18

As Soros-funded “ministers” are on buses through swing states to “flip Congress,” our friends with the American Association of Evangelicals (AAE) have just put out a 3-minute video, Soros’s “Rented Evangelicals.”* It provides a lot of info in a short time and is reaching many thousands of people each day through social media.

“Soros’s Rented Evangelicals” is a wake-up call that we urge you to share with your family, friends, church and club members to alert them to this assault on the Body of Christ.

This is a very complex story, however, as leaked documents obtained by our friends at AAE confirm, and as Rev. Jim Wallis of Sojourners eventually admitted, wealthy, anti-Christian foundations, following the lead of billionaire George Soros’s Open Society Foundation, fund and “rent” curious \"evangelical\" and \"Catholic\" \"mascots” serving as deceptive validators for their causes. The consequent realities include injury to countless people, the Church, the family, nation and the global Church including many martyrs.

Consider some of the consequences of 'Progressive' political activism over the past few decades documented by AAE:

A growth industry trafficking in human baby organs and body parts, funded and defended by the Democratic Party.

The abandonment of a biblical view of marriage that protected and liberated children and adults from centuries of pagan slavery, poverty, polygamy and non-life-giving sexuality.

The Transgender agenda including gender \"reorientation\" of our children, also being forced on our neighbors, businesses, schools, military and churches.

Socialism, higher taxes and government regulations. These policies stifle human creativity, productivity, family stability and generosity. Such policies increase joblessness, welfare dependency and national debt.

Heightened racial division and tension, and the growing phenomenon of paid demonstrators being recruited and dispatched to instigate protests that often become riots.

Open borders and lawless ‘sanctuary’ cities increasing drugs, disease, crime, gangs and terrorism.

Amnesty efforts that attempt to give voting rights to millions of non-citizens, giving the results of our elections and nation's future to many who disregarded our laws, customs, history, identity and values. This does not honor our long-standing tradition of legal immigration to those who come in good faith and to assimilate and bless America.

Forced refugee resettlement in hundreds of American cities without citizen consent, mandated by the Obama-era federal government in partnership with the United Nations. (Refugees were primarily non-assimilating Muslims, while authorities often reject persecuted Christians.)

Hostility towards Judeo-Christian religious liberty in our courts, large corporations, media and universities including the suppression of conservative speakers, free thought and moral education.

The growing recognition of a \"Deep State\" within our government, including ideological bureaucrats embedded in our DOJ, IRS, FBI and Department of State, that intimidates and seeks to subvert conservative, patriotic and Christian groups that disagree with the 'Progressive' political establishment.

After such demoralization and pain, asked AAE, why would any religious leader ask Christians to embrace, support or vote for a Progressive political agenda that is clearly anti-Christian?

When Hillary Clinton stated during a 2015 speech at the Women in the World Summit that religious beliefs “have to be changed,” she revealed the radical Left's war on Christian believers and the Church.

And now the Religious Left claims that supporting such a view is the Christian thing to do? This is spiritual abuse of human beings, the family, the Church and the nation.

“The framers of our Constitution meant we were to have freedom of religion, not freedom from religion.” Rev. Billy Graham

For many years, Soros’s Open Society and other liberal foundations have funded not only most of the disturbing campaigns mentioned above (1-10) but also the Religious Left, using and creating ostensibly evangelical and Catholic organizations to “message and mobilize” Christians into Progressive causes. They use the Marxist-Alinsky tactic of funding “ministers” who cherry-pick faith language to confuse and divide the Church’s morality, mission and vote.

At a time when many Christian ministries are struggling, a few of the Soros network “faith” and “interfaith” grantees are Jim Wallis of Sojourners, Richard Cizik’s New Evangelical Partnership, Telos, J Street to malign Israel, Catholics in Alliance for the Common Good, Faithful America and Gamaliel. Faith in Public Life to “counter” Christians and conservatives in the media and, with PICO, advocate for amnesty, mass Islamic migration, and even to attempt to influence the visit and priorities of the Vatican and Pope Francis himself. Billions of additional dollars to “Christian VOLAGs” for large scale “refugee” and migrant resettlement come from the Obama administration.

Joining “faith” fronts, the Soros network also funds thousands of other collaborators and projects that suggest a pattern and goal to demoralize America (and Europe). The list includes: film studios and hundreds of media outlets; attempts to control the Internet; racial and gender agitation; euthanasia; drug legalization and “injection zones;” abortion and the “sex worker” industry; Al Gore’s Climate campaign; pro-Palestinian and anti-Israel projects; the rights of jihadists and Sharia advocates.

In the ironic rhetoric of compassion, Soros and allies fund mass immigration, redistricting schemes, illegals' voting “rights,” protests and smears on Judge Kavanaugh and the Supreme Court, while financing the 2018 campaigns of Democrats Andrew Gillum (D-FL), Jon Tester (D-MT), Claire McCaskill (D-MO), Tim Kaine (D-VA), Kristen Gillibrand (D-NY), Krysten Sinema (D-AZ), Elizabeth Warren (D-MA) and many more. (Soros has long been a major donor to the Democratic Party, co-chairman of Ready for Hillary PAC and previously funded Al Gore, John Kerry, Barack Obama, Hillary Clinton, Al Franken and many far-Left Democrats).

One wonders if the end goal is the destruction of national identity through demoralization, open borders and debt, thus the “fundamental transformation” (weakening) of American civil society for their leveraged global power. (Soros broke the Bank of England, is a convicted felon in France, and is undermining many nations.)

We urge you to go to https://americanevangelicals.com/ for more information on Soros and his releationship with some who claim to be speaking for Evangelical Christians. We should all question the true intentions of persons or organizations that receive money from Soros and related globalist social engineers. We must not give America's future to him and his surrogates, for more harm.

*The phrase comes from the New America Foundation strategy, “Rent An Evangelical” and “Rent A General” as “mascots.”

  • Login or register to post comments

Fake Christians

Submitted by charlyc on Wed, 10/17/2018 - 12:17.

Jesus said you cannot serve God and mammon. (Mammon=wealth, riches) \"Rented Evangelicals\" transparently means mammon servers. Jesus also said, You shall know them by their fruits. What fruits are they producing? These are the tares (weeds) sown into the wheat that Jesus warned us about in the parable of the wheat and the tares (Matt 13:25). \"the tares are the children of The Evil One.\" (Matt 13:38) Just because someone goes to \"church\" on Sunday doesn't mean they're a true Christian. Even Satan can quote scripture. (Matt 4:6 in which he quotes Psalms 91:11-12)

  • Login or register to post comments

Fake Christians

Submitted by email_registrat... on Fri, 10/19/2018 - 14:08.

Yeshua says to: “BEWARE of false prophets, who come to you in sheep’s clothing, but inwardly they are ravenous wolves. YOU WILL KNOW THEM BY THEIR FRUITS. Do men gather grapes from thorn bushes or figs from thistles? Even so, EVERY GOOD TREE BEARS GOOD FRUIT, but A BAD TREE BEARS BAD FRUIT. A GOOD tree CANNOT BEAR BAD fruit, nor can a BAD tree BEAR GOOD fruit. Every tree that does not bear good fruit is cut down and thrown into the fire. THEREFORE BY THEIR FRUITS you WILL KNOW them” (Matthew 7:15-20) [emphasis mine].

  • Login or register to post comments

Learn How Conservatives Can Fight Back & Win in 2018

FOLLOW US on FACEBOOK, TWITTER

* Richard Viguerie on Twitter * ConservativeHQ on Facebook * Conservative TAKEOVER on Facebook

Login to CHQ

Register to become a ConservativeHQ.com member - click here. If you are already a member, please log-in by clicking here.

ConservativeHQ.com Officers: Richard A. Viguerie - Chairman

Editor:
George Rasley
Writers:
Mark Fitzgibbons
Ben Hart
George Rasley
Richard A. Viguerie

ConservativeHQ.com is the online news source for conservatives and Tea Partiers committed to bringing limited government constitutional conservatives to power.

  • Copyright © 2017 ConservativeHQ.com, Inc. To view our privacy policy, click here
", ++ "plain_content": "
Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com
  • Login
  • New to CHQ?
  • Home
  • Exclusive CHQ News
  • In The Media
  • About Us
  • Join CHQ
  • Login to CHQ
  • Contact

Share This Article with a Friend!

Printer-friendly version

Beware Soros's \"Rented Evangelicals\"

  • American Association of Evangelicals (AAE)
  • anti-Judeo Christian agenda
  • Christian VOLAGs
  • flip Congress
  • George Soros
  • Hillary Clinton
  • human organ trafficking
  • Immigration
  • Jim Wallis
  • mascots
  • ministers
  • open borders
  • Open Society Foundation
  • PICO
  • Pope Francis
  • refugee resettlement
  • Rented Evangelicals
  • Same-sex marriage
  • Socialism
  • Sojourners
  • Soros ministers
  • transgender agenda
CHQ Staff | 10/17/18

As Soros-funded “ministers” are on buses through swing states to “flip Congress,” our friends with the American Association of Evangelicals (AAE) have just put out a 3-minute video, Soros’s “Rented Evangelicals.”* It provides a lot of info in a short time and is reaching many thousands of people each day through social media.

“Soros’s Rented Evangelicals” is a wake-up call that we urge you to share with your family, friends, church and club members to alert them to this assault on the Body of Christ.

This is a very complex story, however, as leaked documents obtained by our friends at AAE confirm, and as Rev. Jim Wallis of Sojourners eventually admitted, wealthy, anti-Christian foundations, following the lead of billionaire George Soros’s Open Society Foundation, fund and “rent” curious \"evangelical\" and \"Catholic\" \"mascots” serving as deceptive validators for their causes. The consequent realities include injury to countless people, the Church, the family, nation and the global Church including many martyrs.

Consider some of the consequences of 'Progressive' political activism over the past few decades documented by AAE:

A growth industry trafficking in human baby organs and body parts, funded and defended by the Democratic Party.

The abandonment of a biblical view of marriage that protected and liberated children and adults from centuries of pagan slavery, poverty, polygamy and non-life-giving sexuality.

The Transgender agenda including gender \"reorientation\" of our children, also being forced on our neighbors, businesses, schools, military and churches.

Socialism, higher taxes and government regulations. These policies stifle human creativity, productivity, family stability and generosity. Such policies increase joblessness, welfare dependency and national debt.

Heightened racial division and tension, and the growing phenomenon of paid demonstrators being recruited and dispatched to instigate protests that often become riots.

Open borders and lawless ‘sanctuary’ cities increasing drugs, disease, crime, gangs and terrorism.

Amnesty efforts that attempt to give voting rights to millions of non-citizens, giving the results of our elections and nation's future to many who disregarded our laws, customs, history, identity and values. This does not honor our long-standing tradition of legal immigration to those who come in good faith and to assimilate and bless America.

Forced refugee resettlement in hundreds of American cities without citizen consent, mandated by the Obama-era federal government in partnership with the United Nations. (Refugees were primarily non-assimilating Muslims, while authorities often reject persecuted Christians.)

Hostility towards Judeo-Christian religious liberty in our courts, large corporations, media and universities including the suppression of conservative speakers, free thought and moral education.

The growing recognition of a \"Deep State\" within our government, including ideological bureaucrats embedded in our DOJ, IRS, FBI and Department of State, that intimidates and seeks to subvert conservative, patriotic and Christian groups that disagree with the 'Progressive' political establishment.

After such demoralization and pain, asked AAE, why would any religious leader ask Christians to embrace, support or vote for a Progressive political agenda that is clearly anti-Christian?

When Hillary Clinton stated during a 2015 speech at the Women in the World Summit that religious beliefs “have to be changed,” she revealed the radical Left's war on Christian believers and the Church.

And now the Religious Left claims that supporting such a view is the Christian thing to do? This is spiritual abuse of human beings, the family, the Church and the nation.

“The framers of our Constitution meant we were to have freedom of religion, not freedom from religion.” Rev. Billy Graham

For many years, Soros’s Open Society and other liberal foundations have funded not only most of the disturbing campaigns mentioned above (1-10) but also the Religious Left, using and creating ostensibly evangelical and Catholic organizations to “message and mobilize” Christians into Progressive causes. They use the Marxist-Alinsky tactic of funding “ministers” who cherry-pick faith language to confuse and divide the Church’s morality, mission and vote.

At a time when many Christian ministries are struggling, a few of the Soros network “faith” and “interfaith” grantees are Jim Wallis of Sojourners, Richard Cizik’s New Evangelical Partnership, Telos, J Street to malign Israel, Catholics in Alliance for the Common Good, Faithful America and Gamaliel. Faith in Public Life to “counter” Christians and conservatives in the media and, with PICO, advocate for amnesty, mass Islamic migration, and even to attempt to influence the visit and priorities of the Vatican and Pope Francis himself. Billions of additional dollars to “Christian VOLAGs” for large scale “refugee” and migrant resettlement come from the Obama administration.

Joining “faith” fronts, the Soros network also funds thousands of other collaborators and projects that suggest a pattern and goal to demoralize America (and Europe). The list includes: film studios and hundreds of media outlets; attempts to control the Internet; racial and gender agitation; euthanasia; drug legalization and “injection zones;” abortion and the “sex worker” industry; Al Gore’s Climate campaign; pro-Palestinian and anti-Israel projects; the rights of jihadists and Sharia advocates.

In the ironic rhetoric of compassion, Soros and allies fund mass immigration, redistricting schemes, illegals' voting “rights,” protests and smears on Judge Kavanaugh and the Supreme Court, while financing the 2018 campaigns of Democrats Andrew Gillum (D-FL), Jon Tester (D-MT), Claire McCaskill (D-MO), Tim Kaine (D-VA), Kristen Gillibrand (D-NY), Krysten Sinema (D-AZ), Elizabeth Warren (D-MA) and many more. (Soros has long been a major donor to the Democratic Party, co-chairman of Ready for Hillary PAC and previously funded Al Gore, John Kerry, Barack Obama, Hillary Clinton, Al Franken and many far-Left Democrats).

One wonders if the end goal is the destruction of national identity through demoralization, open borders and debt, thus the “fundamental transformation” (weakening) of American civil society for their leveraged global power. (Soros broke the Bank of England, is a convicted felon in France, and is undermining many nations.)

We urge you to go to https://americanevangelicals.com/ for more information on Soros and his releationship with some who claim to be speaking for Evangelical Christians. We should all question the true intentions of persons or organizations that receive money from Soros and related globalist social engineers. We must not give America's future to him and his surrogates, for more harm.

*The phrase comes from the New America Foundation strategy, “Rent An Evangelical” and “Rent A General” as “mascots.”

  • Login or register to post comments

Fake Christians

Submitted by charlyc on Wed, 10/17/2018 - 12:17.

Jesus said you cannot serve God and mammon. (Mammon=wealth, riches) \"Rented Evangelicals\" transparently means mammon servers. Jesus also said, You shall know them by their fruits. What fruits are they producing? These are the tares (weeds) sown into the wheat that Jesus warned us about in the parable of the wheat and the tares (Matt 13:25). \"the tares are the children of The Evil One.\" (Matt 13:38) Just because someone goes to \"church\" on Sunday doesn't mean they're a true Christian. Even Satan can quote scripture. (Matt 4:6 in which he quotes Psalms 91:11-12)

  • Login or register to post comments

Fake Christians

Submitted by email_registrat... on Fri, 10/19/2018 - 14:08.

Yeshua says to: “BEWARE of false prophets, who come to you in sheep’s clothing, but inwardly they are ravenous wolves. YOU WILL KNOW THEM BY THEIR FRUITS. Do men gather grapes from thorn bushes or figs from thistles? Even so, EVERY GOOD TREE BEARS GOOD FRUIT, but A BAD TREE BEARS BAD FRUIT. A GOOD tree CANNOT BEAR BAD fruit, nor can a BAD tree BEAR GOOD fruit. Every tree that does not bear good fruit is cut down and thrown into the fire. THEREFORE BY THEIR FRUITS you WILL KNOW them” (Matthew 7:15-20) [emphasis mine].

  • Login or register to post comments

Learn How Conservatives Can Fight Back & Win in 2018

FOLLOW US on FACEBOOK, TWITTER

* Richard Viguerie on Twitter * ConservativeHQ on Facebook * Conservative TAKEOVER on Facebook

Login to CHQ

Register to become a ConservativeHQ.com member - click here. If you are already a member, please log-in by clicking here.

ConservativeHQ.com Officers: Richard A. Viguerie - Chairman

Editor:
George Rasley
Writers:
Mark Fitzgibbons
Ben Hart
George Rasley
Richard A. Viguerie

ConservativeHQ.com is the online news source for conservatives and Tea Partiers committed to bringing limited government constitutional conservatives to power.

  • Copyright © 2017 ConservativeHQ.com, Inc. To view our privacy policy, click here
", + "plain_text": [ + {"text": "Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com"}, + {"text": "* Login, * New to CHQ?,"}, +diff --git a/tests/data/davidwolfe.com-1_simple_article_from_full_page.json b/tests/data/davidwolfe.com-1_simple_article_from_full_page.json +index 09c48c5..854075d 100644 +--- a/tests/data/davidwolfe.com-1_simple_article_from_full_page.json ++++ b/tests/data/davidwolfe.com-1_simple_article_from_full_page.json +@@ -2,8 +2,8 @@ + "title": "New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication", + "byline": null, + "date": "2018-02-19T09:53:28", +- "content": "
<p>Medication: The Thread That Links Mass Shooters Together</p>
  • Menu
  • Skip to primary navigation
  • Skip to secondary navigation
  • Skip to content
  • Skip to primary sidebar

Natural Remedies, Treatment and Health

header-right

  • Join The Inner Circle
  • Contact
  • SHOP
  • Search
  • Health
  • Conditions
  • Natural Remedies
  • Essential Oils
  • Recipes
  • News

Main navigation

Home » New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

Feb 19, 2018 Ricky Raps Leave a Comment

Share
Tweet
Pin
+1
Share
3K Shares

What do nearly all mass shooters have in common since this recent spike in shootings? Most if not nearly all of them were prescribed some type of psychiatric medication. The world has recently been shaken to its core by the mass shooting in Parkland, Florida. According to the Sun Sentinel, Nikolas Cruz was being treated for multiple psychiatric disorders and was on medication.

The Sun Sentinel is reporting on Nikolas Cruz’s psychiatric history:

His mother, Lynda Cruz, told investigators that her son had been diagnosed with autism and attention deficit hyperactivity disorder. He was being treated for depression, had a behavioral disorder and had been taking medication for the ADHD, the report said. Investigators wrote that they did not know whether he was still taking the medication.

We're now learning that Nikolas Cruz had a history of violent behavior and in some instances a counselor prescribed him medication. Psychiatrist Dr. Erik Fisher explains how to identify signs of mental illness. https://t.co/DHBDZ2PWSe

— HLN Weekend Express (@WeekendExp) February 17, 2018

Nikolas Cruz isn’t the only mass shooter who was prescribed psychotropic medication. Sadly, one thing school shooters all seem to have in common is that they were given psychiatric medications.

CBS reports that Adam Lanza, the Sandy Hook Elementary School shooter, was prescribed medication that led to even more problems...

Documents released by police in December 2013 included descriptions of sporadic treatment for his mental health troubles. At one point, experts at the Yale Child Studies Center prescribed antidepressant/anti-anxiety medication, but his mother discontinued the treatment after her son was unable to raise his arm after taking the medicine and never scheduled follow-up visits, police reports said.

This trend isn’t new, with CNN reporting in 1999 about the Columbine shooter Eric Harris’ relationship with anti-depressants...

Reports surfaced Wednesday that one of the gunmen in the Littleton, Colorado, school shooting, Eric Harris, was rejected by Marine Corps recruiters days before the Columbine High School massacre because he was under a doctor’s care and had been prescribed an anti-depressant medication.

Harris’ prescription was for Luvox, an anti-depressant medication commonly used to treat patients with obsessive-compulsive disorder.

Mass shooters of every age have been found to have traces of psychiatric medication in their blood...

This trend is not exclusive to just school shooters. CNN reports that an autopsy on the Las Vegas Shooter, Stephen Paddock, showed that there was anti-anxiety medication in his system when he massacred 58 innocent people and injured over 850 others.

Stephen Paddock was reportedly prescribed anti-anxiety medication this past summer https://t.co/ZSDfwHskhg

— New York Post (@nypost) October 4, 2017

Reuters has previously reported that Pulse Nightclub shooter Omar Mateen would stay up all night researching psychiatric medication. One acquaintance told Reuters that Mateen was “obsessed” with looking up the medication online. The obsession only intensified in the weeks prior to the shooting.

Fort Hood gunman Ivan Lopez was on a “cocktail of prescription drugs,” according to The Telegraph. The article goes on to explain that the soldier had been prescribed anti-depressants along with the sleeping medication Ambien.

According to a CNN report, James Holmes who was responsible for the Aurora, Colorado movie theater shooting was prescribed multiple medications including Clonazepam and Sertraline.

BBC spoke with Professor David Healy about the Aurora movie theater shootings, and he believes the connection between the medication and mass killings is no coincidence...

These killings would never have happened had it not been for the medication James Holmes had been prescribed.”

Professor Peter Tyrer told the BBC that the medications James Holmes was prescribed could have exacerbated his condition...

His symptoms were exactly right for giving sertraline. But with his underlying personality, with that sort of person. Some of the underlying predispositions can come out more strongly. In the case of Holmes these were very dangerous indeed.

The list goes on and on...

Myron May, who went on a shooting spree at Florida State University’s Strozier Liberary in 2014 was reportedly on a combination of Wellbutrin and Vyvanse.

University of Texas student Kendrex J. White was reportedly on Zoloft when he went on a stabbing spree on campus that killed one person and injured three last year.

Aaron Ybarra who went on a rampage with a shotgun at Seattle Pacific University in 2014 was reportedly on “a lot of medication” which included Risperdal and Prozac. Ybarra claimed he could hear the voice of Eric Harris, the Columbine shooter who was prescribed similar medication.

12-year-old Jose Reyes who went on a shooting spree at his middle school was reportedly prescribed a generic form of Prozac by his local psychotherapist before taking a 9mm handgun to school and using it to kill his teacher and wound two others before taking his own life.

The Washington Post also reported that the Navy Yard shooter Aaron Alexis was prescribed the antidepressant Trazodone before he went on to shoot 12 people to death at the Washington Navy Yard.

A vast majority if not all of the recent mass shooters have taken these medications. Still, the medical community claims that there is no evidence to connect homicidal behavior and these drugs. Doctors and pharmaceutical companies continue to claim that these medications are safe to use. However, many are questioning the spike in deadly shootings and the increase in psychiatric drug use.

Sources: Sun Sentinel. CNN, CBS, CNN, CNN. Reuters, The Telegraph, BBC, Tampa Bay Times, KXAN, Seattle Times, USA Today

Share
Tweet
Pin
+1
Share
3K Shares

Category: News

« The Top 13 Superfoods You Should Start Eating Today!
7 White Tea Benefits & Uses »

You Might Also Like

  • Obsessive Compulsive Disorder (OCD) Treatment: 3 Steps To Relieve Symptoms

    Approximately 1 in 40 adults in the United...

  • Schools Now Offer Bullet Proof Backpacks Following Multiple Mass Shootings

    In the wake of terrorist attacks across America,...

  • New Research Reveals 46% Of Americans Have This Dangerous Health Condition

    Thanks to a new hypertension treatment guideline, 30 million...

  • CONFIRMED: Las Vegas Shooter Was On Medications Linked To Aggressive Behavior

    It has just been revealed that the Las...

  • #PharmaControlNow: Researchers Reveal The 1 Link Between Most Mass Shooters

    Within half a day of the tragic Las...

  • Binge Eating Disorder Causes & 5 Natural Treatments

    While binge eating disorder is severely dangerous, there...

About Ricky Raps

Florida based journalist and political activist. Ricky is a senior at Florida State University studying Political Science, Communication, Emergency Management, and US Intelligence Policy. Ricky grew up in New England and is a fan of the Patriots.

Reader Interactions

Leave a Reply Cancel reply

You must be logged in to post a comment.

Copyright © 2018 DavidWolfe.com · All Rights Reserved ·

", +- "plain_content": "
<p>Medication: The Thread That Links Mass Shooters Together</p>
  • Menu
  • Skip to primary navigation
  • Skip to secondary navigation
  • Skip to content
  • Skip to primary sidebar

Natural Remedies, Treatment and Health

header-right

  • Join The Inner Circle
  • Contact
  • SHOP
  • Search
  • Health
  • Conditions
  • Natural Remedies
  • Essential Oils
  • Recipes
  • News

Main navigation

Home » New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

Feb 19, 2018 Ricky Raps Leave a Comment

Share
Tweet
Pin
+1
Share
3K Shares

What do nearly all mass shooters have in common since this recent spike in shootings? Most if not nearly all of them were prescribed some type of psychiatric medication. The world has recently been shaken to its core by the mass shooting in Parkland, Florida. According to the Sun Sentinel, Nikolas Cruz was being treated for multiple psychiatric disorders and was on medication.

The Sun Sentinel is reporting on Nikolas Cruz’s psychiatric history:

His mother, Lynda Cruz, told investigators that her son had been diagnosed with autism and attention deficit hyperactivity disorder. He was being treated for depression, had a behavioral disorder and had been taking medication for the ADHD, the report said. Investigators wrote that they did not know whether he was still taking the medication.

We're now learning that Nikolas Cruz had a history of violent behavior and in some instances a counselor prescribed him medication. Psychiatrist Dr. Erik Fisher explains how to identify signs of mental illness. https://t.co/DHBDZ2PWSe

— HLN Weekend Express (@WeekendExp) February 17, 2018

Nikolas Cruz isn’t the only mass shooter who was prescribed psychotropic medication. Sadly, one thing school shooters all seem to have in common is that they were given psychiatric medications.

CBS reports that Adam Lanza, the Sandy Hook Elementary School shooter, was prescribed medication that led to even more problems...

Documents released by police in December 2013 included descriptions of sporadic treatment for his mental health troubles. At one point, experts at the Yale Child Studies Center prescribed antidepressant/anti-anxiety medication, but his mother discontinued the treatment after her son was unable to raise his arm after taking the medicine and never scheduled follow-up visits, police reports said.

This trend isn’t new, with CNN reporting in 1999 about the Columbine shooter Eric Harris’ relationship with anti-depressants...

Reports surfaced Wednesday that one of the gunmen in the Littleton, Colorado, school shooting, Eric Harris, was rejected by Marine Corps recruiters days before the Columbine High School massacre because he was under a doctor’s care and had been prescribed an anti-depressant medication.

Harris’ prescription was for Luvox, an anti-depressant medication commonly used to treat patients with obsessive-compulsive disorder.

Mass shooters of every age have been found to have traces of psychiatric medication in their blood...

This trend is not exclusive to just school shooters. CNN reports that an autopsy on the Las Vegas Shooter, Stephen Paddock, showed that there was anti-anxiety medication in his system when he massacred 58 innocent people and injured over 850 others.

Stephen Paddock was reportedly prescribed anti-anxiety medication this past summer https://t.co/ZSDfwHskhg

— New York Post (@nypost) October 4, 2017

Reuters has previously reported that Pulse Nightclub shooter Omar Mateen would stay up all night researching psychiatric medication. One acquaintance told Reuters that Mateen was “obsessed” with looking up the medication online. The obsession only intensified in the weeks prior to the shooting.

Fort Hood gunman Ivan Lopez was on a “cocktail of prescription drugs,” according to The Telegraph. The article goes on to explain that the soldier had been prescribed anti-depressants along with the sleeping medication Ambien.

According to a CNN report, James Holmes who was responsible for the Aurora, Colorado movie theater shooting was prescribed multiple medications including Clonazepam and Sertraline.

BBC spoke with Professor David Healy about the Aurora movie theater shootings, and he believes the connection between the medication and mass killings is no coincidence...

These killings would never have happened had it not been for the medication James Holmes had been prescribed.”

Professor Peter Tyrer told the BBC that the medications James Holmes was prescribed could have exacerbated his condition...

His symptoms were exactly right for giving sertraline. But with his underlying personality, with that sort of person. Some of the underlying predispositions can come out more strongly. In the case of Holmes these were very dangerous indeed.

The list goes on and on...

Myron May, who went on a shooting spree at Florida State University’s Strozier Liberary in 2014 was reportedly on a combination of Wellbutrin and Vyvanse.

University of Texas student Kendrex J. White was reportedly on Zoloft when he went on a stabbing spree on campus that killed one person and injured three last year.

Aaron Ybarra who went on a rampage with a shotgun at Seattle Pacific University in 2014 was reportedly on “a lot of medication” which included Risperdal and Prozac. Ybarra claimed he could hear the voice of Eric Harris, the Columbine shooter who was prescribed similar medication.

12-year-old Jose Reyes who went on a shooting spree at his middle school was reportedly prescribed a generic form of Prozac by his local psychotherapist before taking a 9mm handgun to school and using it to kill his teacher and wound two others before taking his own life.

The Washington Post also reported that the Navy Yard shooter Aaron Alexis was prescribed the antidepressant Trazodone before he went on to shoot 12 people to death at the Washington Navy Yard.

A vast majority if not all of the recent mass shooters have taken these medications. Still, the medical community claims that there is no evidence to connect homicidal behavior and these drugs. Doctors and pharmaceutical companies continue to claim that these medications are safe to use. However, many are questioning the spike in deadly shootings and the increase in psychiatric drug use.

Sources: Sun Sentinel. CNN, CBS, CNN, CNN. Reuters, The Telegraph, BBC, Tampa Bay Times, KXAN, Seattle Times, USA Today

Share
Tweet
Pin
+1
Share
3K Shares

Category: News

« The Top 13 Superfoods You Should Start Eating Today!
7 White Tea Benefits & Uses »

You Might Also Like

  • Obsessive Compulsive Disorder (OCD) Treatment: 3 Steps To Relieve SymptomsApproximately 1 in 40 adults in the United...
  • Schools Now Offer Bullet Proof Backpacks Following Multiple Mass ShootingsIn the wake of terrorist attacks across America,...
  • New Research Reveals 46% Of Americans Have This Dangerous Health ConditionThanks to a new hypertension treatment guideline, 30 million...
  • CONFIRMED: Las Vegas Shooter Was On Medications Linked To Aggressive BehaviorIt has just been revealed that the Las...
  • #PharmaControlNow: Researchers Reveal The 1 Link Between Most Mass ShootersWithin half a day of the tragic Las...
  • Binge Eating Disorder Causes & 5 Natural TreatmentsWhile binge eating disorder is severely dangerous, there...

About Ricky Raps

Florida based journalist and political activist. Ricky is a senior at Florida State University studying Political Science, Communication, Emergency Management, and US Intelligence Policy. Ricky grew up in New England and is a fan of the Patriots.

Reader Interactions

Leave a Reply Cancel reply

You must be logged in to post a comment.

Copyright © 2018 DavidWolfe.com · All Rights Reserved ·

", ++ "content": "
Medication: The Thread That Links Mass Shooters Together
  • Menu
  • Skip to primary navigation
  • Skip to secondary navigation
  • Skip to content
  • Skip to primary sidebar

Natural Remedies, Treatment and Health

header-right

  • Join The Inner Circle
  • Contact
  • SHOP
  • Search
  • Health
  • Conditions
  • Natural Remedies
  • Essential Oils
  • Recipes
  • News

Main navigation

Home » New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

Feb 19, 2018 Ricky Raps Leave a Comment

Share
Tweet
Pin
+1
Share
3K Shares

What do nearly all mass shooters have in common since this recent spike in shootings? Most if not nearly all of them were prescribed some type of psychiatric medication. The world has recently been shaken to its core by the mass shooting in Parkland, Florida. According to the Sun Sentinel, Nikolas Cruz was being treated for multiple psychiatric disorders and was on medication.

The Sun Sentinel is reporting on Nikolas Cruz’s psychiatric history:

His mother, Lynda Cruz, told investigators that her son had been diagnosed with autism and attention deficit hyperactivity disorder. He was being treated for depression, had a behavioral disorder and had been taking medication for the ADHD, the report said. Investigators wrote that they did not know whether he was still taking the medication.

We're now learning that Nikolas Cruz had a history of violent behavior and in some instances a counselor prescribed him medication. Psychiatrist Dr. Erik Fisher explains how to identify signs of mental illness. https://t.co/DHBDZ2PWSe

— HLN Weekend Express (@WeekendExp) February 17, 2018

Nikolas Cruz isn’t the only mass shooter who was prescribed psychotropic medication. Sadly, one thing school shooters all seem to have in common is that they were given psychiatric medications.

CBS reports that Adam Lanza, the Sandy Hook Elementary School shooter, was prescribed medication that led to even more problems...

Documents released by police in December 2013 included descriptions of sporadic treatment for his mental health troubles. At one point, experts at the Yale Child Studies Center prescribed antidepressant/anti-anxiety medication, but his mother discontinued the treatment after her son was unable to raise his arm after taking the medicine and never scheduled follow-up visits, police reports said.

This trend isn’t new, with CNN reporting in 1999 about the Columbine shooter Eric Harris’ relationship with anti-depressants...

Reports surfaced Wednesday that one of the gunmen in the Littleton, Colorado, school shooting, Eric Harris, was rejected by Marine Corps recruiters days before the Columbine High School massacre because he was under a doctor’s care and had been prescribed an anti-depressant medication.

Harris’ prescription was for Luvox, an anti-depressant medication commonly used to treat patients with obsessive-compulsive disorder.

Mass shooters of every age have been found to have traces of psychiatric medication in their blood...

This trend is not exclusive to just school shooters. CNN reports that an autopsy on the Las Vegas Shooter, Stephen Paddock, showed that there was anti-anxiety medication in his system when he massacred 58 innocent people and injured over 850 others.

Stephen Paddock was reportedly prescribed anti-anxiety medication this past summer https://t.co/ZSDfwHskhg

— New York Post (@nypost) October 4, 2017

Reuters has previously reported that Pulse Nightclub shooter Omar Mateen would stay up all night researching psychiatric medication. One acquaintance told Reuters that Mateen was “obsessed” with looking up the medication online. The obsession only intensified in the weeks prior to the shooting.

Fort Hood gunman Ivan Lopez was on a “cocktail of prescription drugs,” according to The Telegraph. The article goes on to explain that the soldier had been prescribed anti-depressants along with the sleeping medication Ambien.

According to a CNN report, James Holmes who was responsible for the Aurora, Colorado movie theater shooting was prescribed multiple medications including Clonazepam and Sertraline.

BBC spoke with Professor David Healy about the Aurora movie theater shootings, and he believes the connection between the medication and mass killings is no coincidence...

These killings would never have happened had it not been for the medication James Holmes had been prescribed.”

Professor Peter Tyrer told the BBC that the medications James Holmes was prescribed could have exacerbated his condition...

His symptoms were exactly right for giving sertraline. But with his underlying personality, with that sort of person. Some of the underlying predispositions can come out more strongly. In the case of Holmes these were very dangerous indeed.

The list goes on and on...

Myron May, who went on a shooting spree at Florida State University’s Strozier Liberary in 2014 was reportedly on a combination of Wellbutrin and Vyvanse.

University of Texas student Kendrex J. White was reportedly on Zoloft when he went on a stabbing spree on campus that killed one person and injured three last year.

Aaron Ybarra who went on a rampage with a shotgun at Seattle Pacific University in 2014 was reportedly on “a lot of medication” which included Risperdal and Prozac. Ybarra claimed he could hear the voice of Eric Harris, the Columbine shooter who was prescribed similar medication.

12-year-old Jose Reyes who went on a shooting spree at his middle school was reportedly prescribed a generic form of Prozac by his local psychotherapist before taking a 9mm handgun to school and using it to kill his teacher and wound two others before taking his own life.

The Washington Post also reported that the Navy Yard shooter Aaron Alexis was prescribed the antidepressant Trazodone before he went on to shoot 12 people to death at the Washington Navy Yard.

A vast majority if not all of the recent mass shooters have taken these medications. Still, the medical community claims that there is no evidence to connect homicidal behavior and these drugs. Doctors and pharmaceutical companies continue to claim that these medications are safe to use. However, many are questioning the spike in deadly shootings and the increase in psychiatric drug use.

Sources: Sun Sentinel. CNN, CBS, CNN, CNN. Reuters, The Telegraph, BBC, Tampa Bay Times, KXAN, Seattle Times, USA Today

Share
Tweet
Pin
+1
Share
3K Shares

Category: News

« The Top 13 Superfoods You Should Start Eating Today!
7 White Tea Benefits & Uses »

You Might Also Like

  • Obsessive Compulsive Disorder (OCD) Treatment: 3 Steps To Relieve Symptoms

    Approximately 1 in 40 adults in the United...

  • Schools Now Offer Bullet Proof Backpacks Following Multiple Mass Shootings

    In the wake of terrorist attacks across America,...

  • New Research Reveals 46% Of Americans Have This Dangerous Health Condition

    Thanks to a new hypertension treatment guideline, 30 million...

  • CONFIRMED: Las Vegas Shooter Was On Medications Linked To Aggressive Behavior

    It has just been revealed that the Las...

  • #PharmaControlNow: Researchers Reveal The 1 Link Between Most Mass Shooters

    Within half a day of the tragic Las...

  • Binge Eating Disorder Causes & 5 Natural Treatments

    While binge eating disorder is severely dangerous, there...

About Ricky Raps

Florida based journalist and political activist. Ricky is a senior at Florida State University studying Political Science, Communication, Emergency Management, and US Intelligence Policy. Ricky grew up in New England and is a fan of the Patriots.

Reader Interactions

Leave a Reply Cancel reply

You must be logged in to post a comment.

Copyright © 2018 DavidWolfe.com · All Rights Reserved ·

", ++ "plain_content": "
Medication: The Thread That Links Mass Shooters Together
  • Menu
  • Skip to primary navigation
  • Skip to secondary navigation
  • Skip to content
  • Skip to primary sidebar

Natural Remedies, Treatment and Health

header-right

  • Join The Inner Circle
  • Contact
  • SHOP
  • Search
  • Health
  • Conditions
  • Natural Remedies
  • Essential Oils
  • Recipes
  • News

Main navigation

Home » New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

Feb 19, 2018 Ricky Raps Leave a Comment

Share
Tweet
Pin
+1
Share
3K Shares

What do nearly all mass shooters have in common since this recent spike in shootings? Most if not nearly all of them were prescribed some type of psychiatric medication. The world has recently been shaken to its core by the mass shooting in Parkland, Florida. According to the Sun Sentinel, Nikolas Cruz was being treated for multiple psychiatric disorders and was on medication.

The Sun Sentinel is reporting on Nikolas Cruz’s psychiatric history:

His mother, Lynda Cruz, told investigators that her son had been diagnosed with autism and attention deficit hyperactivity disorder. He was being treated for depression, had a behavioral disorder and had been taking medication for the ADHD, the report said. Investigators wrote that they did not know whether he was still taking the medication.

We're now learning that Nikolas Cruz had a history of violent behavior and in some instances a counselor prescribed him medication. Psychiatrist Dr. Erik Fisher explains how to identify signs of mental illness. https://t.co/DHBDZ2PWSe

— HLN Weekend Express (@WeekendExp) February 17, 2018

Nikolas Cruz isn’t the only mass shooter who was prescribed psychotropic medication. Sadly, one thing school shooters all seem to have in common is that they were given psychiatric medications.

CBS reports that Adam Lanza, the Sandy Hook Elementary School shooter, was prescribed medication that led to even more problems...

Documents released by police in December 2013 included descriptions of sporadic treatment for his mental health troubles. At one point, experts at the Yale Child Studies Center prescribed antidepressant/anti-anxiety medication, but his mother discontinued the treatment after her son was unable to raise his arm after taking the medicine and never scheduled follow-up visits, police reports said.

This trend isn’t new, with CNN reporting in 1999 about the Columbine shooter Eric Harris’ relationship with anti-depressants...

Reports surfaced Wednesday that one of the gunmen in the Littleton, Colorado, school shooting, Eric Harris, was rejected by Marine Corps recruiters days before the Columbine High School massacre because he was under a doctor’s care and had been prescribed an anti-depressant medication.

Harris’ prescription was for Luvox, an anti-depressant medication commonly used to treat patients with obsessive-compulsive disorder.

Mass shooters of every age have been found to have traces of psychiatric medication in their blood...

This trend is not exclusive to just school shooters. CNN reports that an autopsy on the Las Vegas Shooter, Stephen Paddock, showed that there was anti-anxiety medication in his system when he massacred 58 innocent people and injured over 850 others.

Stephen Paddock was reportedly prescribed anti-anxiety medication this past summer https://t.co/ZSDfwHskhg

— New York Post (@nypost) October 4, 2017

Reuters has previously reported that Pulse Nightclub shooter Omar Mateen would stay up all night researching psychiatric medication. One acquaintance told Reuters that Mateen was “obsessed” with looking up the medication online. The obsession only intensified in the weeks prior to the shooting.

Fort Hood gunman Ivan Lopez was on a “cocktail of prescription drugs,” according to The Telegraph. The article goes on to explain that the soldier had been prescribed anti-depressants along with the sleeping medication Ambien.

According to a CNN report, James Holmes who was responsible for the Aurora, Colorado movie theater shooting was prescribed multiple medications including Clonazepam and Sertraline.

BBC spoke with Professor David Healy about the Aurora movie theater shootings, and he believes the connection between the medication and mass killings is no coincidence...

These killings would never have happened had it not been for the medication James Holmes had been prescribed.”

Professor Peter Tyrer told the BBC that the medications James Holmes was prescribed could have exacerbated his condition...

His symptoms were exactly right for giving sertraline. But with his underlying personality, with that sort of person. Some of the underlying predispositions can come out more strongly. In the case of Holmes these were very dangerous indeed.

The list goes on and on...

Myron May, who went on a shooting spree at Florida State University’s Strozier Liberary in 2014 was reportedly on a combination of Wellbutrin and Vyvanse.

University of Texas student Kendrex J. White was reportedly on Zoloft when he went on a stabbing spree on campus that killed one person and injured three last year.

Aaron Ybarra who went on a rampage with a shotgun at Seattle Pacific University in 2014 was reportedly on “a lot of medication” which included Risperdal and Prozac. Ybarra claimed he could hear the voice of Eric Harris, the Columbine shooter who was prescribed similar medication.

12-year-old Jose Reyes who went on a shooting spree at his middle school was reportedly prescribed a generic form of Prozac by his local psychotherapist before taking a 9mm handgun to school and using it to kill his teacher and wound two others before taking his own life.

The Washington Post also reported that the Navy Yard shooter Aaron Alexis was prescribed the antidepressant Trazodone before he went on to shoot 12 people to death at the Washington Navy Yard.

A vast majority if not all of the recent mass shooters have taken these medications. Still, the medical community claims that there is no evidence to connect homicidal behavior and these drugs. Doctors and pharmaceutical companies continue to claim that these medications are safe to use. However, many are questioning the spike in deadly shootings and the increase in psychiatric drug use.

Sources: Sun Sentinel. CNN, CBS, CNN, CNN. Reuters, The Telegraph, BBC, Tampa Bay Times, KXAN, Seattle Times, USA Today

Share
Tweet
Pin
+1
Share
3K Shares

Category: News

« The Top 13 Superfoods You Should Start Eating Today!
7 White Tea Benefits & Uses »

You Might Also Like

  • Obsessive Compulsive Disorder (OCD) Treatment: 3 Steps To Relieve SymptomsApproximately 1 in 40 adults in the United...
  • Schools Now Offer Bullet Proof Backpacks Following Multiple Mass ShootingsIn the wake of terrorist attacks across America,...
  • New Research Reveals 46% Of Americans Have This Dangerous Health ConditionThanks to a new hypertension treatment guideline, 30 million...
  • CONFIRMED: Las Vegas Shooter Was On Medications Linked To Aggressive BehaviorIt has just been revealed that the Las...
  • #PharmaControlNow: Researchers Reveal The 1 Link Between Most Mass ShootersWithin half a day of the tragic Las...
  • Binge Eating Disorder Causes & 5 Natural TreatmentsWhile binge eating disorder is severely dangerous, there...

About Ricky Raps

Florida based journalist and political activist. Ricky is a senior at Florida State University studying Political Science, Communication, Emergency Management, and US Intelligence Policy. Ricky grew up in New England and is a fan of the Patriots.

Reader Interactions

Leave a Reply Cancel reply

You must be logged in to post a comment.

", + "plain_text": [ + {"text": "Medication: The Thread That Links Mass Shooters Together"}, + {"text": "* Menu, * Skip to primary navigation, * Skip to secondary navigation, * Skip to content, * Skip to primary sidebar,"}, diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index e6d70e5dad6a..65e1c704cbb3 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "remarshal"; - version = "1.0.1"; # test with `nix-build pkgs/pkgs-lib/format` + version = "1.2.0"; # test with `nix-build pkgs/pkgs-lib/format` pyproject = true; src = fetchFromGitHub { owner = "dbohdan"; repo = "remarshal"; tag = "v${version}"; - hash = "sha256-7Gng/Oc9dwtWx4Xej6hf5IuUGM9/E9Hk9QTntqWk/Z0="; + hash = "sha256-y/odWWFJ7KDehYzUKSM/cprcCd+UaArEZFoYbtyW0Ok="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 26b108b0a3bd..28c8c1ab9a4d 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2025.7.0"; + version = "2025.9.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-qYr08ABWul+m8lt+sXScUMSBwYE7ZQDIhDPjTvRcGfk="; + hash = "sha256-QoO4pMAtrsgaJ1yUYHc+otG3eMpw67W8sS7B/H3AoJk="; }; build-system = [ diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index d064b3f477ac..82507b6b6623 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "securesystemslib"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "secure-systems-lab"; repo = "securesystemslib"; tag = "v${version}"; - hash = "sha256-XONgT0qE6SHgHULCnjI9JvqKN1SAnr/Xw/nfeGUwYjs="; + hash = "sha256-ERFRLNHD3OhbMEGBEnDLkRYGv4f+bYg9MStS5IarcPA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 54957ee4c74c..7937886192b2 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "west"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-kIoHrnzDNKiMsvBptDBITf392gw0ItFLniOkMDDPnMY="; + hash = "sha256-cIj+Dpr+Bxnr7pXFHFKRSfe8/JGdg6ggbTX6nGg+0KU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 3b5243f2190c..c8efa3b2f66c 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.65"; + version = "0.2.66"; pyproject = true; src = fetchFromGitHub { owner = "ranaroussi"; repo = "yfinance"; tag = version; - hash = "sha256-vc+oFjuo9JeK+pCdXKLG2wLGraBJZ+OYz2vOdySwLdU="; + hash = "sha256-v8K/mVNnun7ogBixaKAVYwSQgSrnnfvVw40/BeClCKY="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 5889a2270838..531ea7772604 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-jz9MFWkZBjiBu6jr1jp+bDpthB/OWE0pfrXhY5B08Jo="; + hash = "sha256-EpszwgYzobRA7LohtJJtgTefFAEmCXvcP3ilfsu+obo="; }; postPatch = '' diff --git a/pkgs/tools/misc/qt6ct/default.nix b/pkgs/tools/misc/qt6ct/default.nix index 5fb7301afd4e..25c2b67ddb63 100644 --- a/pkgs/tools/misc/qt6ct/default.nix +++ b/pkgs/tools/misc/qt6ct/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qt6ct"; - version = "0.10"; + version = "0.11"; src = fetchFromGitLab { domain = "www.opencode.net"; owner = "trialuser"; repo = "qt6ct"; tag = finalAttrs.version; - hash = "sha256-o2k/b4AGiblS1CkNInqNrlpM1Y7pydIJzEVgVd3ao50="; + hash = "sha256-aQmqLpM0vogMsYaDS9OeKVI3N53uY4NBC4FF10hK8Uw="; }; nativeBuildInputs = [ @@ -34,10 +34,9 @@ stdenv.mkDerivation (finalAttrs: { qtwayland ]; - postPatch = '' - substituteInPlace src/qt6ct-qtplugin/CMakeLists.txt src/qt6ct-style/CMakeLists.txt \ - --replace-fail "\''${PLUGINDIR}" "$out/${qtbase.qtPluginPrefix}" - ''; + cmakeFlags = [ + (lib.cmakeFeature "PLUGINDIR" "$out/${qtbase.qtPluginPrefix}") + ]; meta = { description = "Qt6 Configuration Tool"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 702c31d128a5..2b5f9dd61f5c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1054,6 +1054,7 @@ mapAliases { givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07 givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07 gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22 + glabels = throw "'glabels' has been removed because it is no longer maintained. Consider using 'glabels-qt', which is an active fork."; # Added 2025-09-16 glaxnimate = kdePackages.glaxnimate; # Added 2025-09-17 glew-egl = lib.warnOnInstantiate "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11 glfw-wayland = glfw; # Added 2024-04-19 @@ -1258,6 +1259,7 @@ mapAliases { kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 + kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17 keepkey_agent = keepkey-agent; # added 2024-01-06 @@ -1720,6 +1722,7 @@ mapAliases { mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23 moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30 moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30 + morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26 moz-phab = mozphab; # Added 2022-08-09 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 @@ -1994,6 +1997,7 @@ mapAliases { partition-manager = makePlasma5Throw "partitionmanager"; # Added 2024-01-08 patchelfStable = patchelf; # Added 2024-01-25 paup = paup-cli; # Added 2024-09-11 + pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23 pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29 pcsctools = pcsc-tools; # Added 2023-12-07 pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 @@ -2142,6 +2146,7 @@ mapAliases { protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18 protonup = protonup-ng; # Added 2022-11-06 protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 + proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25 proton-vpn-local-agent = lib.warnOnInstantiate "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'" ( python3Packages.toPythonApplication python3Packages.proton-vpn-local-agent ); # Added 2025-04-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fa142339d38..ed2d12f76086 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3794,10 +3794,6 @@ with pkgs; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; - parallel = callPackage ../tools/misc/parallel { }; - - parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { }; - parcellite = callPackage ../tools/misc/parcellite { }; patchutils = callPackage ../tools/text/patchutils { }; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index a6ea94c70478..b401629cda1b 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -129,6 +129,8 @@ let netflix = callPackage ../applications/video/kodi/addons/netflix { }; + plex-for-kodi = callPackage ../applications/video/kodi/addons/plex-for-kodi { }; + orftvthek = callPackage ../applications/video/kodi/addons/orftvthek { }; radioparadise = callPackage ../applications/video/kodi/addons/radioparadise { };