Skip to content

i3: 4.21.1 -> 4.22, i3-gaps: drop #208861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpletz merged 3 commits into from
Jan 3, 2023
Merged

i3: 4.21.1 -> 4.22, i3-gaps: drop #208861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9701c2e
i3: 4.21.1 -> 4.22
reedrw Jan 3, 2023
b2a3c6b
i3-gaps: drop
reedrw Jan 3, 2023
e3539cd
nixos/i3: update doc for gaps merge
reedrw Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions nixos/modules/services/x11/window-managers/i3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ in
type = types.package;
default = pkgs.i3;
defaultText = literalExpression "pkgs.i3";
example = literalExpression "pkgs.i3-gaps";
description = lib.mdDoc ''
i3 package to use.
'';
Expand Down Expand Up @@ -73,6 +72,6 @@ in

imports = [
(mkRemovedOptionModule [ "services" "xserver" "windowManager" "i3-gaps" "enable" ]
"Use services.xserver.windowManager.i3.enable and set services.xserver.windowManager.i3.package to pkgs.i3-gaps to use i3-gaps.")
"i3-gaps was merged into i3. Use services.xserver.windowManager.i3.enable instead.")
];
}
4 changes: 2 additions & 2 deletions pkgs/applications/window-managers/i3/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

stdenv.mkDerivation rec {
pname = "i3";
version = "4.21.1";
version = "4.22";

src = fetchurl {
url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz";
sha256 = "sha256-7f14EoXGVKBdxtsnLOAwDEQo5vvYddmZZOV94ltBvB4=";
sha256 = "sha256-KGOZEeWdlWOfCSZCqYL14d6lkiUMK1zpjtoQCDNRPks=";
};

nativeBuildInputs = [
Expand Down
29 changes: 0 additions & 29 deletions pkgs/applications/window-managers/i3/gaps.nix
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ mapAliases ({

### I ###

i3-gaps = i3; # Added 2023-01-03
i3cat = throw "i3cat has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22
iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29775,8 +29775,6 @@ with pkgs;

i3-auto-layout = callPackage ../applications/window-managers/i3/auto-layout.nix { };

i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { };

i3-rounded = callPackage ../applications/window-managers/i3/rounded.nix { };

i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { };
Expand Down