From ef926f21e635fa8ce7be385f11ffdf108eeea91b Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 4 Jan 2013 03:07:46 +0000 Subject: [PATCH 1/2] maildrop: add version 2.6.0 --- pkgs/tools/networking/maildrop/default.nix | 20 +++++++++++++++++++ .../maildrop/maildrop.configure.hack.patch | 13 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/tools/networking/maildrop/default.nix create mode 100644 pkgs/tools/networking/maildrop/maildrop.configure.hack.patch diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix new file mode 100644 index 000000000000..b91282c9a2b4 --- /dev/null +++ b/pkgs/tools/networking/maildrop/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, pkgconfig, pcre, perl }: + +stdenv.mkDerivation rec { + name = "maildrop-2.6.0"; + + src = fetchurl { + url = "mirror://sourceforge/courier/maildrop/2.6.0/maildrop-2.6.0.tar.bz2"; + sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg"; + }; + + buildInputs = [ pkgconfig pcre perl ]; + + patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot + + meta = { + homepage = http://www.courier-mta.org/maildrop/; + description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; + licenses = [ "GPLv3" ]; + }; +} diff --git a/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch b/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch new file mode 100644 index 000000000000..08988f6cde50 --- /dev/null +++ b/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch @@ -0,0 +1,13 @@ +--- a/maildrop/configure 2012-09-06 01:52:13.000000000 +0100 ++++ b/maildrop/configure 2013-01-04 03:00:57.095628327 +0000 +@@ -17562,8 +17562,8 @@ + check_spooldir() { + if test "$CHECKED_SPOOLDIR" != 1 + then +- get_spooldir +- MBOX_DIR="$SPOOLDIR" ++ MBOX_DIR="/var/spool/mail" ++ MBOX_RESET_GID=0 + CHECKED_SPOOLDIR=1 + fi + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 807032672176..ff1c4ab177ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1054,6 +1054,8 @@ let lzop = callPackage ../tools/compression/lzop { }; + maildrop = callPackage ../tools/networking/maildrop { }; + mailutils = callPackage ../tools/networking/mailutils { guile = guile_1_8; }; From e00c03101f8d052473fee17e5f7a6a975dc5edb4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 4 Jan 2013 03:48:47 +0000 Subject: [PATCH 2/2] anki: add version 2.0.3 --- pkgs/games/anki/default.nix | 67 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/games/anki/default.nix diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix new file mode 100644 index 000000000000..d2e438dfa7b1 --- /dev/null +++ b/pkgs/games/anki/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl +, python, pyqt4, pythonPackages +# This little flag adds a huge number of dependencies, but we assume that +# everyone wants Anki to draw plots with statistics by default. +, plotsSupport ? true }: + +let + py = pythonPackages; +in + +stdenv.mkDerivation rec { + name = "anki-2.0.3"; + src = fetchurl { + url = "http://ankisrs.net/download/mirror/${name}.tgz"; + sha256 = "f40ee4ef29c91101cf9978ce7bd4c513f13ca7c77497a3fb50b8128adf3a5178"; + }; + + pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy ] + ++ lib.optional plotsSupport py.matplotlib; + + buildInputs = [ python py.wrapPython ]; + + preConfigure = '' + substituteInPlace anki \ + --replace /usr/share/ $out/share/ + + substituteInPlace Makefile \ + --replace PREFIX=/usr PREFIX=$out \ + --replace /local/bin/ /bin/ + + sed -i '/xdg-mime/ d' Makefile + ''; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/pixmaps + mkdir -p $out/share/applications + mkdir -p $out/share/man/man1 + ''; + + postInstall = '' + wrapPythonPrograms + ''; + + meta = { + homepage = http://ankisrs.net/; + description = "Spaced repetition flashcard program"; + # Copy-pasted from the homepage + longDescription = '' + Anki is a program which makes remembering things easy. Because it is a lot + more efficient than traditional study methods, you can either greatly + decrease your time spent studying, or greatly increase the amount you learn. + + Anyone who needs to remember things in their daily life can benefit from + Anki. Since it is content-agnostic and supports images, audio, videos and + scientific markup (via LaTeX), the possibilities are endless. For example: + + * learning a language + * studying for medical and law exams + * memorizing people's names and faces + * brushing up on geography + * mastering long poems + * even practicing guitar chords! + ''; + license = "GPLv3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff1c4ab177ea..df1a4e1f5fc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8166,6 +8166,8 @@ let andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null; + anki = callPackage ../games/anki { }; + asc = callPackage ../games/asc { lua = lua5; libsigcxx = libsigcxx12;