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

Merge master into staging-nixos

parents a973689d 989fab7d

doc/languages-frameworks/python.section.md

+5 −6
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ sets are 


* `pkgs.python27Packages`

* `pkgs.python3Packages`

* `pkgs.python310Packages`

* `pkgs.python311Packages`

* `pkgs.python312Packages`

* `pkgs.python313Packages`
@@ -897,7 +896,7 @@ on NixOS. 
  # ...



  environment.systemPackages = with pkgs; [

    (python310.withPackages (

    (python314.withPackages (

      ps: with ps; [

        numpy

        toolz
@@ -1683,7 +1682,7 @@ with import <nixpkgs> { }; 
          });

        };

      in

      pkgs.python310.override { inherit packageOverrides; };

      pkgs.python313.override { inherit packageOverrides; };



  in

  python.withPackages (ps: [ ps.pandas ])
@@ -1707,7 +1706,7 @@ with import <nixpkgs> { }; 
  let

    packageOverrides = self: super: { scipy = super.scipy_0_17; };

  in

  (pkgs.python310.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])

  (pkgs.python313.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])

).env

```
@@ -1723,13 +1722,13 @@ let 
  newpkgs = import pkgs.path {

    overlays = [

      (self: super: {

        python310 =

        python313 =

          let

            packageOverrides = python-self: python-super: {

              numpy = python-super.numpy_1_18;

            };

          in

          super.python310.override { inherit packageOverrides; };

          super.python313.override { inherit packageOverrides; };

      })

    ];

  };

doc/packages/friction-graphics.section.md

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# Friction {#friction-graphics}



[Friction](https://friction.graphics/) is an open-source vector motion graphics application for creating animations for web and video platforms.



## Wayland support {#friction-graphics-wayland}



Upstream explicitly forces X11 (XCB) on Linux due to incomplete Wayland support (fullscreen does not work, some mouse interactions are broken).

This means the application runs under XWayland by default and does not respect compositor-level HiDPI scaling.



To enable native Wayland support, removing the forced X11 override:



```nix

friction-graphics.override { enableWayland = true; }

```

doc/packages/index.md

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ eclipse.section.md 
elm.section.md

emacs.section.md

firefox.section.md

friction-graphics.section.md

fish.section.md

fuse.section.md

geant4.section.md

doc/redirects.json

+6 −0
Original line number Diff line number Diff line
@@ -119,6 +119,12 @@ 
  "ex-testEqualArrayOrMap-test-function-add-cowbell": [

    "index.html#ex-testEqualArrayOrMap-test-function-add-cowbell"

  ],

  "friction-graphics": [

    "index.html#friction-graphics"

  ],

  "friction-graphics-wayland": [

    "index.html#friction-graphics-wayland"

  ],

  "ghc-deprecation-policy": [

    "index.html#ghc-deprecation-policy"

  ],

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

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ 
- `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4.

  Some existing OpenRGB plugins may be incompatible or require updates.



- the `neovim` wrapper sets provider-related configuration in its generated config rather than as wrapper arguments. It should not affect configuration unless you set `wrapRc` to false.



- We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables.



## Nixpkgs Library {#sec-nixpkgs-release-26.05-lib}