Unverified Commit 072095cb authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 5849522d d2c8d3db
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@

- Derivations setting both `separateDebugInfo` and one of `allowedReferences`, `allowedRequisites`, `disallowedReferences` or `disallowedRequisites` must now set `__structuredAttrs` to `true`. The effect of reference whitelisting or blacklisting will be disabled on the `debug` output created by `separateDebugInfo`.

- `k2pdfopt` has been removed, as it's broken.

- `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.

- `mx-puppet-discord` was removed from Nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree.
+1 −0
Original line number Diff line number Diff line
@@ -748,6 +748,7 @@ in
  invoiceplane = runTest ./invoiceplane.nix;
  iodine = runTest ./iodine.nix;
  iosched = runTest ./iosched.nix;
  ipget = runTest ./ipget.nix;
  ipv6 = runTest ./ipv6.nix;
  iscsi-multipath-root = runTest ./iscsi-multipath-root.nix;
  iscsi-root = runTest ./iscsi-root.nix;

nixos/tests/ipget.nix

0 → 100644
+28 −0
Original line number Diff line number Diff line
{ lib, ... }:
{
  name = "ipget";
  meta.maintainers = with lib.maintainers; [
    Luflosi
  ];

  nodes.machine =
    { config, pkgs, ... }:
    {
      services.kubo.enable = true;
      environment.systemPackages = with pkgs; [ ipget ];
    };

  testScript = ''
    start_all()

    with subtest("Add file to IPFS"):
        ipfs_hash = machine.succeed(
            "echo -n fnord | ipfs add --quieter"
        )

    with subtest("Download the file with ipget"):
        machine.succeed(f"ipget --output file.txt /ipfs/{ipfs_hash}")
        contents = machine.succeed("cat file.txt")
        assert contents == "fnord", f"Unexpected file contents: {contents}"
  '';
}
+5 −5
Original line number Diff line number Diff line
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
      sources = {
        "x86_64-linux" = {
          arch = "linux-x64";
          hash = "sha256-xk2maMEa07yFPbLiDGc9N6AbzxjTyfVNy/k7wWSMOHE=";
          hash = "sha256-Ti/gMp0VFLwuvRlgUSQFP3WTDEhoXJZj5ebYiuIFmN0=";
        };
        "x86_64-darwin" = {
          arch = "darwin-x64";
          hash = "sha256-vcN419nPIrFOT8EaznFzThst6exfMGRrcmxyuQttxXg=";
          hash = "sha256-I2DgC3r3okpzx5QvGY/b5DNrUThBD4kGRM93QT1A6RM=";
        };
        "aarch64-linux" = {
          arch = "linux-arm64";
          hash = "sha256-WoBfg35mGTIA8YZEk67iYNinF+Q/XEatiVr6x1HdvBk=";
          hash = "sha256-Hkf5QMp0Gi0eXhENZD8J8SEST4EDcefdMaF2/HZeBp8=";
        };
        "aarch64-darwin" = {
          arch = "darwin-arm64";
          hash = "sha256-e75eRgs0FTBnwFbH1vFxFc+aLK+O9TdxgXbV5YnsQLE=";
          hash = "sha256-evTcY9wXvvoHKeVmueBfOXCMb3dsQioQc/cmXON2D7M=";
        };
      };
    in
    {
      name = "continue";
      publisher = "Continue";
      version = "1.2.2";
      version = "1.2.4";
    }
    // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+3 −3
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@
}:
mkLibretroCore {
  core = "play";
  version = "0-unstable-2025-09-12";
  version = "0-unstable-2025-09-22";

  src = fetchFromGitHub {
    owner = "jpd002";
    repo = "Play-";
    rev = "19b3995e6d09d9cbd4de9871ad94ea183ca53a6e";
    hash = "sha256-6oZIZFnB2S7u4xxrOAfDPiql0biiXRMGD1iiPhFgCWc=";
    rev = "a3d84f977b721cda752299739fec525addce1ef9";
    hash = "sha256-NVuz52c0zt/c8b3uoJWpKO2TMM9PFh/thQt8CfRFZhk=";
    fetchSubmodules = true;
  };

Loading