lemonbar: 1.1 -> 1.2pre

'bar' has been officially renamed 'lemonbar'.
Last release (1.1) is almost a year old, but some bugfixes and new features are available in the repository, let's include them in the derivation.

2 files changed, 0 insertions, 51 deletions

diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix
deleted file mode 100644
index 964390d3b59..00000000000
--- a/pkgs/applications/window-managers/bar/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, perl, libxcb }:
-
-let
-  version = "1.1";
-in
-  stdenv.mkDerivation rec {
-    name = "bar-${version}";
-  
-    src = fetchurl {
-      url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz";
-      sha256 = "171ciw676cvj80zzbqfbg9nwix36zph0683zmqf279q9b9bmayan";
-    };
-  
-    buildInputs = [ libxcb perl ];
-  
-    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
-  
-    meta = {
-      description = "A lightweight xcb based bar";
-      homepage = https://github.com/LemonBoy/bar;
-      maintainers = [ stdenv.lib.maintainers.meisternu ];
-      license = "Custom";   
-      platforms = stdenv.lib.platforms.linux;
-    };
-}
diff --git a/pkgs/applications/window-managers/bar/xft.nix b/pkgs/applications/window-managers/bar/xft.nix
deleted file mode 100644
index c671f1a4e03..00000000000
--- a/pkgs/applications/window-managers/bar/xft.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchgit, perl, libxcb, libXft }:
-
-let
-  version = "2015-07-23";
-in
-  stdenv.mkDerivation rec {
-    name = "bar-xft-git-${version}";
-
-    src = fetchgit {
-      url = "https://github.com/krypt-n/bar";
-      rev = "020a3e1848ce03287886e9ff80b0b443e9aed543";
-      sha256 = "1xzs37syhlwyjfxnk36qnij5bqa0mi53lf1k851viw4qai2bfkgr";
-    };
-
-    buildInputs = [ libxcb libXft perl ];
-
-    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
-
-    meta = {
-      description = "A lightweight xcb based bar with XFT-support";
-      homepage = https://github.com/krypt-n/bar;
-      maintainers = [ stdenv.lib.maintainers.hiberno ];
-      license = "Custom";
-      platforms = stdenv.lib.platforms.linux;
-    };
-}