From 13956d64442d5653c8eb62528eadbcd54cc9690b Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 4 Dec 2015 15:59:45 +0000
Subject: [PATCH 1/5] emacs-packages: s: 20140910 -> 20151023

---
 pkgs/top-level/emacs-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 98da54879f3..74a00dccdb6 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1642,12 +1642,12 @@ let self = _self // overrides;
 
   s = melpaBuild rec {
     pname   = "s";
-    version = "20140910";
+    version = "20151023";
     src = fetchFromGitHub {
       owner  = "magnars";
       repo   = "${pname}.el";
-      rev    = "1f85b5112f3f68169ddaa2911fcfa030f979eb4d";
-      sha256 = "9d871ea84f98c51099528a03eddf47218cf70f1431d4c35c19c977d9e73d421f";
+      rev    = "372e94c1a28031686d75d6c52bfbe833a118a72a";
+      sha256 = "1zn8n3mv0iscs242dbkf5vmkkizfslq5haw9z0d0g3wknq18286h";
     };
     meta = {
       description = "String manipulation library for Emacs";

From 9c3f2bd3220c2f8e421a9e5294d4bf809abd7fa7 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 4 Dec 2015 16:02:03 +0000
Subject: [PATCH 2/5] emacs-packages: f: init at 20151113

---
 pkgs/top-level/emacs-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 74a00dccdb6..58196284a41 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -691,6 +691,23 @@ let self = _self // overrides;
     };
   };
 
+  f = melpaBuild rec {
+    pname = "f";
+    version = "20151113";
+    src = fetchFromGitHub {
+      owner = "rejeep";
+      repo = "f.el";
+      rev = "e0259ee060ff9a3f12204adcc8630869080acd68";
+      sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
+    };
+    fileSpecs = [ "f.el" ];
+    packageRequires = [ dash s ];
+    meta = {
+      description = "Emacs library for working with files and directories";
+      license = gpl3Plus;
+    };
+  };
+
   find-file-in-project = melpaBuild rec {
     pname = "find-file-in-project";
     version = "3.5";

From b7fdbf1f2eac6d3ca1613d5be11ee501b29dc873 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 4 Dec 2015 16:04:39 +0000
Subject: [PATCH 3/5] emacs-packages: parsebib: init at 20151006

---
 pkgs/top-level/emacs-packages.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 58196284a41..a84e8130c0b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1461,6 +1461,21 @@ let self = _self // overrides;
     };
   };
 
+  parsebib = melpaBuild rec {
+    pname = "parsebib";
+    version = "20151006";
+    src = fetchFromGitHub {
+      owner = "joostkremers";
+      repo = pname;
+      rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce";
+      sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
+    };
+    meta = {
+      description = "Emacs library for reading .bib files";
+      license = bsd3;
+    };
+  };
+
   perspective = melpaBuild rec {
     pname   = "perspective";
     version = "1.12";

From f807e3338e318bb38a3a5899a230ee85a74c7867 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 4 Dec 2015 16:06:10 +0000
Subject: [PATCH 4/5] emacs-packages: sort helm packages

---
 pkgs/top-level/emacs-packages.nix | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index a84e8130c0b..347b250b6b9 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1031,22 +1031,6 @@ let self = _self // overrides;
     };
   };
 
-  helm-swoop = melpaBuild rec {
-    pname   = "helm-swoop";
-    version = "20141224";
-    src = fetchFromGitHub {
-      owner  = "ShingoFukuyama";
-      repo   = pname;
-      rev    = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae";
-      sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m";
-    };
-    packageRequires = [ helm ];
-    meta = {
-      description = "An Emacs mode which constructs an editable grep for a buffer";
-      license = gpl3Plus;
-    };
-  };
-
   helm = melpaBuild rec {
     pname   = "helm";
     version = "20150105";
@@ -1063,6 +1047,22 @@ let self = _self // overrides;
     };
   };
 
+  helm-swoop = melpaBuild rec {
+    pname   = "helm-swoop";
+    version = "20141224";
+    src = fetchFromGitHub {
+      owner  = "ShingoFukuyama";
+      repo   = pname;
+      rev    = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae";
+      sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m";
+    };
+    packageRequires = [ helm ];
+    meta = {
+      description = "An Emacs mode which constructs an editable grep for a buffer";
+      license = gpl3Plus;
+    };
+  };
+
   hi2 = melpaBuild rec {
     pname   = "hi2";
     version = "1.0";

From ba7a8833408439f00be85994c44f1fd0db74eabb Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 4 Dec 2015 16:06:57 +0000
Subject: [PATCH 5/5] emacs-packages: helm-bibtex: init at 20151125

---
 pkgs/top-level/emacs-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 347b250b6b9..90ba8e387f2 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1047,6 +1047,22 @@ let self = _self // overrides;
     };
   };
 
+  helm-bibtex = melpaBuild rec {
+    pname = "helm-bibtex";
+    version = "20151125";
+    src = fetchFromGitHub {
+      owner = "tmalsburg";
+      repo = pname;
+      rev = "bfcd5064dcc7c0ac62c46985832b2a73082f96e0";
+      sha256 = "1nvc4ha9wj5j47qg7hdbv1xpjy8a8idc9vc2myl3xa33ywllwdwi";
+    };
+    packageRequires = [ dash f helm parsebib s ];
+    meta = {
+      description = "Bibliography Manager for Emacs";
+      license = gpl2;
+    };
+  };
+
   helm-swoop = melpaBuild rec {
     pname   = "helm-swoop";
     version = "20141224";