diff options
author | Carles Pagès <page@cubata.homelinux.net> | 2013-01-08 22:28:13 +0100 |
---|---|---|
committer | Carles Pagès <page@cubata.homelinux.net> | 2013-01-08 22:28:13 +0100 |
commit | 7d591c23b39df3259010c8bef247b875beb3f4d5 (patch) | |
tree | ea47f9ab4a0af15e1d68340ab9536f78f2c359ac /pkgs/applications/window-managers | |
parent | c2189c49c6735e1f1611e9897686e76ee0dc4fce (diff) | |
parent | e11365c0a5ee8439e858e1410e4ce4724043b425 (diff) | |
download | nixlib-7d591c23b39df3259010c8bef247b875beb3f4d5.tar nixlib-7d591c23b39df3259010c8bef247b875beb3f4d5.tar.gz nixlib-7d591c23b39df3259010c8bef247b875beb3f4d5.tar.bz2 nixlib-7d591c23b39df3259010c8bef247b875beb3f4d5.tar.lz nixlib-7d591c23b39df3259010c8bef247b875beb3f4d5.tar.xz nixlib-7d591c23b39df3259010c8bef247b875beb3f4d5.tar.zst nixlib-7d591c23b39df3259010c8bef247b875beb3f4d5.zip |
Merge branch 'master' into wayland
Diffstat (limited to 'pkgs/applications/window-managers')
6 files changed, 15 insertions, 43 deletions
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 042e1a323a6d..94ac84f838c2 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.3"; + version = "4.4"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "895bf586092535efb2bc723ba599c71a027768115e56052f111fc8bb148db925"; + sha256 = "06s8gzcxxh06zp1586kp4bxaj8yj5i9jacwg0nizbmmnx94mg1wr"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index e6714536cadd..b4dabb300c19 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, x11, lua, gettext, groff }: stdenv.mkDerivation { - name = "ion-3rc-20070902"; + name = "ion-3-20090110"; meta = { description = "Ion is a tiling tabbed window manager designed with keyboard users in mind."; homepage = http://modeemi.fi/~tuomov/ion; }; src = fetchurl { - url = http://iki.fi/tuomov/dl/ion-3rc-20070902.tar.gz; - sha256 = "062a0rgxzz4h1hih5lp7l2nfvhz095brag9fmnanzqc4dac228xl"; + url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; + sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; buildInputs = [ x11 lua gettext groff ]; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; diff --git a/pkgs/applications/window-managers/wmii/builder.sh b/pkgs/applications/window-managers/wmii/builder.sh deleted file mode 100644 index be21a9c9fad4..000000000000 --- a/pkgs/applications/window-managers/wmii/builder.sh +++ /dev/null @@ -1,24 +0,0 @@ -source $stdenv/setup - -postUnpack() { -cd $sourceRoot - -cat >> config.mk << EOF -PREFIX= -DESTDIR=${out} - -CFLAGS = -DVERSION=\\"\${VERSION}\\" - -LDFLAGS = -lm -lX11 -lixp - -AWKPATH=${gawk}/bin/gawk -CONFPREFIX = /etc -MANPREFIX = /share/man -EOF - -cd .. -} - -postUnpack=postUnpack - -genericBuild diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index fd215986fa30..a15755205ee6 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -1,24 +1,19 @@ -{ cabal, extensibleExceptions, mtl, utf8String, X11, xmessage }: +{ cabal, extensibleExceptions, filepath, mtl, utf8String, X11 }: cabal.mkDerivation (self: { pname = "xmonad"; - version = "0.10"; - sha256 = "19z5y36pybsm93x6hlj5hzyys9r4ag7hkdib5spsnryk2mv72xj6"; + version = "0.11"; + sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5"; isLibrary = true; isExecutable = true; - buildDepends = [ extensibleExceptions mtl utf8String X11 ]; + buildDepends = [ + extensibleExceptions filepath mtl utf8String X11 + ]; meta = { homepage = "http://xmonad.org"; description = "A tiling window manager"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; - - preConfigure = '' - substituteInPlace XMonad/Core.hs --replace \ - '"xmessage"' '"${xmessage}/bin/xmessage"' - ''; }) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 11c8531ad174..6716591eabae 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmonad-contrib"; - version = "0.10"; - sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq"; + version = "0.11"; + sha256 = "188brys16b3wmxd22j4284wnpasm8bixdjfxl1jr2q2xi45nzks0"; buildDepends = [ extensibleExceptions mtl random utf8String X11 X11Xft xmonad ]; diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index 334c7f59d571..eebb07c0aa1c 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { xmonadContrib ]; configureFlags = "-f-with_hlist -fwith_split -fwith_parsec"; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/xmonad-extras"; description = "Third party extensions for xmonad with wacky dependencies"; |