b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208861 from reedrw/i3-422

Browse source
This commit is contained in:
Franz Pletz 2023-01-03 13:12:24 +01:00 committed by GitHub
parent 73f6ea95a2 e3539cdd2c
commit c8c6436ac2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/x11/window-managers/i3.nix
View file

@ -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.
'';
@ -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
pkgs/applications/window-managers/i3/default.nix
View file

@ -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 = [

29
pkgs/applications/window-managers/i3/gaps.nix
View file

@ -1,29 +0,0 @@
{ fetchFromGitHub, lib, i3 }:
i3.overrideAttrs (oldAttrs : rec {
pname = "i3-gaps";
version = "4.21.1";
src = fetchFromGitHub {
owner = "Airblader";
repo = "i3";
rev = version;
sha256 = "sha256-+JxJjvzEuAA4CH+gufzAzIqd5BSvHtPvLm2zTfXc/xk=";
};
meta = with lib; {
description = "A fork of the i3 tiling window manager with some additional features";
homepage = "https://github.com/Airblader/i3";
maintainers = with maintainers; [ fmthoma ];
license = licenses.bsd3;
platforms = platforms.linux ++ platforms.netbsd ++ platforms.openbsd;
longDescription = ''
Fork of i3wm, a tiling window manager primarily targeted at advanced users
and developers. Based on a tree as data structure, supports tiling,
stacking, and tabbing layouts, handled dynamically, as well as floating
windows. This fork adds a few features such as gaps between windows.
Configured via plain text file. Multi-monitor. UTF-8 clean.
'';
};
})

1
pkgs/top-level/aliases.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -29776,8 +29776,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 { };