diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-22 18:19:10 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-22 18:19:10 -0700 |
commit | 11a9ac00fc34ca9948ae05c034fa730163626e40 (patch) | |
tree | 90b3ed6837b3f97239f6efbe763929cdaaa5795b /pkgs/applications/window-managers | |
parent | 563389a7fdd85b1ca1d4c6590785df62f52c8d6d (diff) | |
parent | 6543c61311c0397775253dd3d7f1f41154fc6189 (diff) | |
download | nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.gz nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.bz2 nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.lz nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.xz nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.zst nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/tools/networking/xh/default.nix
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/i3/gaps.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index d158aea83f3..8ab8c5630d0 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -1,13 +1,14 @@ -{ fetchurl, lib, i3, autoreconfHook }: +{ fetchFromGitHub, lib, i3 }: i3.overrideAttrs (oldAttrs : rec { - - name = "i3-gaps-${version}"; + pname = "i3-gaps"; version = "4.19.1"; - src = fetchurl { - url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz"; - sha256 = "sha256-+yZ4Pc7zPZfwgBKbjQsrlXxIaxJBmIdE47lljx8FZG0="; + src = fetchFromGitHub { + owner = "Airblader"; + repo = "i3"; + rev = version; + sha256 = "sha256-Ydks0hioGAnVBGKraoy3a7Abq9/vHmSne+VFbrYXCug="; }; meta = with lib; { |