diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/window-managers')
30 files changed, 312 insertions, 163 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/berry/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/berry/default.nix index 2a41a3d3c073..367d0214129c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/berry/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/berry/default.nix @@ -1,18 +1,30 @@ -{ stdenv, fetchFromGitHub -, libX11, libXft, libXinerama, fontconfig, freetype }: +{ stdenv +, fetchFromGitHub +, libX11 +, libXft +, libXinerama +, fontconfig +, freetype +}: stdenv.mkDerivation rec { pname = "berry"; - version = "0.1.5"; + version = "0.1.7"; src = fetchFromGitHub { owner = "JLErvin"; - repo = "berry"; + repo = pname; rev = version; - sha256 = "1wxbjzpwqb9x7vd7kb095fiqj271rki980dnwcxjxpqlmmrmjzyl"; + sha256 = "sha256-2kFVOE5l1KQvDb5KDL7y0p4M7awJLrxJF871cyc0YZ8="; }; - buildInputs = [ libX11 libXft libXinerama fontconfig freetype ]; + buildInputs =[ + libX11 + libXft + libXinerama + fontconfig + freetype + ]; preBuild = '' makeFlagsArray+=( PREFIX="${placeholder "out"}" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix index 7464fc1b749b..36b3adb08e11 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "project-repo"; repo = "cagebreak"; rev = version; - hash = "sha256-iMoj++yjGK4hn3C675QntBYcsoBx0lEjjCM8fdvRJYo="; + hash = "sha256-YmUn5H0xNC/4MBGydrEk7dy5v+s2ja4VoA1neWrQ3VY="; }; nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/hikari/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/hikari/default.nix index 9bf68adaef42..d23d6c07af0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/hikari/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/hikari/default.nix @@ -12,7 +12,7 @@ let pname = "hikari"; - version = "2.1.2"; + version = "2.2.2"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "1qzbwc8dgsvp5jb4faapcrg9npsl11gq8jvhbbk2h7hj52c5lgmv"; + sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875"; }; nativeBuildInputs = [ pkgconfig bmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/altlayout.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/altlayout.nix new file mode 100644 index 000000000000..973dee3eeed3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/altlayout.nix @@ -0,0 +1,21 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "i3altlayout"; + version = "0.3"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf"; + }; + + pythonPath = with python3Packages; [ enum-compat i3ipc docopt ]; + + meta = with lib; { + maintainers = with maintainers; [ magnetophon ]; + description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side"; + homepage = "https://github.com/deadc0de6/i3altlayout"; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/default.nix index b37a83648ae5..2ea2c8ac7766 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.18.2"; + version = "4.18.3"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "030jym6b8b07yf4y6pb806hg8k77zsprv569gy0r72rh5zb1g1mj"; + sha256 = "03dijnwv2n8ak9jq59fhq0rc80m5wjc9d54fslqaivnnz81pkbjk"; }; nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix index fa1c97c14c1d..755ceb42161c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix @@ -3,11 +3,11 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.18.2"; + version = "4.18.3"; src = fetchurl { url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2"; - sha256 = "0lz08wf4b0yprzqsmymn94kiyg885dcwmh0p64v2rnf52s165g2g"; + sha256 = "1hcakwyz78lgp8mhqv7pw86jlb3m415pfql1q19rkijnhm3fn3ci"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix index c91b1d31b950..2d75aebc8228 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { pname = "i3-layout-manager"; - version = "unstable-2019-12-06"; + version = "unstable-2020-05-04"; src = fetchFromGitHub { owner = "klaxalk"; repo = pname; - rev = "064e13959413ba2d706185478a394e5852c0dc53"; - sha256 = "1qm35sp1cfi3xj5j7xwa05dkb3353gwq4xh69ryc6382xx3wszg6"; + rev = "df54826bba351d8bcd7ebeaf26c07c713af7912c"; + sha256 = "0ccvr43yp26fnh5d82cw7jcfq2sbxzzmdx2cp15bmxr8ixr8knc3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/lock.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/lock.nix index 2bca01eeefa7..7a2812c2cfe0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/lock.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/lock.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "i3lock"; - version = "2.12"; + version = "2.13"; src = fetchurl { url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2"; - sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh"; + sha256 = "02szjsaz7rqrdkd0r2nwgwa85c4hwfrcskxw7ryk695kmjcfhzv3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix index 8bd3d581434e..66373250f71d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,21 +1,38 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }: +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkgconfig +, makeWrapper +, dbus +, libpulseaudio +, notmuch +, ethtool +}: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.14.1"; + version = "0.14.3"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "11qhzjml04njhfa033v98m4yd522zj91s6ffvrm0m6sk7m0wyjsc"; + sha256 = "1k9dgmd4wz9950kr35da31rhph43gmvg8dif7hg1xw41xch6bi60"; }; - cargoSha256 = "0jmmxld4rsjj6p5nazi3d8j1hh7r34q6kyfqq4wv0sjc77gcpaxd"; + cargoSha256 = "0qqkcgl9iz4kxl1a2vv2p7vy7wxn970y28jynf3n7hfp16i3liy2"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ dbus libpulseaudio ]; + buildInputs = [ dbus libpulseaudio notmuch ]; + + cargoBuildFlags = [ + "--features=notmuch" + ]; + + postFixup = '' + wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin" + ''; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix index c4e22546d1c4..5c9f2b779530 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "wmfocus"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; - rev = version; - sha256 = "17qdsqp9072yr7rcm6g1h620rff95ldawr8ldpkbjmkh0rc86skn"; + rev = "v${version}"; + sha256 = "09xffklpz62h6yiksxdlv3a9s1z0wr3ax9syl399avwdmq3c0y49"; }; - cargoSha256 = "1nsdvzrsgprwq7lsvfpymqslhggdzfk3840y8x92qjb0l2g4jhw1"; + cargoSha256 = "0rczas6sgcppacz48xx7sarkvc4s2sgcdz6c661d7vcry1y46xms"; nativeBuildInputs = [ python3 pkgconfig ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index f361b27fdf8c..b86e598a4d08 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.8.3"; + version = "1.9.2"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-cTJQlUaGvbJmu1xYwFp5GPrM5NjfKBzaMc+l7FeMUP8="; + sha256 = "16a9ikknjmhrrlc5r6z2ilkjj5vzyfk4ypwab39mg7vcmd7jzc41"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix index 06ebd7e0e924..13c0818101f7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "0xmkhkdpz1bpczrar9y6assdzhd7qxybnkjqs36h099fk9xqmsav"; + sha256 = "03kk3vg0r88317zv8j2bj44wq2fwxi25rv1aasvayrh1i5j6zr10"; }; - cargoSha256 = "06wnx81fhs19pz5qnir6h2v2kmj73y1g354nadcx6650q9pnhdv4"; + cargoSha256 = "0m4sv4chxzk60njixlyja44rpn04apf3bm04fgd3v7abpr169f2s"; buildInputs = [ makeWrapper libX11 libXinerama ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "Leftwm - A tiling window manager for the adventurer"; + description = "A tiling window manager for the adventurer"; homepage = "https://github.com/leftwm/leftwm"; license = licenses.mit; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix index 89b4fecc2067..5bdb04688ca5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libxcb }: stdenv.mkDerivation { - name = "lemonbar-1.3"; + name = "lemonbar-1.4"; src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.3.tar.gz"; - sha256 = "0zd3v8ys4jzi60pm3wq7p3pbbd5y0acimgiq46qx1ckmwg2q9rza"; + url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz"; + sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv"; }; buildInputs = [ libxcb perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/picom/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/picom/default.nix index 9a00b3a2efaa..064e555f3a5b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/picom/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/picom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "0iwixf3gaichmpvhczxdg5srkb72yh61i5wh7m3fab657h3r7di6"; + sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"; fetchSubmodules = true; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/qtile/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/qtile/default.nix index eccf5c163a8e..280ec067658a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/qtile/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/qtile/default.nix @@ -34,7 +34,18 @@ python37Packages.buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ]; - pythonPath = with python37Packages; [ xcffib cairocffi-xcffib setuptools setuptools_scm ]; + pythonPath = with python37Packages; [ + xcffib + cairocffi-xcffib + setuptools + setuptools_scm + dateutil + dbus-python + mpd2 + psutil + pyxdg + pygobject3 + ]; postInstall = '' wrapProgram $out/bin/qtile \ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix index f163715456c4..062597745194 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix @@ -1,25 +1,32 @@ -{ stdenv, fetchurl -, pkgconfig, which, autoreconfHook -, rep-gtk, pango, gdk-pixbuf-xlib -, imlib, gettext, texinfo -, libXinerama, libXrandr, libXtst, libICE, libSM +{ stdenv +, fetchurl +, pkg-config +, which +, autoreconfHook +, rep-gtk +, pango +, gdk-pixbuf-xlib +, imlib +, gettext +, texinfo +, libXinerama +, libXrandr +, libXtst +, libICE +, libSM , makeWrapper }: -with stdenv.lib; - stdenv.mkDerivation rec { - pname = "sawfish"; version = "1.12.90"; - sourceName = "sawfish_${version}"; src = fetchurl { - url = "https://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/sawfish/${pname}_${version}.tar.xz"; sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ which rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo libXinerama libXrandr libXtst libICE libSM @@ -31,14 +38,15 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do + for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about \ + $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do wrapProgram $i \ --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \ --set REP_LOAD_PATH "$out/share/sawfish/lisp" done ''; - meta = { + meta = with stdenv.lib; { description = "An extensible, Lisp-based window manager"; longDescription = '' Sawfish is an extensible window manager using a Lisp-based scripting language. @@ -47,7 +55,7 @@ stdenv.mkDerivation rec { All high-level WM functions are implemented in Lisp for future extensibility or redefinition. ''; - homepage = "http://sawfish.wikia.com"; + homepage = "https://sawfish.fandom.com/wiki/Main_Page"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sway/default.nix index da58d844ee89..23dcf68bddf3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sway/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sway/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0r3b7h778l9i20z3him9i2qsaynpn9y78hzfgv3cqi8fyry2c4f9"; + sha256 = "1xsa3h8zhf29p0mi90baxpr76jkd9pd1gr97ky8cnjbcs4isj9j0"; }; patches = [ @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { ./load-configuration-from-etc.patch ]; - postPatch = '' - substituteInPlace meson.build --replace "v1.5" "1.5" - ''; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix index a6c8d5cd1c32..4bb4225d394d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "v1.6-1"; + version = "v1.6-2"; src = fetchFromGitHub { owner = "mortie"; repo = "swaylock-effects"; rev = version; - sha256 = "044fc4makjx8v29fkx5xlil6vr1v4r0k6c8741pl67gzvlm4cx3i"; + sha256 = "0fs3c4liajgkax0a2pdc7117v1g9k73nv87g3kyv9wsnkfbbz534"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix index efba3863276d..0f65e4443ca4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "windowchef"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "tudurom"; repo = "windowchef"; rev = "v${version}"; - sha256 = "0fs5ss2z6qjxvmls0g2f3gmv8hshi81xsmmcjn9x7651rv9552pl"; + sha256 = "1m4vly7w2f28lrj26rhh3x9xsp3d97m5cxj91fafgh5rds4ygyhp"; }; buildInputs = [ libxcb libXrandr xcbutil xcbutilkeysyms xcbutilwm xcbproto]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix index d0a1de7f6006..1bbdb7a460fd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix @@ -33,4 +33,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; -}
\ No newline at end of file +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix new file mode 100644 index 000000000000..4ec021644011 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix @@ -0,0 +1,38 @@ +{ stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }: + +stdenv.mkDerivation rec { + pname = "AlsaMixer.app"; + version = "0.2.1"; + + src = dockapps-sources; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXpm libXext alsaLib ]; + + setSourceRoot = '' + export sourceRoot=$(echo */${pname}) + ''; + + dontConfigure = true; + + preInstall = '' + install -d ${placeholder "out"}/bin + ''; + + installPhase = '' + runHook preInstall + install -t ${placeholder "out"}/bin AlsaMixer.app + runHook postInstall + ''; + + postInstall = '' + ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer + ''; + + meta = with stdenv.lib; { + description = "Alsa mixer application for Windowmaker"; + homepage = "https://www.dockapps.net/alsamixerapp"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.bstrik ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix deleted file mode 100644 index 4e1256399e76..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, libX11, libXpm, libXext, alsaLib }: - -stdenv.mkDerivation { - name = "alsamixer.app-0.2.1"; - src = fetchgit { - url = "git://repo.or.cz/dockapps.git"; - rev = "38c74350b02f35824554ce0c4f0f251d71762040"; - sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXpm libXext alsaLib ]; - - postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app"; - - installPhase = '' - mkdir -pv $out/bin; - cp AlsaMixer.app $out/bin/AlsaMixer; - ''; - - meta = { - description = "Alsa mixer application for Windowmaker"; - homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bstrik ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/default.nix new file mode 100644 index 000000000000..8a66fdbd67f2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/default.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + + dockapps-sources = pkgs.fetchgit { + url = "https://repo.or.cz/dockapps.git"; + rev = "b2b9d872ee61c9b329e4597c301e4417cbd9c3ea"; + sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w="; + }; + + libdockapp = callPackage ./libdockapp.nix { }; + + AlsaMixer-app = callPackage ./AlsaMixer-app.nix { }; + + wmCalClock = callPackage ./wmCalClock.nix { }; + + wmsm-app = callPackage ./wmsm-app.nix { }; + + wmsystemtray = callPackage ./wmsystemtray.nix { }; +}) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix new file mode 100644 index 000000000000..bcdef42a78a0 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix @@ -0,0 +1,30 @@ +{ stdenv, dockapps-sources, autoreconfHook, pkg-config +, libX11, libXext, libXpm, mkfontdir, fontutil }: + +stdenv.mkDerivation rec { + pname = "libdockapp"; + version = "0.7.3"; + + src = dockapps-sources; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ]; + + setSourceRoot = '' + export sourceRoot=$(echo */${pname}) + ''; + + # There is a bug on --with-font + configureFlags = [ + "--with-examples=no" + "--with-font=no" + ]; + + meta = with stdenv.lib; { + description = "A library providing a framework for dockapps"; + homepage = "https://www.dockapps.net/libdockapp"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.bstrik ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix new file mode 100644 index 000000000000..f8ea781858a4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix @@ -0,0 +1,38 @@ +{ stdenv, dockapps-sources +, libX11, libXpm, libXext }: + +stdenv.mkDerivation rec { + pname = "wmCalClock"; + version = "1.25"; + + src = dockapps-sources; + + buildInputs = [ libX11 libXpm libXext ]; + + setSourceRoot = '' + export sourceRoot=$(echo */${pname}/Src) + ''; + + preBuild = '' + makeFlagsArray+=( + CC="cc" + INCDIR="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include" + LIBDIR="-I${libX11}/lib -I${libXext}/lib -I${libXpm}/lib" + ) + ''; + + preInstall = '' + install -d ${placeholder "out"}/bin + install -d ${placeholder "out"}/man/man1 + ''; + + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "A Calendar clock with antialiased text"; + homepage = "https://www.dockapps.net/wmcalclock"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.bstrik ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix deleted file mode 100644 index 48f4753d674b..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }: - -stdenv.mkDerivation { - name = "wmCalClock-1.25"; - src = fetchurl { - url = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz"; - sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXpm libXext ]; - - postUnpack = "sourceRoot=\${sourceRoot}/Src"; - - buildPhase='' - make prefix=$out - ''; - - installPhase = '' - mkdir -pv $out/bin - mkdir -pv $out/man/man1 - make DESTDIR=$out install - ''; - - meta = { - description = "Clock for Windowmaker"; - homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bstrik ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix new file mode 100644 index 000000000000..dd25ee2b2fce --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -0,0 +1,43 @@ +{ stdenv, dockapps-sources +, libX11 +, libXpm +, libXext +, libdockapp }: + +stdenv.mkDerivation rec { + pname = "wmsm.app"; + version = "0.2.1"; + + src = dockapps-sources; + + buildInputs = [ libX11 libXpm libXext libdockapp ]; + + setSourceRoot = '' + export sourceRoot=$(echo */${pname}/wmsm) + ''; + + NIX_CFLAGS_COMPILE = "-std=gnu89"; + + postPatch = '' + substituteInPlace Makefile \ + --replace "PREFIX = /usr/X11R6/bin" "" \ + --replace "/usr/bin/install" "install" + ''; + + makeFlags = [ "CC=cc" ]; + + preInstall = '' + runHook preInstall + install -d ${placeholder "out"}/bin + runHook postInstall + ''; + + installFlags = [ "PREFIX=${placeholder "out"}/bin" ]; + + meta = with stdenv.lib; { + description = "System monitor for Windowmaker"; + homepage = "https://www.dockapps.net/wmsmapp"; + license = licenses.gpl2; + maintainers = [ maintainers.bstrik ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix deleted file mode 100644 index ad255414a692..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }: - -stdenv.mkDerivation { - name = "wmsm.app-0.2.1"; - src = fetchurl { - url = "http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2"; - sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXpm libXext ]; - - postUnpack = "sourceRoot=\${sourceRoot}/wmsm"; - - NIX_CFLAGS_COMPILE = "-std=gnu89"; - - installPhase = '' - substituteInPlace Makefile --replace "PREFIX = /usr/X11R6/bin" "" --replace "/usr/bin/install" "install" - mkdir -pv $out/bin; - make PREFIX=$out/bin install; - ''; - - meta = { - description = "System monitor for Windowmaker"; - homepage = "http://linux-bsd-unix.strefa.pl"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bstrik ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index 3e073cd8e91b..6ec62af5d36e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -1,20 +1,22 @@ { stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: -stdenv.mkDerivation { - name = "wmsystemtray-1.4"; +stdenv.mkDerivation rec { + pname = "wmsystemtray"; + version = "1.4"; + src = fetchurl { - url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz"; - sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; + url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz"; + sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; - meta = { - description = "Systemtray for Windowmaker"; + meta = with stdenv.lib; { + description = "A system tray for Windowmaker"; homepage = "http://wmsystemtray.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bstrik ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Only; + maintainers = [ maintainers.bstrik ]; + platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 7c6041b576e3..ffd804eaba0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/kalj/xmonad-log-applet"; license = licenses.bsd3; + broken = desktopSupport == "gnomeflashback"; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; |