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

Merge staging-next into staging

parents ca520f49 4c3f76ee

.github/workflows/periodic-merge.yml

+1 −1
Original line number Diff line number Diff line
@@ -65,5 +65,5 @@ jobs: 
        with:

          issue-number: 105153

          body: |

            Periodic merge from `${{ inputs.from }}` into `${{ inputs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).

            Periodic merge from `${{ inputs.from }}` into `[${{ inputs.into }}](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }})` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).

          token: ${{ steps.app-token.outputs.token }}

ci/eval/compare/maintainers.nix

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ let 
  # Extract attributes that changed from by-name paths.

  # This allows pinging reviewers for pure refactors.

  touchedattrs = lib.pipe changedpaths [

    (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed))

    (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed && changed != "pkgs/by-name/README.md"))

    (map (lib.splitString "/"))

    (map (path: lib.elemAt path 3))

    lib.unique

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ 


- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.



- `mercure` has been update to `0.21.4` (or later). Version [0.21.0](https://github.com/dunglas/mercure/releases/v0.21.0) and [0.21.2](https://github.com/dunglas/mercure/releases/tag/v0.21.2) introduce breaking changes to the package.



- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.



- `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).

lib/default.nix

+19 −2
Original line number Diff line number Diff line
@@ -105,12 +105,14 @@ let 
      # network

      network = callLibs ./network;



      # flakes

      flakes = callLibs ./flakes.nix;



      inherit (builtins)

        getContext

        hasContext

        convertHash

        hashString

        hasFile

        parseDrvName

        placeholder

        fromJSON
@@ -391,6 +393,8 @@ let 
        toInt

        toIntBase10

        fileContents

        appendContext

        unsafeDiscardStringContext

        ;

      inherit (self.stringsWithDeps)

        textClosureList
@@ -415,7 +419,13 @@ let 
        renameCrossIndexTo

        mapCrossIndex

        ;

      inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate;

      inherit (self.derivations)

        lazyDerivation

        optionalDrvAttr

        warnOnInstantiate

        addDrvOutputDependencies

        unsafeDiscardOutputDependency

        ;

      inherit (self.generators) mkLuaInline;

      inherit (self.meta)

        addMetaAttrs
@@ -443,6 +453,9 @@ let 
        dirOf

        isPath

        packagesFromDirectoryRecursive

        hashFile

        readDir

        readFileType

        ;

      inherit (self.sources)

        cleanSourceFilter
@@ -593,6 +606,10 @@ let 
      inherit (self.network.ipv6)

        mkEUI64Suffix

        ;

      inherit (self.flakes)

        parseFlakeRef

        flakeRefToString

        ;

    }

  );

in

lib/derivations.nix

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ let 
    if pkg ? meta.position && isString pkg.meta.position then "${prefix}${pkg.meta.position}" else "";

in

{

  inherit (builtins)

    addDrvOutputDependencies

    unsafeDiscardOutputDependency

    ;



  /**

    Restrict a derivation to a predictable set of attribute names, so

    that the returned attrset is not strict in the actual derivation,