From 9ed945784630b5c3cfcae5fdba04c88fb4286a60 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 16 Jan 2016 16:03:18 +0100
Subject: [PATCH] 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.
---
 .../window-managers/bar/default.nix           | 25 -----------------
 .../window-managers/lemonbar/default.nix      | 27 +++++++++++++++++++
 .../window-managers/{bar => lemonbar}/xft.nix |  0
 pkgs/top-level/all-packages.nix               | 10 ++++---
 4 files changed, 33 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/bar/default.nix
 create mode 100644 pkgs/applications/window-managers/lemonbar/default.nix
 rename pkgs/applications/window-managers/{bar => lemonbar}/xft.nix (100%)

diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix
deleted file mode 100644
index 964390d3b59b..000000000000
--- 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/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
new file mode 100644
index 000000000000..042abf09dad2
--- /dev/null
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, perl, libxcb }:
+
+let
+  version = "1.2pre";
+in
+  stdenv.mkDerivation rec {
+    name = "lemonbar-${version}";
+  
+    src = fetchFromGitHub {
+      owner = "LemonBoy";
+      repo = "bar";
+      rev = "61985278f2af1e4e85d63a696ffedc5616b06bc0";
+      sha256 = "0a8djlayimjdg5fj50lpifsv6gkb577bca68wmk9wg9y9n27pgay";
+    };
+  
+    buildInputs = [ libxcb perl ];
+  
+    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
+  
+    meta = with stdenv.lib; {
+      description = "A lightweight xcb based bar";
+      homepage = https://github.com/LemonBoy/bar;
+      maintainers = [ maintainers.meisternu ];
+      license = "Custom";   
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/applications/window-managers/bar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
similarity index 100%
rename from pkgs/applications/window-managers/bar/xft.nix
rename to pkgs/applications/window-managers/lemonbar/xft.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d52c89d0590..72a3aee6c23d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11153,10 +11153,6 @@ let
 
   bandwidth = callPackage ../tools/misc/bandwidth { };
 
-  bar = callPackage ../applications/window-managers/bar { };
-
-  bar-xft = callPackage ../applications/window-managers/bar/xft.nix { };
-
   baresip = callPackage ../applications/networking/instant-messengers/baresip {
     ffmpeg = ffmpeg_1;
   };
@@ -12340,6 +12336,10 @@ let
     inherit (gnome) libglade;
   };
 
+  lemonbar = callPackage ../applications/window-managers/lemonbar { };
+
+  lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
+
   leo-editor = callPackage ../applications/editors/leo-editor { };
 
   libowfat = callPackage ../development/libraries/libowfat { };
@@ -15799,6 +15799,8 @@ aliases = with self; rec {
   adobeReader = adobe-reader;
   arduino_core = arduino-core;  # added 2015-02-04
   asciidocFull = asciidoc-full;  # added 2014-06-22
+  bar = lemonbar;  # added 2015-01-16
+  bar-xft = lemonbar-xft;  # added 2015-01-16
   bridge_utils = bridge-utils;  # added 2015-02-20
   buildbotSlave = buildbot-slave;  # added 2014-12-09
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15