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

Merge master into staging-next

parents bbcae394 a5345967

doc/build-helpers/fetchers.chapter.md

+18 −0
Original line number Diff line number Diff line
@@ -896,6 +896,24 @@ If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit` 
or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`,

respectively. Otherwise, the fetcher uses `fetchzip`.



## `fetchFromRadicle` {#fetchfromradicle}



This is used with Radicle repositories. The arguments expected are similar to `fetchgit`.



Requires a `seed` argument (e.g. `seed.radicle.xyz` or `rosa.radicle.xyz`) and a `repo` argument

(the repository id *without* the `rad:` prefix). Also accepts an optional `node` argument which

contains the id of the node from which to fetch the specified ref. If `node` is `null` (the

default), a canonical ref is fetched instead.



```nix

fetchFromRadicle {

  seed = "seed.radicle.xyz";

  repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; # heartwood

  tag = "releases/1.3.0";

  hash = "sha256-4o88BWKGGOjCIQy7anvzbA/kPOO+ZsLMzXJhE61odjw=";

}

```



## `requireFile` {#requirefile}



`requireFile` allows requesting files that cannot be fetched automatically, but whose content is known.

doc/redirects.json

+3 −0
Original line number Diff line number Diff line
@@ -1666,6 +1666,9 @@ 
  "fetchfromsourcehut": [

    "index.html#fetchfromsourcehut"

  ],

  "fetchfromradicle": [

    "index.html#fetchfromradicle"

  ],

  "requirefile": [

    "index.html#requirefile"

  ],

pkgs/applications/emulators/libretro/cores/puae.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkLibretroCore {

  core = "puae";

  version = "0-unstable-2025-07-20";

  version = "0-unstable-2025-08-19";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "libretro-uae";

    rev = "3fc66ee4b562910a17e2e2f3bad74572a8bcc134";

    hash = "sha256-rCdrM4511Q0OFwCsHZpYtg/4J1A4hwDc5WjwY0HDj8k=";

    rev = "9e2aa770a9b6b0a4e1f4fc05eb0db6c8e7aba8ee";

    hash = "sha256-YTS0OgYJCGawpsDHvU79dDA+iePna5Fcab2Le3vdVSk=";

  };



  makefile = "Makefile";

pkgs/build-support/fetchradicle/default.nix

0 → 100644
+44 −0
Original line number Diff line number Diff line 
{ lib, fetchgit }:



lib.makeOverridable (

  {

    seed,

    repo,

    node ? null,

    rev ? null,

    tag ? null,

    ...

  }@args:



  assert lib.assertMsg (lib.xor (tag != null) (

    rev != null

  )) "fetchFromRadicle requires one of either `rev` or `tag` to be provided (not both).";



  let

    namespacePrefix = lib.optionalString (node != null) "refs/namespaces/${node}/";

    rev' = if tag != null then "refs/tags/${tag}" else rev;

  in



  fetchgit (

    {

      url = "https://${seed}/${repo}.git";

      rev = "${namespacePrefix}${rev'}";

    }

    // removeAttrs args [

      "seed"

      "repo"

      "node"

      "rev"

      "tag"

    ]

  )

  // {

    inherit

      seed

      repo

      node

      rev

      tag

      ;

  }

)

pkgs/by-name/es/esptool/package.nix

+13 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ python3Packages.buildPythonApplication rec { 
    hsm = [ python-pkcs11 ];

  };



  postInstall = ''

    rm -v $out/bin/*.py

  '';



  nativeCheckInputs =

    with python3Packages;

    [
@@ -62,6 +66,15 @@ python3Packages.buildPythonApplication rec { 
    "host_test"

  ];



  disabledTests = [

    # remove the deprecated .py entrypoints, because our wrapper tries to

    # import esptool and finds esptool.py in $out/bin, which breaks.

    "test_esptool_py"

    "test_espefuse_py"

    "test_espsecure_py"

    "test_esp_rfc2217_server_py"

  ];



  postCheck = ''

    export SOFTHSM2_CONF=$(mktemp)

    echo "directories.tokendir = $(mktemp -d)" > "$SOFTHSM2_CONF"