From acc5d4040e8e849a83a69f5afcc301c360bbfa46 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 18 Feb 2013 11:33:24 +0100
Subject: Add FlexGet and dependencies

---
 pkgs/top-level/python-packages.nix | 135 ++++++++++++++++++++++++++++++++++---
 1 file changed, 127 insertions(+), 8 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf9bea000f8c..94c48c276925 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -276,11 +276,11 @@ pythonPackages = python.modules // rec {
   };
 
   beautifulsoup = buildPythonPackage (rec {
-    name = "beautifulsoup-3.0.8";
+    name = "beautifulsoup-3.2.1";
 
     src = fetchurl {
-      url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz";
-      sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7";
+      url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
+      sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
     };
 
     # error: invalid command 'test'
@@ -288,13 +288,30 @@ pythonPackages = python.modules // rec {
 
     meta = {
       homepage = http://www.crummy.com/software/BeautifulSoup/;
-
       license = "bsd";
-
       description = "Undemanding HTML/XML parser";
     };
   });
 
+  beautifulsoup4 = buildPythonPackage (rec { 
+    name = "beautifulsoup4-4.1.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz";
+      md5 = "c012adc06217b8532c446d181cc56586";
+    };
+
+    # invalid command 'test'
+    doCheck = false;
+
+    meta = {
+      homepage = http://crummy.com/software/BeautifulSoup/bs4/;
+      description = "HTML and XML parser";
+      license = stdenv.lib.licenses.mit;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  });
+
   # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
   boto_1_9 = buildPythonPackage (rec {
     name = "boto-1.9b";
@@ -963,6 +980,23 @@ pythonPackages = python.modules // rec {
   };
 
 
+  feedparser = buildPythonPackage (rec { 
+    name = "feedparser-5.1.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.gz";
+      md5 = "f2253de78085a1d5738f626fcc1d8f71";
+    };
+
+    meta = {
+      homepage = http://code.google.com/p/feedparser/;
+      description = "Universal feed parser";
+      license = stdenv.lib.licenses.bsd2;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  });
+
+
   flake8 = buildPythonPackage (rec {
     name = "flake8-1.7.0";
 
@@ -1003,6 +1037,26 @@ pythonPackages = python.modules // rec {
   };
 
 
+  flexget = buildPythonPackage (rec { 
+    name = "FlexGet-1.0.3353";
+
+    src = fetchurl {
+      url = "http://download.flexget.com/archive/${name}.tar.gz";
+      md5 = "cffc4e51b5c5efddb339d265524e46b8";
+    };
+
+    buildInputs = [ nose ];
+    propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar ];
+
+    meta = {
+      homepage = http://flexget.com/;
+      description = "Multipurpose automation tool for content like torrents, ...";
+      license = stdenv.lib.licenses.mit;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  });
+
+
   flup = buildPythonPackage (rec {
     name = "flup-1.0.2";
 
@@ -1199,6 +1253,21 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  html5lib = buildPythonPackage (rec { 
+    name = "html5lib-0.95";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/h/html5lib/${name}.tar.gz";
+      md5 = "fe607f9917d81763e842f818f23464ee";
+    };
+
+    meta = {
+      homepage = http://code.google.com/p/html5lib/;
+      description = "HTML parser based on WHAT-WG HTML5 specification";
+      license = stdenv.lib.licenses.mit;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  });
 
   httplib2 = buildPythonPackage rec {
     name = "httplib2-0.7.7";
@@ -2452,6 +2521,56 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  pyrss2gen = buildPythonPackage (rec { 
+    name = "PyRSS2Gen-1.0.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/PyRSS2Gen/${name}.tar.gz";
+      md5 = "eae2bc6412c5679c287ecc1a59588f75";
+    };
+
+    meta = {
+      homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html;
+      description = "Library for generating RSS 2.0 feeds";
+      license = stdenv.lib.licenses.bsd2;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  });
+
+  pynzb = buildPythonPackage (rec { 
+    name = "pynzb-0.1.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pynzb/${name}.tar.gz";
+      md5 = "63c74a36348ac28aa99732dcb8be8c59";
+    };
+
+    meta = {
+      homepage = http://github.com/ericflo/pynzb;
+      description = "Unified API for parsing NZB files";
+      license = stdenv.lib.licenses.bsd;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  });
+
+  progressbar = buildPythonPackage (rec { 
+    name = "progressbar-2.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/progressbar/${name}.tar.gz";
+      md5 = "8ea4e2c17a8ec9e7d153767c5f2a7b28";
+    };
+
+    # invalid command 'test'
+    doCheck = false;
+
+    meta = {
+      homepage = http://code.google.com/p/python-progressbar/;
+      description = "Text progressbar library for python";
+      license = stdenv.lib.licenses.lgpl;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  });
 
   ldap = buildPythonPackage rec {
     name = "python-ldap-2.4.3";
@@ -3173,11 +3292,11 @@ pythonPackages = python.modules // rec {
 
 
   sqlalchemy = buildPythonPackage {
-    name = "sqlalchemy-0.6.6";
+    name = "sqlalchemy-0.7.9";
 
     src = fetchurl {
-      url = mirror://sourceforge/sqlalchemy/0.6.6/SQLAlchemy-0.6.6.tar.gz;
-      sha256 = "0inj9b66pi447cw500mqn7d09dij20ic3k5bnyhj6rpdl2l83a0l";
+      url = mirror://sourceforge/sqlalchemy/0.7.9/SQLAlchemy-0.7.9.tar.gz;
+      md5 = "c4852d586d95a59fbc9358f4467875d5";
     };
 
     buildInputs = [ nose ];
-- 
cgit 1.4.1


From 19ab71ff7a05cf946736cb43825303c663483860 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Feb 2013 16:30:15 +0100
Subject: releaseTools.nixBuild: Put hydra-build-products in each output

Putting a single hydra-build-products in $out can cause $out to have
unnecessary dependencies on other outputs.
---
 pkgs/build-support/release/nix-build.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index a107e6522913..84dd29867500 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -77,7 +77,8 @@ stdenv.mkDerivation (
       if [ -z "${toString doCoverageAnalysis}" ]; then
           for i in $outputs; do
               if [ "$i" = out ]; then j=none; else j="$i"; fi
-              echo "nix-build $j ''${!i}" >> $out/nix-support/hydra-build-products
+              mkdir -p ''${!i}/nix-support
+              echo "nix-build $j ''${!i}" >> ''${!i}/nix-support/hydra-build-products
           done
       fi
     '';
-- 
cgit 1.4.1


From 679150157bfedaac362815de87a56a2d6fc667ec Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Mon, 18 Feb 2013 21:05:08 +0800
Subject: emacs: add "auto-complete-clang-async" mode (aka
 emacs-clang-complete-async)

---
 .../emacs-clang-complete-async/default.nix         | 26 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
new file mode 100644
index 000000000000..9db6e4cb7364
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
@@ -0,0 +1,26 @@
+{ clangStdenv, fetchgit, llvm, clangUnwrapped }:
+
+clangStdenv.mkDerivation {
+  name = "emacs-clang-complete-async-20130218";
+  src = fetchgit {
+    url = "git://github.com/Golevka/emacs-clang-complete-async.git";
+    rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
+    sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
+  };
+
+  buildInputs = [ llvm clangUnwrapped ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/emacs/site-lisp
+    install -m 755 clang-complete $out/bin
+    install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    homepage = "https://github.com/Golevka/emacs-clang-complete-async";
+    description = "An emacs plugin to complete C and C++ code using libclang";
+    license = "GPLv3+";
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2c6f85ef697..f85f88285232 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6896,6 +6896,8 @@ let
 
     jabber = callPackage ../applications/editors/emacs-modes/jabber { };
 
+    emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
+
     emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
 
     emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };
-- 
cgit 1.4.1


From 9d73b9ca5101856a6e34a65033e69f8baf4df950 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 18 Feb 2013 14:08:48 +0100
Subject: Add beets and it's dependencies

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

(limited to 'pkgs')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf9bea000f8c..19d7930b41ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -275,6 +275,29 @@ pythonPackages = python.modules // rec {
     propagatedBuildInputs = [ logilab_common ];
   };
 
+
+  beets = buildPythonPackage rec {
+    name = "beets-1.0.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz";
+      md5 = "88ad09a93aa0d69ce813205cf23b2a6c";
+    };
+
+    # tests depend on $HOME setting
+    configurePhase = "export HOME=$TMPDIR";
+
+    propagatedBuildInputs = [ pyyaml unidecode mutagen munkres musicbrainzngs python.modules.sqlite3 python.modules.readline ];
+
+    meta = {
+      homepage = http://beets.radbox.org;
+      description = "Music tagger and library organizer";
+      license = pkgs.lib.licenses.mit;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
   beautifulsoup = buildPythonPackage (rec {
     name = "beautifulsoup-3.0.8";
 
@@ -1624,6 +1647,43 @@ pythonPackages = python.modules // rec {
   };
 
 
+  munkres = buildPythonPackage rec {
+    name = "munkres-1.0.5.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/m/munkres/${name}.tar.gz";
+      md5 = "cb9d114fb523428bab4742e88bc83696";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = {
+      homepage = http://bmc.github.com/munkres/;
+      description = "Munkres algorithm for the Assignment Problem";
+      license = pkgs.lib.licenses.bsd3;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  musicbrainzngs = buildPythonPackage rec {
+    name = "musicbrainzngs-0.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz";
+      md5 = "bc32aa1cf121f29c3ca1c06e9668865f";
+    };
+
+    meta = {
+      homepage = http://alastair/python-musicbrainz-ngs;
+      description = "Python bindings for musicbrainz NGS webservice";
+      license = pkgs.lib.licenses.bsd2;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
   mutagen = buildPythonPackage (rec {
     name = "mutagen-1.20";
 
@@ -4389,6 +4449,23 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  unidecode = buildPythonPackage rec {
+    name = "Unidecode-0.04.12";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/U/Unidecode/${name}.tar.gz";
+      md5 = "351dc98f4512bdd2e93f7a6c498730eb";
+    };
+
+    meta = {
+      homepage = http://pypi.python.org/pypi/Unidecode/;
+      description = "ASCII transliterations of Unicode text";
+      license = pkgs.lib.licenses.gplv2;
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
   txamqp = buildPythonPackage rec {
     name = "txamqp-${version}";
     version = "0.3";
-- 
cgit 1.4.1


From 7408c3babff1a21339d6fa3f16fc39a638a9a1ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Feb 2013 16:12:43 +0100
Subject: python-progressbar: fix license attribute

---
 pkgs/top-level/python-packages.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53c0691aba37..ab8f181bd3ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -316,7 +316,7 @@ pythonPackages = python.modules // rec {
     };
   });
 
-  beautifulsoup4 = buildPythonPackage (rec { 
+  beautifulsoup4 = buildPythonPackage (rec {
     name = "beautifulsoup4-4.1.3";
 
     src = fetchurl {
@@ -442,7 +442,7 @@ pythonPackages = python.modules // rec {
    # It makes buildout useful in a nix profile, but this alters the default functionality
    patchPhase = ''
      sed -i "s/return (stdlib, site_paths)/return (stdlib, sys.path)/g" src/zc/buildout/easy_install.py
-   ''; 
+   '';
 
    meta = {
       homepage = http://www.buildout.org/;
@@ -1003,7 +1003,7 @@ pythonPackages = python.modules // rec {
   };
 
 
-  feedparser = buildPythonPackage (rec { 
+  feedparser = buildPythonPackage (rec {
     name = "feedparser-5.1.3";
 
     src = fetchurl {
@@ -1060,7 +1060,7 @@ pythonPackages = python.modules // rec {
   };
 
 
-  flexget = buildPythonPackage (rec { 
+  flexget = buildPythonPackage (rec {
     name = "FlexGet-1.0.3353";
 
     src = fetchurl {
@@ -1276,7 +1276,7 @@ pythonPackages = python.modules // rec {
     };
   };
 
-  html5lib = buildPythonPackage (rec { 
+  html5lib = buildPythonPackage (rec {
     name = "html5lib-0.95";
 
     src = fetchurl {
@@ -2581,7 +2581,7 @@ pythonPackages = python.modules // rec {
     };
   };
 
-  pyrss2gen = buildPythonPackage (rec { 
+  pyrss2gen = buildPythonPackage (rec {
     name = "PyRSS2Gen-1.0.0";
 
     src = fetchurl {
@@ -2597,7 +2597,7 @@ pythonPackages = python.modules // rec {
     };
   });
 
-  pynzb = buildPythonPackage (rec { 
+  pynzb = buildPythonPackage (rec {
     name = "pynzb-0.1.0";
 
     src = fetchurl {
@@ -2613,7 +2613,7 @@ pythonPackages = python.modules // rec {
     };
   });
 
-  progressbar = buildPythonPackage (rec { 
+  progressbar = buildPythonPackage (rec {
     name = "progressbar-2.2";
 
     src = fetchurl {
@@ -2627,7 +2627,7 @@ pythonPackages = python.modules // rec {
     meta = {
       homepage = http://code.google.com/p/python-progressbar/;
       description = "Text progressbar library for python";
-      license = stdenv.lib.licenses.lgpl;
+      license = stdenv.lib.licenses.lgpl3Plus;
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   });
@@ -4298,7 +4298,7 @@ pythonPackages = python.modules // rec {
       url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
       md5 = "e7e581af8193551831560a736a53cf58";
     };
-    
+
     propagatedBuildInputs = [ zope_event zope_interface zope_testing ];
 
     # ignore circular dependency on zope_location
-- 
cgit 1.4.1


From f4a51bbdd6755bc7d1d79d58711c20a3612023ca Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 18 Feb 2013 11:34:19 -0500
Subject: Linux 3.0.65

---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 9f736f024026..b7ccdde367c5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -230,7 +230,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.0.64";
+    version = "3.0.65";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -238,7 +238,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-      sha256 = "0vya753ayxzjk7ymnw5i2rwcpxp8lss7xf1gl7fzakn6kz780nky";
+      sha256 = "1vmk0bmg0djwbh9scrhpyljan01ygkwn4q0j1ydn8snag7sn4x8y";
     };
 
     config = configWithPlatform stdenv.platform;
-- 
cgit 1.4.1


From 0e4c3a1fc92b511e79180fa02abed7f4563ba2cd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 18 Feb 2013 11:34:42 -0500
Subject: Linux 3.4.32

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 47ab87d2f341..0e0329359002 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -244,7 +244,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.4.31";
+    version = "3.4.32";
     testing = false;
 
     preConfigure = ''
@@ -253,7 +253,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1148f77iab0p5j61v42a4jka4ndwnjpd6lkqhwiqs61lmv3m7j2r";
+      sha256 = "0z218ibz36lpdyjjch94jx12fcghj376x3fkmgxmwdjaz7zngn4i";
     };
 
     config = configWithPlatform stdenv.platform;
-- 
cgit 1.4.1


From a4d5e4a9e2bd231721ad96ef261558ead28490c4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 18 Feb 2013 11:35:22 -0500
Subject: Linux 3.7.9

---
 pkgs/os-specific/linux/kernel/linux-3.7.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix
index 5479edf8c44f..9c96c2a8fd26 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.7.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix
@@ -250,7 +250,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.7.8";
+    version = "3.7.9";
     testing = false;
 
     preConfigure = ''
@@ -259,7 +259,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0phn7a6sfc89n3p6irk349jcxfaa5fi04in9h4wsm25klgw16vxa";
+      sha256 = "1d9834flw0jyfn0lq1l0ahp8v12p227qn6z39v1pk53dap1zl0v1";
     };
 
     config = configWithPlatform stdenv.platform;
-- 
cgit 1.4.1


From fbe4e1af93247bbe37222c4728d390db943ef747 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Feb 2013 21:10:56 +0100
Subject: pynzb: fix license attribute

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab8f181bd3ca..5ff8a8177f21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2608,7 +2608,7 @@ pythonPackages = python.modules // rec {
     meta = {
       homepage = http://github.com/ericflo/pynzb;
       description = "Unified API for parsing NZB files";
-      license = stdenv.lib.licenses.bsd;
+      license = stdenv.lib.licenses.bsd3;
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   });
-- 
cgit 1.4.1


From f81dbf4893a889ba6e6885b461ed47635e4aab7d Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Mon, 18 Feb 2013 21:46:15 +0100
Subject: wicd: NixOS/nixos#88 add resolvconf to PATH for wicd

with this patch resolvconf is used to set the DNS via wicd, although
this doesn't seem to stop dhcpcd from clobbering /etc/resolv.conf
---
 pkgs/tools/networking/wicd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 6332ff8ad5db..57c2e1d6d3c8 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, 
- wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, iproute,
+ wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute,
  locale ? "C" }:
 
 # Wicd has a ncurses interface that we do not build because it depends
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     
     substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
     
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in
+    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
     sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
-- 
cgit 1.4.1


From 9aa47b62b63007aeb331bac0457b036acf40fc82 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Mon, 18 Feb 2013 22:12:11 +0100
Subject: Adding snappy 1.1.0

---
 pkgs/development/libraries/snappy/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/snappy/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
new file mode 100644
index 000000000000..04e0897207f3
--- /dev/null
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "snappy-1.1.0";
+  
+  src = fetchurl {
+    url = "http://snappy.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0q31cx3zkw0apx1fy8z3xlh2lvivssvykqn0vxsgm4xvi32jpa0z";
+  };
+
+  # -DNDEBUG for speed
+  preConfigure = ''
+    configureFlagsArray=("CXXFLAGS=-DNDEBUG -O2")
+  '';
+
+  doCheck = true;
+
+  meta = {
+    homepage = http://code.google.com/p/snappy/
+    license = "BSD"
+    description = "Compression/decompression library for very high speeds";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f85f88285232..7a4e5d0184a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4964,6 +4964,8 @@ let
         # optional
   };
 
+  snappy = callPackage ../development/libraries/snappy { };
+
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
 
   soprano = callPackage ../development/libraries/soprano { };
-- 
cgit 1.4.1


From 4400a752e9cf488470d4ba73729a6ac8d90afc18 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Mon, 18 Feb 2013 22:47:41 +0100
Subject: Add aespipe, an AES encrypting or decrypting pipe

---
 pkgs/tools/security/aespipe/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/security/aespipe/default.nix

(limited to 'pkgs')

diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
new file mode 100644
index 000000000000..b16adbea8684
--- /dev/null
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "aespipe-${version}";
+  version = "v2.4c";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/loop-aes/aespipe/${name}.tar.bz2";
+    sha256 = "0pl49jnjczjvfxwm9lw576qsjm1lxh8gc4g776l904cixaz90096";
+  };
+
+  meta = {
+    description = "AES encrypting or decrypting pipe";
+    homepage = http://loop-aes.sourceforge.net/aespipe.README;
+    license = "GPL";
+    maintainers = stdenv.lib.maintainers.goibniu;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a4e5d0184a9..c5a5ff40bba5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -370,6 +370,8 @@ let
 
   aefs = callPackage ../tools/filesystems/aefs { };
 
+  aespipe = callPackage ../tools/security/aespipe { };
+
   aircrackng = callPackage ../tools/networking/aircrack-ng { };
 
   analog = callPackage ../tools/admin/analog {};
-- 
cgit 1.4.1


From 13fcbc7bafcad69b8488f565a9d75c140ea66389 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 19 Feb 2013 04:46:47 +0100
Subject: notmuch: update from 0.14 to 0.15

---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 9d7126452c9a..147d5f491517 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-0.14";
+  name = "notmuch-0.15";
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753";
+    sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q";
   };
 
   buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     description = "Notmuch -- The mail indexer";
     longDescription = "";
     license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+    maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }
-- 
cgit 1.4.1


From 42738b29fcb445cc764285a12e51914924c4c3a6 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 19 Feb 2013 04:48:14 +0100
Subject: alot: update to last working revision

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ff8a8177f21..7a963849bba5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -119,13 +119,13 @@ pythonPackages = python.modules // rec {
 
 
   alot = buildPythonPackage rec {
-    rev = "6b5f1a8bf68eecf4364f97c71ec177cf715c081e";
+    rev = "c765ebd6041a845a800cc9fd30705102ae2d040f";
     name = "alot-0.3.3_${rev}";
 
     src = fetchurl {
       url = "https://github.com/pazz/alot/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "1l6b5gy0z549p54p2va1q7pxyiwb6ghqfy6gdm3kg1np9hw59rl4";
+      sha256 = "0yyp3nz5n1zfwf0l4rkkphq5l6prd988b57ighnmi2samzqa9yv4";
     };
 
     # error: invalid command 'test'
-- 
cgit 1.4.1


From e7f1aeb2c53ebe967d1cf243c4749029d2c20538 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 19 Feb 2013 04:48:55 +0100
Subject: turses: update to 0.2.12 and its dependency tweepy to 2.0

---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a963849bba5..ec049f6cede9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3573,11 +3573,11 @@ pythonPackages = python.modules // rec {
 
 
   turses = buildPythonPackage (rec {
-    name = "turses-0.2.11";
+    name = "turses-0.2.12";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
-      sha256 = "0zd0fjb5rr5if8wp6kmi29wrkj7ypp4vz00xxb0if1kjrakczlvm";
+      sha256 = "016fw2ch1gy3rrlfjsdpd6y11mkrbjw4h84h7954k2vhc84l1gm0";
     };
 
     propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;
@@ -3596,11 +3596,11 @@ pythonPackages = python.modules // rec {
   });
 
   tweepy = buildPythonPackage (rec {
-    name = "tweepy-1.13";
+    name = "tweepy-2.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
-      sha256 = "1gaki8qvzi72jaj5xls51lc6fgs1xnm9c6jgpirwklpdn7y8wyy5";
+      sha256 = "1b95xcw11b5871gd4br78hxbvcq8y9f0i0sqga85dgg9hnmvdcx0";
     };
 
     meta = {
-- 
cgit 1.4.1


From cde20d69515e38b2fd45f4aa1387f52edb02885c Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Tue, 19 Feb 2013 10:50:21 +0100
Subject: Fixing openssh hpn support for 6.1p1

I had to write a weird download derivation to overcome their download procedure.
---
 pkgs/tools/networking/openssh/default.nix | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index c1504697a186..78294d529a7c 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,13 +1,30 @@
-{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam
+{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam, curl
 , etcDir ? null
 , hpnSupport ? false
 }:
 
 let
 
-  hpnSrc = fetchurl {
-    url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v12.diff.gz;
-    sha256 = "0h1h45vic4zks5bc5mvkc50rlgy2c219vn3rmpmalgm5hws9qjbl";
+  # Ugly download
+  hpnSrc = stdenv.mkDerivation {
+    name = "openssh-6.1p1-hpn13v14.diff.gz";
+
+    buildInputs = [ curl ];
+
+    url = "http://www.psc.edu/index.php/component/remository/HPN-SSH/OpenSSH-6.1-Patches/HPN-SSH-Kitchen-Sink-Patch-for-OpenSSH-6.1/";
+
+    phases = [ "installPhase" ];
+
+    installPhase = ''
+      URL2=$(curl -c cookies.jar "$url" | grep "window.location" |
+        sed 's,.*\(http:/.*\)'"'"'},\1,')
+      URL3=$(curl -b cookies.jar -c cookies.jar "$URL2" | grep "window.location" |
+        sed 's,.*\(http:/.*\)'"'"'},\1,')
+      curl -b cookies.jar "$URL3" > $out
+    '';
+
+    outputHashAlgo = "sha256";
+    outputHash = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq";
   };
 
 in
-- 
cgit 1.4.1


From 3a1d3990e5c12566f9a0552107523b725469e413 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Feb 2013 11:02:20 +0100
Subject: openssh: Just use a mirror of the HPN patch

---
 pkgs/tools/networking/openssh/default.nix | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 78294d529a7c..2d60b0f0e304 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,30 +1,13 @@
-{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam, curl
+{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam
 , etcDir ? null
 , hpnSupport ? false
 }:
 
 let
 
-  # Ugly download
-  hpnSrc = stdenv.mkDerivation {
-    name = "openssh-6.1p1-hpn13v14.diff.gz";
-
-    buildInputs = [ curl ];
-
-    url = "http://www.psc.edu/index.php/component/remository/HPN-SSH/OpenSSH-6.1-Patches/HPN-SSH-Kitchen-Sink-Patch-for-OpenSSH-6.1/";
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      URL2=$(curl -c cookies.jar "$url" | grep "window.location" |
-        sed 's,.*\(http:/.*\)'"'"'},\1,')
-      URL3=$(curl -b cookies.jar -c cookies.jar "$URL2" | grep "window.location" |
-        sed 's,.*\(http:/.*\)'"'"'},\1,')
-      curl -b cookies.jar "$URL3" > $out
-    '';
-
-    outputHashAlgo = "sha256";
-    outputHash = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq";
+  hpnSrc = fetchurl {
+    url = http://nixos.org/tarballs/openssh-6.1p1-hpn13v14.diff.gz;
+    sha256 = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq";
   };
 
 in
@@ -42,7 +25,7 @@ stdenv.mkDerivation rec {
       gunzip -c ${hpnSrc} | patch -p1
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
-    
+
   patches = [ ./locale_archive.patch ];
 
   buildNativeInptus = [ perl ];
-- 
cgit 1.4.1


From 08819d1aedacfad2e68eb39f9fb298a0cb844d84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Feb 2013 11:23:28 +0100
Subject: Fix evaluation

---
 pkgs/development/libraries/snappy/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 04e0897207f3..ff1bfa7d4eb3 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = http://code.google.com/p/snappy/
-    license = "BSD"
+    homepage = http://code.google.com/p/snappy/;
+    license = "BSD";
     description = "Compression/decompression library for very high speeds";
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec049f6cede9..756509a4b956 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4580,7 +4580,7 @@ pythonPackages = python.modules // rec {
     meta = {
       homepage = http://pypi.python.org/pypi/Unidecode/;
       description = "ASCII transliterations of Unicode text";
-      license = pkgs.lib.licenses.gplv2;
+      license = pkgs.lib.licenses.gpl2;
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   };
-- 
cgit 1.4.1


From dfebdde16f9e4a3b358b3e603ecac7bbe4a9646d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Feb 2013 10:14:09 +0100
Subject: texinfo: added version 5.0

---
 pkgs/development/tools/misc/texinfo/4.13a.nix   | 40 +++++++++++++++++++++++++
 pkgs/development/tools/misc/texinfo/5.0.nix     | 36 ++++++++++++++++++++++
 pkgs/development/tools/misc/texinfo/default.nix | 40 -------------------------
 pkgs/top-level/all-packages.nix                 |  5 ++--
 4 files changed, 79 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/development/tools/misc/texinfo/4.13a.nix
 create mode 100644 pkgs/development/tools/misc/texinfo/5.0.nix
 delete mode 100644 pkgs/development/tools/misc/texinfo/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
new file mode 100644
index 000000000000..111f2d142008
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/4.13a.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, ncurses, lzma }:
+
+stdenv.mkDerivation rec {
+  name = "texinfo-4.13a";
+
+  src = fetchurl {
+    url = "mirror://gnu/texinfo/texinfo-4.13a.tar.lzma";
+    sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
+  };
+
+  buildInputs = [ ncurses ];
+  buildNativeInputs = [ lzma ];
+
+  # Disabled because we don't have zdiff in the stdenv bootstrap.
+  #doCheck = true;
+
+  meta = {
+    description = "GNU Texinfo, the GNU documentation system";
+
+    longDescription = ''
+      Texinfo is the official documentation format of the GNU project.
+      It was invented by Richard Stallman and Bob Chassell many years
+      ago, loosely based on Brian Reid's Scribe and other formatting
+      languages of the time.  It is used by many non-GNU projects as
+      well.
+
+      Texinfo uses a single source file to produce output in a number
+      of formats, both online and printed (dvi, html, info, pdf, xml,
+      etc.).  This means that instead of writing different documents
+      for online information and another for a printed manual, you
+      need write only one document.  And when the work is revised, you
+      need revise only that one document.  The Texinfo system is
+      well-integrated with GNU Emacs.
+    '';
+
+    license = "GPLv3+";
+
+    homepage = http://www.gnu.org/software/texinfo/;
+  };
+}
diff --git a/pkgs/development/tools/misc/texinfo/5.0.nix b/pkgs/development/tools/misc/texinfo/5.0.nix
new file mode 100644
index 000000000000..a4fb2e9b4688
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/5.0.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, ncurses, perl }:
+
+stdenv.mkDerivation rec {
+  name = "texinfo-5.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/texinfo/${name}.tar.xz";
+    sha256 = "1p34f68h9ggfj6ckgj0p62qlj7pmz3ha3vc91kh4hr44pnwm1pla";
+  };
+
+  buildInputs = [ ncurses perl ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = "http://www.gnu.org/software/texinfo/";
+    description = "GNU Texinfo, the GNU documentation system";
+    license = stdenv.lib.licenses.gpl3Plus;
+
+    longDescription = ''
+      Texinfo is the official documentation format of the GNU project.
+      It was invented by Richard Stallman and Bob Chassell many years
+      ago, loosely based on Brian Reid's Scribe and other formatting
+      languages of the time.  It is used by many non-GNU projects as
+      well.
+
+      Texinfo uses a single source file to produce output in a number
+      of formats, both online and printed (dvi, html, info, pdf, xml,
+      etc.).  This means that instead of writing different documents
+      for online information and another for a printed manual, you
+      need write only one document.  And when the work is revised, you
+      need revise only that one document.  The Texinfo system is
+      well-integrated with GNU Emacs.
+    '';
+  };
+}
diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix
deleted file mode 100644
index 111f2d142008..000000000000
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, ncurses, lzma }:
-
-stdenv.mkDerivation rec {
-  name = "texinfo-4.13a";
-
-  src = fetchurl {
-    url = "mirror://gnu/texinfo/texinfo-4.13a.tar.lzma";
-    sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
-  };
-
-  buildInputs = [ ncurses ];
-  buildNativeInputs = [ lzma ];
-
-  # Disabled because we don't have zdiff in the stdenv bootstrap.
-  #doCheck = true;
-
-  meta = {
-    description = "GNU Texinfo, the GNU documentation system";
-
-    longDescription = ''
-      Texinfo is the official documentation format of the GNU project.
-      It was invented by Richard Stallman and Bob Chassell many years
-      ago, loosely based on Brian Reid's Scribe and other formatting
-      languages of the time.  It is used by many non-GNU projects as
-      well.
-
-      Texinfo uses a single source file to produce output in a number
-      of formats, both online and printed (dvi, html, info, pdf, xml,
-      etc.).  This means that instead of writing different documents
-      for online information and another for a printed manual, you
-      need write only one document.  And when the work is revised, you
-      need revise only that one document.  The Texinfo system is
-      well-integrated with GNU Emacs.
-    '';
-
-    license = "GPLv3+";
-
-    homepage = http://www.gnu.org/software/texinfo/;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5a5ff40bba5..2beabc6a3272 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3342,9 +3342,10 @@ let
 
   swftools = callPackage ../tools/video/swftools { };
 
+  texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
   texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { };
-
-  texinfo = callPackage ../development/tools/misc/texinfo { };
+  texinfo5 = callPackage ../development/tools/misc/texinfo/5.0.nix { };
+  texinfo = texinfo413;
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
-- 
cgit 1.4.1


From 7dfd7a93d43eb391e1177b881cc40ed47706ddca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Feb 2013 13:26:01 +0100
Subject: haskell-BNFC: fix broken version number in executable

---
 pkgs/development/tools/haskell/BNFC/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix
index c6cbc4a53587..3cb85b86acbd 100644
--- a/pkgs/development/tools/haskell/BNFC/default.nix
+++ b/pkgs/development/tools/haskell/BNFC/default.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl }:
+{ cabal, mtl, fetchurl }:
 
 cabal.mkDerivation (self: {
   pname = "BNFC";
@@ -7,6 +7,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl ];
+  patches = [ (fetchurl { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "103l04ylzswgxrmpv5zy6dd0jyr96z21mdkpgk1z4prvn8wjl624"; }) ];
+  patchFlags = "-p2";
   meta = {
     homepage = "http://bnfc.digitalgrammars.com/";
     description = "A compiler front-end generator";
-- 
cgit 1.4.1