git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112299 from 06kellyjac/dwm
commitbc89cb01c3cbb542fcce724886cdaf7058bca8d6 authorJörg Thalheim <Mic92@users.noreply.github.com> dateTue 9 Feb 2021, 16:42 (6 years ago) parent40b3dc90e1bf2f
4 files changed+33−63
pkgs/applications/window-managers/dwm/default.nix+31−19 pkgs/applications/window-managers/dwm/git.nix−36 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−8
pkgs/applications/window-managers/dwm/default.nix+31−19
@@ -1,34 +1,46 @@
1−{lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}:
1+{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [ ], conf ? null}:
22
3−with lib;
4−
5−let
6− name = "dwm-6.2";
7−in
8−stdenv.mkDerivation {
9− inherit name;
3+stdenv.mkDerivation rec {
4+ pname = "dwm";
5+ version = "6.2";
106
117 src = fetchurl {
12− url = "https://dl.suckless.org/dwm/${name}.tar.gz";
8+ url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz";
139 sha256 = "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p";
1410 };
1511
1612 buildInputs = [ libX11 libXinerama libXft ];
1713
18− prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
14+ prePatch = ''
15+ sed -i "s@/usr/local@$out@" config.mk
16+ '';
1917
2018 # Allow users set their own list of patches
2119 inherit patches;
2220
2321 # Allow users to set the config.def.h file containing the configuration
24− postPatch = let configFile = if isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf;
25− in optionalString (conf!=null) "cp ${configFile} config.def.h";
26−
27− meta = {
28− homepage = "https://suckless.org/";
29− description = "Dynamic window manager for X";
30− license = lib.licenses.mit;
31− maintainers = with lib.maintainers; [viric];
32− platforms = with lib.platforms; all;
22+ postPatch =
23+ let
24+ configFile =
25+ if lib.isDerivation conf || builtins.isPath conf
26+ then conf else writeText "config.def.h" conf;
27+ in
28+ lib.optionalString (conf != null) "cp ${configFile} config.def.h";
29+
30+ meta = with lib; {
31+ homepage = "https://dwm.suckless.org/";
32+ description = "An extremely fast, small, and dynamic window manager for X";
33+ longDescription = ''
34+ dwm is a dynamic window manager for X. It manages windows in tiled,
35+ monocle and floating layouts. All of the layouts can be applied
36+ dynamically, optimising the environment for the application in use and the
37+ task performed.
38+ Windows are grouped by tags. Each window can be tagged with one or
39+ multiple tags. Selecting certain tags displays all windows with these
40+ tags.
41+ '';
42+ license = licenses.mit;
43+ maintainers = with maintainers; [ viric ];
44+ platforms = platforms.all;
3345 };
3446}
pkgs/applications/window-managers/dwm/git.nixdeleted−36
@@ -1,36 +0,0 @@
1−{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, writeText, patches ? [ ]
2−, conf ? null }:
3−
4−stdenv.mkDerivation {
5− pname = "dwm-git";
6− version = "20200303";
7−
8− src = fetchgit {
9− url = "git://git.suckless.org/dwm";
10− rev = "61bb8b2241d4db08bea4261c82e27cd9797099e7";
11− sha256 = "1j3vly8dln35vnwnwwlaa8ql9fmnlmrv43jcyc8dbfhfxiw6f34l";
12− };
13−
14− buildInputs = [ libX11 libXinerama libXft ];
15−
16− prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
17−
18− # Allow users set their own list of patches
19− inherit patches;
20−
21− # Allow users to set the config.def.h file containing the configuration
22− postPatch = let
23− configFile = if lib.isDerivation conf || builtins.isPath conf then
24− conf
25− else
26− writeText "config.def.h" conf;
27− in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
28−
29− meta = with lib; {
30− homepage = "https://suckless.org/";
31− description = "Dynamic window manager for X, development version";
32− license = licenses.mit;
33− maintainers = with maintainers; [ xeji ];
34− platforms = platforms.unix;
35− };
36−}
pkgs/top-level/aliases.nix+1
@@ -150,6 +150,7 @@ mapAliases ({
150150 dydisnix = throw "dydisnix has been removed."; # added 2021-01-27
151151 dysnomia = throw "dysnomia has been removed."; # added 2021-01-27
152152 dwarf_fortress = dwarf-fortress; # added 2016-01-23
153+ dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07
153154 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17
154155 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
155156 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
pkgs/top-level/all-packages.nix+1−8
@@ -21680,14 +21680,7 @@ in
2168021680 inherit (gnome2) libgnomeui;
2168121681 };
2168221682
21683− dwm = callPackage ../applications/window-managers/dwm {
21684− patches = config.dwm.patches or [];
21685− };
21686−
21687− dwm-git = callPackage ../applications/window-managers/dwm/git.nix {
21688− patches = config.dwm.patches or [];
21689− conf = config.dwm.conf or null;
21690− };
21683+ dwm = callPackage ../applications/window-managers/dwm { };
2169121684
2169221685 dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };
2169321686