diff options
author | Kovacsics Robert (NixOS-SSD2) <kovirobi@gmail.com> | 2015-09-01 13:52:08 +0100 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2015-09-03 12:58:24 +0200 |
commit | b22e6cb29927511c14b745405f4c157dd66513b4 (patch) | |
tree | c8540620aa8ecd9a85f5c80af6add8e616f8b762 | |
parent | 553e7d49ffe2e688f8d38b66e544375d2bee7186 (diff) |
wiimenu, wmiiSnap, libixp_for_wmii: removed, fixes #9609
wiimenu superseded by wimenu from wmii wmiiSnap superseded by wmii_hg libixp_for_wmii superseded by libixp_hg
-rw-r--r-- | nixos/doc/manual/release-notes/release-notes.xml | 1 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-unstable.xml | 27 | ||||
-rw-r--r-- | pkgs/applications/window-managers/wmii/default.nix | 35 | ||||
-rw-r--r-- | pkgs/applications/window-managers/wmii31/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/libraries/libixp_for_wmii/default.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
6 files changed, 28 insertions, 114 deletions
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index e326f89d4f40b..6ed99315a7af7 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -9,6 +9,7 @@ <para>This section lists the release notes for each stable version of NixOS and current unstable revision.</para> +<xi:include href="rl-unstable.xml" /> <xi:include href="rl-1509.xml" /> <xi:include href="rl-1412.xml" /> <xi:include href="rl-1404.xml" /> diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml new file mode 100644 index 0000000000000..2781cee361488 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -0,0 +1,27 @@ +<section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-release-unstable"> + +<title>Unstable</title> + +<para>When upgrading from a previous release, please be aware of the + following incompatible changes: + + <itemizedlist> + <listitem><para> + <command>wmiiSnap</command> has been replaced with + <command>wmii_hg</command>, but + <command>services.xserver.windowManager.wmii.enable</command> + has been updated respectively so this only affects you if you + have explicitly installed <command>wmiiSnap</command>. + </para></listitem> + <listitem><para> + <command>wmiimenu</command> is removed, as it has been removed by + the developers upstream. Use <command>wimenu</command> from the + <command>wmii-hg</command> package. + </para></listitem> + </itemizedlist> +</para> +</section> diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix deleted file mode 100644 index e8ecc72a6d303..0000000000000 --- a/pkgs/applications/window-managers/wmii/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -args: with args; stdenv.mkDerivation { - name = "wmii-3.6"; - - src = fetchurl { - url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz; - sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216"; - }; - - buildInputs = [ libX11 libixp xextproto libXt libXext ]; - inherit libixp; - - phases = "unpackPhase installPhase"; - - installPhase = " - for i in libfmt libutf libregexp libbio; do - cd $i; make; cd .. - done - mkdir -p \$out/lib - cp ${libixp}/lib/libixp.a \$out/lib - export CFLAGS=\$NIX_CFLAGS_COMPILE - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') - sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ - -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ - -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - -e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\ - config.mk - # don't use the default one installed by nixos! - #sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir - make install - "; - meta = { homepage = "www.suckless.org"; - description = "a really cool window manager which can by driven by keyboard only"; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix deleted file mode 100644 index 568be30f1c524..0000000000000 --- a/pkgs/applications/window-managers/wmii31/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -args: with args; stdenv.mkDerivation { - name = "wmiimenu-3.1"; - - src = fetchurl { - url = http://dl.suckless.org/wmii/wmii-3.1.tar.gz; - sha256 = "0sviwxbanpsfdm55zvx9hflncw35slkz41xr517y3yfgxx6qlhlk"; - }; - - buildInputs = [ libX11 libixp ]; - inherit libixp; - - phases = "unpackPhase installPhase"; - - installPhase = " - export CFLAGS=\$NIX_CFLAGS_COMPILE - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') - sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ - -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ - -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - config.mk - # don't use the default one installed by nixos! - # sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir - - # This will fail but wmiimenu has been built (hack!) - set +e - make &> /dev/null - set -e - mkdir -p \$out/bin - cp cmd/wmiimenu \$out/bin - "; - meta = { homepage = "www.suckless.org"; - description = "One small tool of the wmii window manger to let the user select an item from a list by filtering"; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix deleted file mode 100644 index cbe9e20f0b1ba..0000000000000 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "libixp_for_wmii-0.4"; - phases = "unpackPhase installPhase"; - installPhase = " - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') - sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ - -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ - -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - config.mk - make - mkdir -p \$out/include - cp -r include/*.h \$out/include - cp -r lib \$out - "; - src = fetchurl { - url = http://dl.suckless.org/libs/libixp-0.4.tar.gz; - sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p"; - }; - - meta = { - homepage = http://libs.suckless.org/libixp; - description = "stand-alone client/server 9P library"; - license = with stdenv.lib.licenses; [ mit lpl-102 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ca22091e3da2..984485e893cbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7556,10 +7556,6 @@ let libxslt = callPackage ../development/libraries/libxslt { }; - libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { - inherit fetchurl stdenv; - }); - libixp_hg = callPackage ../development/libraries/libixp-hg { }; libyaml = callPackage ../development/libraries/libyaml { }; @@ -13308,20 +13304,6 @@ let wmctrl = callPackage ../tools/X11/wmctrl { }; - # I'm keen on wmiimenu only >wmii-3.5 no longer has it... - wmiimenu = import ../applications/window-managers/wmii31 { - libixp = libixp_for_wmii; - inherit fetchurl /* fetchhg */ stdenv gawk; - inherit (xlibs) libX11; - }; - - wmiiSnap = import ../applications/window-managers/wmii { - libixp = libixp_for_wmii; - inherit fetchurl /* fetchhg */ stdenv gawk; - inherit (xlibs) libX11 xextproto libXt libXext; - includeUnpack = config.stdenv.includeUnpack or false; - }; - wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; wordnet = callPackage ../applications/misc/wordnet { }; |