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

Merge staging-next into staging

parents d63b2728 e1e66e43
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -914,6 +914,21 @@ fetchFromRadicle {
}
```

## `fetchRadiclePatch` {#fetchradiclepatch}

`fetchRadiclePatch` works very similarly to `fetchFromRadicle` with almost the same arguments
expected. However, instead of a `rev` or `tag` argument, a `revision` argument is expected, which
contains the full revision id of the Radicle patch to fetch.

```nix
fetchRadiclePatch {
  seed = "rosa.radicle.xyz";
  repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5"; # radicle-explorer
  revision = "d97d872386c70607beda2fb3fc2e60449e0f4ce4"; # patch: d77e064
  hash = "sha256-ttnNqj0lhlSP6BGzEhhUOejKkkPruM9yMwA5p9Di4bk=";
}
```

## `requireFile` {#requirefile}

`requireFile` allows requesting files that cannot be fetched automatically, but whose content is known.
+3 −0
Original line number Diff line number Diff line
@@ -1675,6 +1675,9 @@
  "fetchfromradicle": [
    "index.html#fetchfromradicle"
  ],
  "fetchradiclepatch": [
    "index.html#fetchradiclepatch"
  ],
  "requirefile": [
    "index.html#requirefile"
  ],
+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ let
    "mips64-linux"
    "mips64el-linux"
    "mipsel-linux"
    "powerpc-linux"
    "powerpc64-linux"
    "powerpc64le-linux"
    "riscv32-linux"
+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ rec {
    };
  };

  ppc32 = {
    config = "powerpc-unknown-linux-gnu";
    rust.rustcTarget = "powerpc-unknown-linux-gnu";
  };

  sheevaplug = {
    config = "armv5tel-unknown-linux-gnueabi";
  }
+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ lib.runTests (
    ];
    testmmix = mseteq mmix [ "mmix-mmixware" ];
    testpower = mseteq power [
      "powerpc-linux"
      "powerpc-netbsd"
      "powerpc-none"
      "powerpc64-linux"
@@ -174,6 +175,7 @@ lib.runTests (
      "mips64-linux"
      "mips64el-linux"
      "mipsel-linux"
      "powerpc-linux"
      "powerpc64-linux"
      "powerpc64le-linux"
      "riscv32-linux"
Loading