commit ffc8f1707b32c29aabb751b66d79762ece6b1f10 · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/release-notes/rl-2311.section.md

···

       925
       925
        
         [services.frp](#opt-services.frp.enable).

     

       926
       926
        
       

     

       927
       927
        
       - [river](https://github.com/riverwm/river), A dynamic tiling wayland

     

       928
       928
       -
         compositor. Available as [programs.river](#opt-programs.river.enable).

     

       928
       928
       +
         compositor. Available as `programs.river`.

     

       929
       929
        
       

     

       930
       930
        
       - [wayfire](https://wayfire.org), a modular and extensible wayland compositor.

     

       931
       931
        
         Available as [programs.wayfire](#opt-programs.wayfire.enable).

+2

nixos/doc/manual/release-notes/rl-2511.section.md

···

       172
       172
        
       

     

       173
       173
        
       - NixOS display manager modules now strictly use tty1, where many of them previously used tty7. Options to configure display managers' VT have been dropped. A configuration with a display manager enabled will not start `getty@tty1.service`, even if the system is forced to boot into `multi-user.target` instead of `graphical.target`.

     

       174
       174
        
       

     

       175
       175
       +
       - `river` 0.3.x has been renamed to `river-classic` upstream, and the package renamed accordingly. `programs.river` has been renamed to `programs.river-classic`.

     

       176
       176
       +
       

     

       175
       177
        
       - `command-not-found` package is now disabled by default; it works only for nix-channels based systems, and requires setup for it to work.

     

       176
       178
        
       

     

       177
       179
        
       - The systemd target `kbrequest.target` is now unset by default, instead of being forcibly symlinked to `rescue.target`. In case you were relying on this behavior (Alt + ArrowUp on the tty causing the current target to be changed to `rescue.target`), you can restore it by setting `systemd.targets.rescue.aliases = [ "kbrequest.target" ];` in your configuration.

+20 -4

nixos/modules/programs/wayland/river.nix

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         cfg = config.programs.river;

     

       9
       9
       +
         cfg = config.programs.river-classic;

     

       10
       10
        
       

     

       11
       11
        
         wayland-lib = import ./lib.nix { inherit lib; };

     

       12
       12
        
       in

     

       13
       13
        
       {

     

       14
       14
       -
         options.programs.river = {

     

       15
       15
       -
           enable = lib.mkEnableOption "river, a dynamic tiling Wayland compositor";

     

       14
       14
       +
         options.programs.river-classic = {

     

       15
       15
       +
           enable = lib.mkEnableOption "river-classic, a dynamic tiling Wayland compositor";

     

       16
       16
        
       

     

       17
       17
        
           package =

     

       18
       18
       -
             lib.mkPackageOption pkgs "river" {

     

       18
       18
       +
             lib.mkPackageOption pkgs "river-classic" {

     

       19
       19
        
               nullable = true;

     

       20
       20
        
               extraDescription = ''

     

       21
       21
        
                 If the package is not overridable with `xwaylandSupport`, then the module option

     
···

       60
       60
        
             '';

     

       61
       61
        
           };

     

       62
       62
        
         };

     

       63
       63
       +
       

     

       64
       64
       +
         imports = [

     

       65
       65
       +
           (lib.mkRenamedOptionModule [ "programs" "river" "enable" ] [ "programs" "river-classic" "enable" ])

     

       66
       66
       +
           (lib.mkRenamedOptionModule

     

       67
       67
       +
             [ "programs" "river" "package" ]

     

       68
       68
       +
             [ "programs" "river-classic" "package" ]

     

       69
       69
       +
           )

     

       70
       70
       +
           (lib.mkRenamedOptionModule

     

       71
       71
       +
             [ "programs" "river" "xwayland" "enable" ]

     

       72
       72
       +
             [ "programs" "river-classic" "xwayland" "enable" ]

     

       73
       73
       +
           )

     

       74
       74
       +
           (lib.mkRenamedOptionModule

     

       75
       75
       +
             [ "programs" "river" "extraPackages" ]

     

       76
       76
       +
             [ "programs" "river-classic" "extraPackages" ]

     

       77
       77
       +
           )

     

       78
       78
       +
         ];

     

       63
       79
        
       

     

       64
       80
        
         config = lib.mkIf cfg.enable (

     

       65
       81
        
           lib.mkMerge [

+1 -1

nixos/tests/lemurs/lemurs-wayland.nix

···

       19
       19
        
       

     

       20
       20
        
             services.displayManager.lemurs.enable = true;

     

       21
       21
        
       

     

       22
       22
       -
             programs.river.enable = true;

     

       22
       22
       +
             programs.river-classic.enable = true;

     

       23
       23
        
           };

     

       24
       24
        
       

     

       25
       25
        
         testScript = ''

+2 -2

pkgs/by-name/ri/river-bedload/package.nix

···

       6
       6
        
         lib,

     

       7
       7
        
         pkg-config,

     

       8
       8
        
         stdenv,

     

       9
       9
       -
         river,

     

       9
       9
       +
         river-classic,

     

       10
       10
        
         wayland,

     

       11
       11
        
         wayland-protocols,

     

       12
       12
        
         wayland-scanner,

     
···

       53
       53
        
           license = lib.licenses.gpl3Only;

     

       54
       54
        
           maintainers = with lib.maintainers; [ adamcstephens ];

     

       55
       55
        
           mainProgram = "river-bedload";

     

       56
       56
       -
           inherit (river.meta) platforms;

     

       56
       56
       +
           inherit (river-classic.meta) platforms;

     

       57
       57
        
         };

     

       58
       58
        
       })

+12

pkgs/by-name/ri/river-classic/update.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -i bash -p bash common-updater-scripts gnused zon2nix

     

       3
       3
       +
       

     

       4
       4
       +
       latest_tag=$(list-git-tags --url=https://codeberg.org/river/river-classic | sed 's/^v//' | sort --version-sort | tail --lines=1)

     

       5
       5
       +
       

     

       6
       6
       +
       update-source-version river-classic "$latest_tag"

     

       7
       7
       +
       

     

       8
       8
       +
       wget "https://codeberg.org/river/river-classic/raw/tag/v${latest_tag}/build.zig.zon"

     

       9
       9
       +
       zon2nix build.zig.zon >pkgs/by-name/ri/river-classic/build.zig.zon.nix

     

       10
       10
       +
       nixfmt pkgs/by-name/ri/river-classic/build.zig.zon.nix

     

       11
       11
       +
       

     

       12
       12
       +
       rm -f build.zig.zon build.zig.zon.nix

pkgs/by-name/ri/river/build.zig.zon.nix pkgs/by-name/ri/river-classic/build.zig.zon.nix

+8 -13

pkgs/by-name/ri/river/package.nix pkgs/by-name/ri/river-classic/package.nix

···

       23
       23
        
       }:

     

       24
       24
        
       

     

       25
       25
        
       stdenv.mkDerivation (finalAttrs: {

     

       26
       26
       -
         pname = "river";

     

       26
       26
       +
         pname = "river-classic";

     

       27
       27
        
         version = "0.3.11";

     

       28
       28
        
       

     

       29
       29
        
         outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];

     
···

       31
       31
        
         src = fetchFromGitea {

     

       32
       32
        
           domain = "codeberg.org";

     

       33
       33
        
           owner = "river";

     

       34
       34
       -
           repo = "river";

     

       34
       34
       +
           repo = "river-classic";

     

       35
       35
        
           hash = "sha256-7LC5nxan9jmjjt29afkps9H/sfhfIqpvBxvCKb0zvNM=";

     

       36
       36
        
           tag = "v${finalAttrs.version}";

     

       37
       37
        
         };

     
···

       78
       78
        
         };

     

       79
       79
        
       

     

       80
       80
        
         meta = {

     

       81
       81
       -
           homepage = "https://codeberg.org/river/river";

     

       81
       81
       +
           homepage = "https://codeberg.org/river/river-classic";

     

       82
       82
        
           description = "Dynamic tiling wayland compositor";

     

       83
       83
        
           longDescription = ''

     

       84
       84
       -
             River is a dynamic tiling Wayland compositor with flexible runtime

     

       84
       84
       +
             river-classic is a dynamic tiling Wayland compositor with flexible runtime

     

       85
       85
        
             configuration.

     

       86
       86
        
       

     

       87
       87
       -
             Its design goals are:

     

       88
       88
       -
             - Simple and predictable behavior, river should be easy to use and have a

     

       89
       89
       -
               low cognitive load.

     

       90
       90
       -
             - Window management based on a stack of views and tags.

     

       91
       91
       -
             - Dynamic layouts generated by external, user-written executables. A

     

       92
       92
       -
               default rivertile layout generator is provided.

     

       93
       93
       -
             - Scriptable configuration and control through a custom Wayland protocol

     

       94
       94
       -
               and separate riverctl binary implementing it.

     

       87
       87
       +
             It is a fork of river 0.3 intended for users that are happy with how river 0.3

     

       88
       88
       +
             works and do not wish to deal with the majorly breaking changes planned for

     

       89
       89
       +
             the river 0.4.0 release.

     

       95
       90
        
           '';

     

       96
       96
       -
           changelog = "https://codeberg.org/river/river/releases/tag/v${finalAttrs.version}";

     

       91
       91
       +
           changelog = "https://codeberg.org/river/river-classic/releases/tag/v${finalAttrs.version}";

     

       97
       92
        
           license = lib.licenses.gpl3Plus;

     

       98
       93
        
           maintainers = with lib.maintainers; [

     

       99
       94
        
             adamcstephens

-12

pkgs/by-name/ri/river/update.sh

···

       1
       1
       -
       #!/usr/bin/env nix-shell

     

       2
       2
       -
       #!nix-shell -i bash -p bash common-updater-scripts gnused zon2nix

     

       3
       3
       -
       

     

       4
       4
       -
       latest_tag=$(list-git-tags --url=https://codeberg.org/river/river | sed 's/^v//' | sort --version-sort | tail --lines=1)

     

       5
       5
       -
       

     

       6
       6
       -
       update-source-version river "$latest_tag"

     

       7
       7
       -
       

     

       8
       8
       -
       wget "https://codeberg.org/river/river/raw/tag/v${latest_tag}/build.zig.zon"

     

       9
       9
       -
       zon2nix build.zig.zon >pkgs/by-name/ri/river/build.zig.zon.nix

     

       10
       10
       -
       nixfmt pkgs/by-name/ri/river/build.zig.zon.nix

     

       11
       11
       -
       

     

       12
       12
       -
       rm -f build.zig.zon build.zig.zon.nix

+2 -2

pkgs/by-name/ri/rivercarro/package.nix

···

       4
       4
        
         callPackage,

     

       5
       5
        
         fetchFromSourcehut,

     

       6
       6
        
         pkg-config,

     

       7
       7
       -
         river,

     

       7
       7
       +
         river-classic,

     

       8
       8
        
         wayland,

     

       9
       9
        
         wayland-protocols,

     

       10
       10
        
         wayland-scanner,

     
···

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     

       30
       30
        
           pkg-config

     

       31
       31
       -
           river

     

       31
       31
       +
           river-classic

     

       32
       32
        
           wayland

     

       33
       33
        
           wayland-protocols

     

       34
       34
        
           wayland-scanner

+1

pkgs/top-level/aliases.nix

···

       2048
       2048
        
         riko4 = throw "'riko4' has been removed as it was unmaintained, failed to build and dependend on outdated libraries"; # Added 2025-05-18

     

       2049
       2049
        
         rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25

     

       2050
       2050
        
         rippled-validator-keys-tool = throw "rippled-validator-keys-tool has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25

     

       2051
       2051
       +
         river = throw "'river' has been renamed to/replaced by 'river-classic'"; # Added 2025-08-30

     

       2051
       2052
        
         rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05

     

       2052
       2053
        
         rke2_testing = throw "'rke2_testing' has been removed from nixpkgs as the RKE2 testing channel no longer serves releases"; # Added 2025-06-02

     

       2053
       2054
        
         rl_json = tclPackages.rl_json; # Added 2025-05-03