From 886742d91a509474af89a888ca9fe4a26c2374c9 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 14 Dec 2012 20:21:18 +0100 Subject: [PATCH 001/162] use recursivePthLoader instead of setuptoolsSite --- pkgs/development/python-modules/generic/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8da833b0dc1a..4494392cfef4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, offlineDistutils, setuptoolsSite }: +{ python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }: { name, namePrefix ? "python-" @@ -51,8 +51,8 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - # setuptoolsSite is responsible for loading pth files - propagatedBuildInputs = propagatedBuildInputs ++ [ setuptoolsSite ]; + # recursivePthLoader is responsible for loading pth files + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; buildInputStrings = map toString buildInputs; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7dad6abe4194..ba1068a112e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,7 +9,7 @@ let pythonPackages = python.modules // rec { buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; - inherit python wrapPython setuptools setuptoolsSite offlineDistutils; + inherit python wrapPython setuptools recursivePthLoader offlineDistutils; }; From ad55bb39baa1c9c892f0ed6b14b40f79bfab6b65 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 00:46:55 +0100 Subject: [PATCH 002/162] prefix setuptools -> python-setuptools --- pkgs/development/python-modules/setuptools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 879f6aed8dee..468ea50c9243 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { - name = "setuptools-" + version; + name = "python-setuptools-" + version; version = "0.6c11"; From b19162f88b01a6d5dc100ede9beefd53f036cc33 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 01:17:22 +0100 Subject: [PATCH 003/162] release-python.nix used by hydra python-rework jobset define full job attributes (not just systems) so we can define schedulingPriority without touching release-lib.nix. There is definitely a more elegant way to recursively walk attributes and fill in missing values (job and schedulingPriority). --- pkgs/top-level/release-python.nix | 2173 +++++++++++++++++++++++++++++ 1 file changed, 2173 insertions(+) create mode 100644 pkgs/top-level/release-python.nix diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix new file mode 100644 index 000000000000..521800647ec3 --- /dev/null +++ b/pkgs/top-level/release-python.nix @@ -0,0 +1,2173 @@ +/* + This file will be evaluated by hydra with a call like this: + hydra_eval_jobs --gc-roots-dir \ + /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \ + system i686-linux --argstr system x86_64-linux --arg \ + nixpkgs "{outPath = ./}" .... release.nix + + Hydra can be installed with "nix-env -i hydra". +*/ +with (import ./release-lib.nix); + +{ + + tarball = import ./make-tarball.nix; + +} // (mapTestOn rec { + + a2jmidid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aacskeys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2005 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2006 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2007 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2008 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2009 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2010 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2011 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + abc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + abcde = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + abiword = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + acl2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + adobeReader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + agg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alienarena = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + allegro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + allegro5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alliance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alsaPlugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alsaPluginWrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amsn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amule = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amuleDaemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amuleGui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + androidsdk_4_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + andyetitmoves = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ant = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + antlr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + antlr3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apacheAntGcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apacheAntOpenJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apacheAntOracleJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apparmor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aqbanking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + arb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ardour = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ardour3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + arora = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + asc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + asciidoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + asio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aspectj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + asymptote = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atanks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atari800 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ataripp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atermjava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atkmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + attica = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aubio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + auctex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + audacious = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + audacity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + autojump = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + automoc4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + avahi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + avidemux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + avogadro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + awesome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aws_mturk_clt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + axis2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + azureus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ballAndPaddle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + baresip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bazaar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + beast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + beret = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ber_metaocaml_003 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bibletime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bibtextools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + binutils_gold = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + biolib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bitcoin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bitlbee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bitsnbots = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bittornado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bittorrent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blackshades = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blackshadeselite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blender = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blobby = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blueman = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bluez = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boinc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boomerang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost144 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost146 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost147 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost149 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost151 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + botan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + box2d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + box2d_2_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + briss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bsddb3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + btanks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + btrfsProgs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + buildbot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bumblebee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bzflag = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + caelum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cairomm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + calf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + calibre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + caneda = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + carrier = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + castle_combat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cbrowser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cc1394 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ccid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cdrdao = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + centerim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cflow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cgal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + chatzilla = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cheetahTemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + chipmunk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + chromiumWrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + chromium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cilaterm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cinelerra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cinepaint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ciopfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clangUnwrapped = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clanlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + classpath = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clearsilver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clisp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clisp_2_44_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clojure = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clojure_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clooj_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clucene_core_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clutter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clutter_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clutter_gtk_0_10 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cmakeWithGui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cmus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coccinelle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cogl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coin3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + comical = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + compiz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + compton = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + conkeror = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + conky = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + consolekit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + construo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + construoBase = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + content = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coq_8_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coriander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + couchdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + crack_attack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + crrcsim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cryptsetup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + csound = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + csslint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cudatoolkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cuneiform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cups_pdf_filter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + curlftpfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cvs2svn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + d4x = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + darktable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dblatex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbus_cplusplus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbus_glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbus_java = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbus_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ddd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + debian_devscripts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dejagnu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + desktop_file_utils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + devicemapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dico = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + directfb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + directvnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + disnix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + disnixos = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + DisnixWebService = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + disper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + distcc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + distrho = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + djview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dmenu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dmraid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dmtcp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dmtx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + docutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dosbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + doxygen_gui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dragonegg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + drbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + drgeo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dropbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dssi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dstat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + duplicity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dvdauthor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dvswitch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dwarf_fortress = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eaglemode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + easytag = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ec2_api_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ecj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipses = { + eclipse_cpp_36 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_cpp_37 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_modeling_36 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_sdk_35 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_sdk_36 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_sdk_37 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_sdk_42 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + ecryptfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + edk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eduke32 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eggdbus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + egoboo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ekiga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + elasticmq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + electricsheep = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + elinks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacs22 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacs23 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacs24Packages = { + autoComplete = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bbdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + calfw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cedet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coffee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + colorTheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ecb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacsSessionManagement = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacsw3m = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flymakeCursor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gist = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphvizDot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jdee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + js2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + logito = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + loremIpsum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + magit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + maudeMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + org = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + org2blog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pcache = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + proofgeneral = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rectMark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + remember = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scalaMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sunriseCommander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmlRpc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + emboss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + enblendenfuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + encfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + enchant = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + enlightenment = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + epdfview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + epm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eprover = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eql = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + esdl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + espeakedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + etherape = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + euca2ools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eukleides = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + evince = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + evolution_data_server = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + evopedia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + expect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + exrdisplay = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + extremetuxracer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + exult = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + facile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fail2ban = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fakenes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + farsight2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + farstream = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fbida = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fbpanel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fdisk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + feh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ffmpeg_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + firefox13Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + firefox17Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + firefox36Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flann = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flashplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flightgear = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fltk13 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fltk20 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fluidsynth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fontforgeX = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + foo2zjs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + foursuite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + framac = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freecad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freeciv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freedink = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freeglut = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freemind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freepv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freerdp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freerdpUnstable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freestyle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freetalk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freetts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fsg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fsharp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fspot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ftgl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ftgl212 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fuppes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fusesmb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gajim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GConf3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdk_pixbuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdome2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gecko_mediaplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + geeqie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gegl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gegl_0_0_22 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gemrb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gensgs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + geoclue = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + geoipjava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + get_iplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + getmail = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gftp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ghostOne = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ghostscriptX = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + giblib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gifsicle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gigedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gimp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gimp_2_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gimpPlugins = { + fourier = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gimplensfun = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lqrPlugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + resynthesizer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texturize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ufraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + waveletSharpen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + girara = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitAndTools = { + darcsToGit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + git2cl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitAnnex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitBz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitFastExport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitSubtree = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitSVN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qgit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qgitGit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stgit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + svn2git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + svn2git_kde = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + giv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gkrellm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gl117 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glestae = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glew = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glfw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glibmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glib_networking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + globulation2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gltron = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glxinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnash = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnokii = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome = { + at_spi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GConf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gconfmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_control_center = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_desktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_doc_utils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_icon_theme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_keyring = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_menus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_panel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_session = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_settings_daemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_vfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_vfs_monikers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk_doc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkglext = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkglextmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkhtml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksourceview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libbonobo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libbonoboui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libglade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libglademm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomecanvas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomecanvasmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomecups = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomekbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomeprint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomeprintui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomeui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgtkhtml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgweather = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libIDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libsoup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libunique = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwnck = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + metacity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nautilus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ORBit2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pango = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pangomm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python_rsvg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + startup_notification = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vte = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zenity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + gnome_mplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_terminator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_user_docs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnonlin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnucash = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnu = { + hurdHeaders = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libpthreadHeaders = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mach = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + machHeaders = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mig_raw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + gnumeric = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnunet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnunet08 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnupg2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnuplot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gob2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gobby5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gobjectIntrospection = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + goffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + goffice_0_9 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + goldendict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + golly = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + goocanvas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + googleearth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + google_talk_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gosmore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gource = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gparted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gpgme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gphoto2fs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gpscorrelate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gpsd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gqview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grantlee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphicsmagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphicsmagick137 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphviz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphviz_2_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grass = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gravit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grub2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grub2_efi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gsettings_desktop_schemas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gsmartcontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gssdp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_plugins_bad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_plugins_base = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_plugins_good = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_plugins_ugly = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkdatabox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkdialog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkgnutella = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkimageview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkmathview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkmm3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkmozembedsharp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksharp1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksharp2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksourceviewsharp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkspell = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkvnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkwave = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtmess = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + guileCairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + guileGnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + guitone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gupnp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gupnp_igd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gupnptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gutenprint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gutenprintBin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gwenhywfar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gwrap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gxneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hadoop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + harfbuzz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPackages = { + accelerateCuda = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + accelerateExamples = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + Chart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cuda = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + diagrams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + diagramsCairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ghcMod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLFW = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gloss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLURaw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT_2_1_1_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT_2_1_2_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT_2_2_2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT_2_3_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksourceview2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2009_2_0_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2010_1_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2010_2_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2011_2_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2011_2_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2011_4_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2012_2_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + HGL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hmatrix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hp2anyGraph = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lambdacubeEngine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + LambdaHack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + leksah = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + leksahServer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lhs2tex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ltk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL_2_2_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL_2_2_3_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL_2_4_0_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL_2_6_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGLRaw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pakcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pango = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + reactiveBananaWx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + repaAlgorithms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + repaExamples = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDLImage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDLMixer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDLTtf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + splot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + svgcairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + threadscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + timeplot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + uhc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vacuumCairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxcore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + X11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + X11_1_5_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + X11Xft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmobar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmonad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmonadContrib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmonadExtras = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + haxe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + heimdall = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + herqq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hevea = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hexen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + highlight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hol_light = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + homebank = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hplip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + htmldoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + httpfs2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hwloc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hydraAntLogger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hydrogen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + i3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + i3lock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + i7z = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icbm3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icecat3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icecat3Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icecat3Xul = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icecatXulrunner3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icedtea = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icewm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + idutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ikiwiki = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + imagemagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + imagemagickBig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + imlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + imlib2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + impressive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + indilib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + inkscape = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + instead = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + intelgen4asm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + io = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ion3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iotop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iprover = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + irrlicht3843 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + irssi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + isabelle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + isocodes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + itk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + itstool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jackaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jack_capture = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jackmeter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jags = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jamp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + javaCup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jbidwatcher = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jboss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jboss_mysql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jbrout = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jclasslib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jdiskreport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jfsrec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jigdo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jing_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jjtraveler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jnettop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jrePlugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jruby165 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jscoverage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + json_glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + julia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + k3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kaffe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde3 = { + arts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdelibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + kde4 = { + akonadi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + akunambol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amarok = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aurorae = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bangarang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + basket = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blinken = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bluedevil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + calligra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cantor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cervisia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ColorSchemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + desktopthemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + digikam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dolphin_plugins_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dolphin_plugins_svn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emoticons = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + filelight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + filesharing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gwenview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + HighResolutionWallpapers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + IconThemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jovie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + k3b = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kaccessible = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kadu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kalgebra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kalzium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kamera = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kanagram = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kapptemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kbibtex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kbluetooth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kbruch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcachegrind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcalc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcharselect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcolorchooser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcron = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeaccessibility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeaccounts_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeadmin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeartwork = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde_baseapps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdebindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeedu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdegames = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdegraphics = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdegraphics_strigi_analyzer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdegraphics_thumbnailers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdelibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdemultimedia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdenetwork = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdenlive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdepim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdepimlibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdepim_runtime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeplasma_addons = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde_runtime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdesdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdesvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdetoys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdevelop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdevplatform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde_wacomtablet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdewebdev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde_workspace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdiff3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdnssd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kfile_plugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kfilereplace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kfloppy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kgamma = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kgeography = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kgpg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + khangman = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kimagemapeditor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kioslave_perldoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kioslave_svn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kipi_plugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kiten = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + klettres = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + klinkstatus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmag = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmousetool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmouth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmplot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmtrace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmymoney = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + koffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kolourpaint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kommander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kompare = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + konq_plugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + konsole = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + konversation = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kopete = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kpartloader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kppp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kprofilemethod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + krdc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kremotecontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + krename = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + krfb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kruler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + krusader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ksaneplugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kscreensaver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ksnapshot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ksshaskpass = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kstars = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kstartperf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ksystemlog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kteatime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ktimer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ktorrent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ktouch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kturtle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ktux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kuickshow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kuiviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kuser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kwallet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kwin_styles = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kwooty = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kwordquiz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.bg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.bs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ca = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ca_valencia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.cs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.da = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.de = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.el = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.en_GB = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.es = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.et = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.eu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.fi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.fr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.gl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.he = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.hr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.hu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.id = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.is = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.it = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ja = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.kk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.km = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.kn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ko = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.lt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.lv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.nb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.nds = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.nl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.nn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.pa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.pl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.pt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.pt_BR = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ru = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.si = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.sk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.sl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.sr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.sv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.th = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.tr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.uk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.wa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.zh_CN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.zh_TW = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libalkimia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkdcraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkdeedu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkexiv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkipi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libksane = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libktorrent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkvkontakte = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liblikeback = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lokalize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + marble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mobipocket = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanagement = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + okteta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + okular = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + parley = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + partitionManager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polkit_kde_agent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + poxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + printer_applet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + psi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pykde4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qt4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quassel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quasselClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quasselDaemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rekonq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rocs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rsibreak = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scripts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + semnotes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + skrooge = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smokegen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smokeqt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sounds = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + step = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + strigi_analyzer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + styles = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + superkaramba = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + svgpart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sweeper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + system_config_printer_kde = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.accounts_kcm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.approver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.auth_handler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.call_ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.common_internals = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.contact_applet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.contact_list = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.contact_runner = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.filetransfer_handler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.kded_integration_module = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.presence_applet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.send_file = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.telepathy_logger_qt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.text_ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + umbrello = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wallpapers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + WeatherWallpapers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + yakuake = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zanshin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + keen4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + keepassx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + keepnote = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + keymon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + keynav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kicad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kino = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + klavaro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kobodeluxe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kona = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kvm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + larswm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lash = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lastwatch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + latencytop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lazarus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ldcpp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ledger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ledger3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + leiningen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lensfun = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + leo2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lesstif = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lesstif93 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libao = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libassuan2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libatasmart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libbluedevil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libbluray = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcanberra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcdr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libchamplain = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libchamplain_0_6 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcroco = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcxx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdbusmenu_qt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdevil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdmtx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdrm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libextractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libfixposix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgdata = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgdata_0_6 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgdiplus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnome_keyring = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnome_keyring3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgsf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgtop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgweather = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libimobiledevice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libinfinity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liblapack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liblastfm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liblqr1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libmatchbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libmatthew_java = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libmms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libmusclecard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libnice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libnotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liboil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libopensc_dnie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libplist = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libpseudo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libqalculate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libQGLViewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + librecad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libreoffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + librsvg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libsexy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libstartup_notification = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libtiger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libtorrentRasterbar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libva = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvdpau = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libviper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvirt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvisio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvncserver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvterm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwmf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwnck3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwpd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwpd_08 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwpg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxklavier = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxml2Python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxmlxx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lilv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lilypond = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lincity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lingot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + links2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + linphone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + linux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + linuxConsoleTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + linuxPackages = { + acpi_call = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atheros = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ati_drivers_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aufs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aufs_util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bbswitch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + broadcom_sta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cryptodev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + e1000e = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + exmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + frandom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iscsitarget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iwlwifi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + klibc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kqemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ndiswrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nvidia_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nvidia_x11_legacy173 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nvidia_x11_legacy96 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openafsClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openiscsi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ov511 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + perf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sysprof = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + systemtap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tp_smapi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + v86d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtualbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtualboxGuestAdditions = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wis_go7007 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + linuxsampler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liquidwar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + llvm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lmms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + log4cxx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + logstalgica = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + loudmouth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + love = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lyx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mailutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mars = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + martyr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + matchbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + matita = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + matita_130312 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + maven = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + maxima = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mcabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mcelog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mcomix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mcrl2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mdbtools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mdbtools_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mediastreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mediatomb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + meld = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mercurial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mercurialFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + merkaartor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + meshlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mess = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + metaocaml_3_09 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mhwaveedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + micropolis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + midori = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + midoriWrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + minecraft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + miniHttpd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mirage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mitscheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mjpegtools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mkvtoolnix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mlt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mmex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + modemmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mod_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mod_wsgi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mongodb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mono = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + monodevelop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + monodoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + monotone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + monotoneViz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mountall = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mozart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mozilla = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mozplugger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mp3info = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mpc123 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mpd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mpg321 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mpich2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + MPlayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mrxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + msilbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mtdutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mu0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + multipath_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + multisync = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mumble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mupdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mupen64plus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + muscleframework = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + muscletool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mutt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mygui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + myguiSvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mysql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mysqlWorkbench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mythtv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + naev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + navipowm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + navit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ncbiCTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + netbeans = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + netboot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + netsurf.browser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanagerapplet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanager_pptp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanager_pptp_gnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + neverball = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nfsUtils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ngspice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ninka = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + njam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nodejs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nodePackages = { + abbrev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ansi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + async = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + backbone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + browserchannel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + buffertools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bytes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + commander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + connect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cookie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + crc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cssmin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + datetime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + debug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + diff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eyes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + formidable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fresh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fstream = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glob = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hiredis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + inherits = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + knox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + less = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + minimatch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mkdirp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mongodb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mrclean = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nopt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + npm2nix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + npmlog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + optimist = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + options = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + osenv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pause = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + policyfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rbytes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + redis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + request = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + requirejs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rimraf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + semver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + send = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + showdown = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sockjs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + swig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + temp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + timerstub = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tinycolor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + underscore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vows = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + which = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wordwrap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ws = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmlhttprequest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zeparser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nova = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + novaclient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nspluginwrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nss_pam_ldapd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nssTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ntop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ntrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + numeric = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nut = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nut_2_6_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obexd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obex_data_server = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obexfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obexftp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obnam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_3_08_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_3_10_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_3_11_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_4_00_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlnat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlPackages = { + camlidl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlp5_5_strict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlp5_5_transitional = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlp5_6_strict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlp5_6_transitional = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlzip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camomile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camomile_0_8_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cryptokit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + findlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmetadom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lablgtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lablgtkmathview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + menhir = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mldonkey = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_batteries = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_cryptgps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_expat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_extlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlgraph = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_http = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_lwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_mysql = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlnet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_pcre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_react = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_sexplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_sqlite3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_ssl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_typeconv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ounit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ulex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ulex08 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + octave = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + octaveHG = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + offlineimap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ogre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ogrepaged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ois = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + omake = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oneteam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openbabel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opencascade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opencsg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openct = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opencv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opencv_2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openfire = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openlierox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openobex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openoffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opensc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openscad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opensc_dnie_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openscenegraph = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openttd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opentyrian = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opera = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opkg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opusTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oraclejdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oraclejre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OVMF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oxygen_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pam_console = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pam_usb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pangoxsl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + panomatic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + paraview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + parted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + parted_2_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + path64 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pavucontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pcmciaUtils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pcsclite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pdf2djvu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pdfread = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pdftk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + perlPackages = { + Autodia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GD = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GraphViz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + InlineJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + PerlMagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SQLTranslator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + TextRecordParser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + X11GUITest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + petrifoo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pfstools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pgadmin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + philter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + phonon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + phonon_backend_gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + phonon_backend_vlc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pianobooster = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + picard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + picolisp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidgin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginlatex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginlatexSF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginmsnpecan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginotr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginsipe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pinentry = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pinta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pioneers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pius = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + plan9port = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + plib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ploticus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pltScheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pmutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + policykit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polkit_gnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polkit_qt_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pommed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pong3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + poppler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + popplerQt4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + postgresql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pqiv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + praat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + prboom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + prison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + privateer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + proxychains = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pstack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ptlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pulseaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pure = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + puredata = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + putty = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycrypto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycups = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pydb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyexiv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygame = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygobject = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyGtkGlade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyIRCt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyMAILt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyopenssl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyqt4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyrex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyrex096 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyside = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysideApiextractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysideGeneratorrunner = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysideShiboken = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysideTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pystringtemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python26 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python26Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python27Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python27Packages = { + afew = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amqplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + anyjson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apsw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + area53 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + argparse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + Babel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + beautifulsoup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boto_1_9 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bsddb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + carrot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cheetah = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cherrypy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cliapp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clientform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coilmq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + configobj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cssutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + curses = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + darcsver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dateutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + decorator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + distribute = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + distutils_extra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + django = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + django_1_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + django_evolution = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + djblets = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + docutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dtopt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dulwich = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + enum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eventlet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flake8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flask = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + foolscap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdbm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + genshi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + genzshcomp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gflags = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + greenlet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gyp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hggit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + httplib2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ipy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ipython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jinja2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + larch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ldap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcloud = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lockfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + logilab_astng = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + logilab_common = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + m2crypto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + magic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + markdown = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + matplotlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mechanize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + memcached = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mutagen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + MySQL_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + namebench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + netaddr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nevow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nose = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + notify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + numpy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oauth2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + offlineDistutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + paramiko = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + paste = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + paste_deploy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pep8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pexpect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ply = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + prettytable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + protobuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + psycopg2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + publicsuffix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyasn1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycryptopp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycurl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pydot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyfeed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygments = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygpgme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyinotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pylast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pylibacl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pylint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pymacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyopengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyparsing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyreport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysqlite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pytz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyxattr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyyaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + RBTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rdflib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + readline = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + recaptcha_client = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + recursivePthLoader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + reportlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + reviewboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ropemacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + routes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scipy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scripttest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + selenium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + setuptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + setuptoolsDarcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + setuptoolsTrial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + simplejson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + six = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + skype4py = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sphinx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sqlalchemy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sqlalchemy_migrate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sqlite3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stompclient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + taskcoach = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tempita = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkinter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trac = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tracing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ttystatus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + turses = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tweepy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + twisted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + unittest2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + urlgrabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + urwid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtualenv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vnc2flv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webob = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webtest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + werkzeug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wokkel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wrapPython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxPython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zbase32 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zfec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + python26Packages = python27Packages; + python3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pythonDBus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pythonIRClib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pythonmagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pythonSexy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qca2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qca2_ossl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qcmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qemu_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qfsm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qgis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qimageblitz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qjackctl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qjoypad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qjson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qoauth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qrdecode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qrupdate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qsampler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qshowdiff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qsynth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qt3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qt47 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qt_gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qtpfsgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qtractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qtscriptgenerator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quake3demo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quake3game = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qucs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quesoglc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rabbitmq_server = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + racer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + racket = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rakarrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rapcad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rapidsvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ratpoison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rawtherapee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rdesktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rdf4store = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rdiff_backup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + RealPlayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + recutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + redshift = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + relfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + remmina = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + reptyr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rhino = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rhpl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rigsofrods = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rili = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rLang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rockbox_utility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rrdtool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rssglx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rtmpdump = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rubber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rubyLibs.buildr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rubyLibs.rjb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rxvt_unicode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + s3cmd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sabnzbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sakura = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + salut_a_toi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + samba = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + saneFrontends = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + satallax = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sauerbraten = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + saxonb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sbcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + schroedinger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scilab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scons = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scorched3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scribus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scrot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scummvm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_gfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_image = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_mixer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_net = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_sound = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_ttf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + seeks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + seg3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + seleniumRCBin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + seq24 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + serd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sfml_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sgtpuzzles = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + shared_mime_info = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sharedobjects = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + silgraphite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + simgear = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + simutrans = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + six = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + skype = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + slim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + slock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smatch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smbnetfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + snack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + snd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sndBase = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sofia_sip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + soi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sonic_visualiser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + soprano = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + soqt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sord = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sourceHighlight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spaceOrbit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + speechd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + speed_dreams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spidermonkey_185 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spring = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + springLobby = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sratom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sshfsFuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ssreflect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + st = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stalin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stalonetray = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stardict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stardust = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stellarium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + strigi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stumpwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stuntrally = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sublime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + subversionClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + suil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + suitesparse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + superTux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + superTuxKart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + surf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + swh_lv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + swiProlog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + swt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sylpheed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + synergy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + syslogng = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + system_config_printer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + systemd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + t1lib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tabbed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tahoelafs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tailor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tangogps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + taskjuggler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tbe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + teamspeak_client = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + teetertorture = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + teeworlds = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_farstream = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_gabble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_haze = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_logger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_mission_control = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_qt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_rakia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_salut = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tennix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texDisser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveBeamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveCMSuper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveContext = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveExtra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveLatexXColor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveModerncv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLivePGF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texmacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + thunderbird = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tigervnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tightvnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + timidity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkcvs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkgate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkgate2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tomcat5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tomcat_connectors = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tomcat_mysql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + torchat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + torcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trackballs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + transmission = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + transmission_remote_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tremulous = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tribler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trigger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + truecrypt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tulip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tvtime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + twinkle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + uae = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ubootGuruplug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ubootNanonote = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + udev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + udev145 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + udisks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ufoai = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ufraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ultimatestunts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ultrastardx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + unclutter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + unetbootin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + unison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + upower = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + uqm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + urbanterror = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + usbmuxd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + uzbl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + v4l_utils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + v8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vacuum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vala = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vala15 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vala16 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + valgrind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + valkyrie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vde2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vdpauinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vdrift = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vectoroids = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + veracity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vfdecrypt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vidalia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + viewMtn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vigra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + viking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vimHugeX = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vimprobable2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vimprobable2Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtinst = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtualgl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + VisualBoyAdvance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vkeybd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vlc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vncrec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vorbisTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vrpn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vue = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + w3cCSSValidator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + warmux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + warsow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + warzone2100 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wavesurfer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wdfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webkit_gtk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webkitSVN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + weechat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + welkin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wesnoth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wicd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + widelands = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wineWarcraft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wireshark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wkhtmltopdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wmiimenu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wmiiSnap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wmname = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wordnet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wpa_supplicant_gui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wvdial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wvstreams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxGTK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxGTK29 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxmaxima = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x11_ssh_askpass = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x11vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x2vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x2x = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xalanJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xaos = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xapianBindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xapianBindings10 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xara = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xautolock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + Xaw3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xawtv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xbindkeys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xbursttools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xchat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xchm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xclip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcompmgr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xconq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdaliclock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdotool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xercesJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_input_mtrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_input_multitouch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_input_wacom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_video_nested = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_video_nouveau = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce = { + exo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + garcon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gigolo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk_xfce_engine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgdu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxfce4ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxfce4util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxfcegui4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mousepad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ristretto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + terminal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + thunar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + thunar_volman = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_appfinder = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_cpufreq_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4icontheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4mixer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4panel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_power_manager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4session = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4settings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_systemload_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_taskmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfceutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfconf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfdesktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfwm4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + xfig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfontsel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xineLib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xineUI = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkeyboard_config = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlaunch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlibs = { + libAppleWM = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdmx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libWindowsWM = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libX11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXaw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxcb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXcomposite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXcursor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXdamage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXext = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXfixes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXinerama = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxkbfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXmu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXrandr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXrender = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXres = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXScrnSaver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXtst = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXvMC = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXxf86dga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXxf86misc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXxf86vm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + setxkbmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smproxy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + twm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x11perf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xauth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xbacklight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbproto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutilimage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutilkeysyms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutilrenderutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutilwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xclock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcmsdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcursorgen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcursorthemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdpyinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdriinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xeyes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputevdev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputjoystick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputkeyboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputmouse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputsynaptics = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputvmmouse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputvoid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoati = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videocirrus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videodummy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videofbdev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videogeode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoglide = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoglint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoi128 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videointel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videointel_2_14_901 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videointel_2_17_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videomach64 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videomga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoneomagic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videonewport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videonv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoopenchrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videor128 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosavage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosiliconmotion = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosuncg6 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosunffb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videotdfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videotga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videotrident = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videov4l = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videovesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videovmware = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videovoodoo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videowsfb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xgamma = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xhost = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xinit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xinput = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkbcomp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkbevd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkbutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkill = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlsatoms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlsclients = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmessage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmodmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xorgserver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xorgserver_1_13_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xpr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xprop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xrandr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xrdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xrefresh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xset = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsetroot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xvinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xwd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xwininfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xwud = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + xlockmore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlsfonts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmacro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmlroff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmoto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmove = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmpppy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xnee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xneur_0_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xonotic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xorg_sys_opengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xorgVideoUnichrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xoscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xosd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xournal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xpdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xpf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xplanet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xpra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsane = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xscreensaver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsokoban = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsynth_dssi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xterm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xtrace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xtreemfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xulrunner = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xvfb_run = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xvidcap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xxdiff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + yate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + yoshimi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + youtubeDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathura = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathuraCollection = { + zathura_core = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathura_djvu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathura_pdf_poppler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathura_ps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + zbar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zdoom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zgrviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zoom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ZopeInterface = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zsnes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zynaddsubfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zziplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; +}) From 27a73428cc8828739a7bf60b40b872ff5535a43a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 02:15:08 +0100 Subject: [PATCH 004/162] remove site.py files setuptools site.py can't resolve recursively which is needed for nix, as each package has its own directory. A different solution than putting the loader into every package output needs to be found. see also #209 --- pkgs/development/python-modules/generic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4494392cfef4..7b63b5a8fab2 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -82,9 +82,7 @@ python.stdenv.mkDerivation (attrs // { # Remove any site.py files generated by easy_install as these # cause collisions. If pth files are to be processed a # corresponding site.py needs to be included in the PYTHONPATH. - # - # leave them until we have a better solution: see #209 - #rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* ${postInstall} ''; From aeef72fa85785ee017d9db03bf597b38a9efa251 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 02:18:29 +0100 Subject: [PATCH 005/162] python-modules: remove long non-functional propagated-user-env-packages we use recursive processing of pth files instead --- pkgs/development/python-modules/generic/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 7b63b5a8fab2..901b71442533 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -91,14 +91,6 @@ python.stdenv.mkDerivation (attrs // { '' wrapPythonPrograms - # If a user installs a Python package, she probably also wants its - # dependencies in the user environment (since Python modules don't - # have something like an RPATH, so the only way to find the - # dependencies is to have them in the PYTHONPATH variable). - if test -e $out/nix-support/propagated-build-inputs; then - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages - fi - createBuildInputsPth build-inputs "$buildInputStrings" for inputsfile in propagated-build-inputs propagated-build-native-inputs; do if test -e $out/nix-support/$inputsfile; then From aab93e8479f16ae0af1c83c280e32e5acfcc82f2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 02:35:04 +0100 Subject: [PATCH 006/162] do not create e.g pth file for build inputs if they are really needed they will be in pth file created by easy_install. If that does not work, they need to be put into propagatedBuildInputs or the setup.py fixed. see #210 --- pkgs/development/python-modules/generic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 901b71442533..4a3d92b28bfc 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -91,7 +91,8 @@ python.stdenv.mkDerivation (attrs // { '' wrapPythonPrograms - createBuildInputsPth build-inputs "$buildInputStrings" + # these should already be in $name.pth + #createBuildInputsPth build-inputs "$buildInputStrings" for inputsfile in propagated-build-inputs propagated-build-native-inputs; do if test -e $out/nix-support/$inputsfile; then createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" From edd160452e0c17bb5b0f07693dc1a1a4dd2dd511 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 02:41:10 +0100 Subject: [PATCH 007/162] don't propagate recursivePthLoader, it is needed to process it already --- pkgs/development/python-modules/generic/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4a3d92b28bfc..e46c710067da 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -51,9 +51,6 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - # recursivePthLoader is responsible for loading pth files - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; - buildInputStrings = map toString buildInputs; pythonPath = [ setuptools] ++ pythonPath; From 838761cad2102bf3cb72291900bf58faf4d21a36 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 03:26:19 +0100 Subject: [PATCH 008/162] python manpages as python2.6, python2.7 and python see #68 --- pkgs/development/interpreters/python/2.6/default.nix | 2 ++ pkgs/development/interpreters/python/2.7/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 6fa27c23525c..64fd96a03520 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -62,6 +62,8 @@ let rm -rf "$out/lib/python${majorVersion}/test" ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} + mv $out/share/man/man1/{python.1.gz,python2.6.1.gz} + ln -s $out/share/man/man1/{python2.6.1.gz,python.1.gz} ''; passthru = { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 7e28cdc1db74..9fb2ab377dfc 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -76,6 +76,7 @@ let rm -rf "$out/lib/python${majorVersion}/test" ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} + ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} ''; passthru = { From 6654cb8a10a8e565c04440143ddf2472aced3cf3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 05:21:01 +0100 Subject: [PATCH 009/162] comment --- pkgs/development/python-modules/generic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index e46c710067da..e576e3bde999 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -47,6 +47,7 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; + # checkPhase after installPhase to run tests on installed packages phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase"; buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; From 16e2a9133f0c6cff8b22a1b847d7c238eced0dbf Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:06:46 +0100 Subject: [PATCH 010/162] python-2.6.8: long overdue --- pkgs/development/interpreters/python/2.6/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 64fd96a03520..6e7f01c0c923 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -9,11 +9,13 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.7"; + version = "${majorVersion}.8"; + # http://www.python.org/download/releases/2.6.8/ + # md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013 src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5"; + md5 = "c6e0420a21d8b23dee8b0195c9b9a125"; }; patches = From 723d5a5581a1ec4dc32eec3b197abb49def666e2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:26:15 +0100 Subject: [PATCH 011/162] fix python-2.6 build: purity for systems with stdenv.gcc.libc On other systems python26 will continue to look for /usr/include/netinet/in.h among others. I don't know whether/what to do about that. --- pkgs/development/interpreters/python/2.6/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 6e7f01c0c923..30acdb3624e2 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -53,6 +53,10 @@ let for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done ''; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; From ee0204d2c882815e15e18d3e374c0341c9e7aced Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:27:39 +0100 Subject: [PATCH 012/162] for some reason the python2.6 manpage is not gzipped --- pkgs/development/interpreters/python/2.6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 30acdb3624e2..f264e4179e70 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -68,8 +68,8 @@ let rm -rf "$out/lib/python${majorVersion}/test" ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} - mv $out/share/man/man1/{python.1.gz,python2.6.1.gz} - ln -s $out/share/man/man1/{python2.6.1.gz,python.1.gz} + mv $out/share/man/man1/{python.1,python2.6.1} + ln -s $out/share/man/man1/{python2.6.1,python.1} ''; passthru = { From dabb876c9b67613a8f0414595d5e583a08818419 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 10:39:09 +0100 Subject: [PATCH 013/162] release-python: create list of python packages from pythonPackages attrset --- pkgs/top-level/release-python.nix | 175 ++---------------------------- 1 file changed, 10 insertions(+), 165 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 521800647ec3..ea3c2821dcda 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1467,174 +1467,19 @@ with (import ./release-lib.nix); pysideShiboken = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pysideTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pystringtemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python26 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python27 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python26Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python27Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python27Packages = { - afew = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - alot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - amqplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - anyjson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - apsw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - area53 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - argparse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - Babel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - beautifulsoup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boto_1_9 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bsddb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - carrot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cheetah = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cherrypy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cliapp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clientform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - coilmq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - configobj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cssutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - curses = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - darcsver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dateutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - decorator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - distribute = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - distutils_extra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - django = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - django_1_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - django_evolution = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - djblets = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - docutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dtopt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dulwich = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - enum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eventlet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flake8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flask = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - foolscap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gdbm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - genshi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - genzshcomp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gflags = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - greenlet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gyp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hggit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - httplib2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - iptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ipy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ipython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jinja2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - larch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ldap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libcloud = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lockfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - logilab_astng = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - logilab_common = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - m2crypto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - magic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - markdown = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - matplotlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mechanize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - memcached = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mutagen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - MySQL_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - namebench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - netaddr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nevow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nose = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - notify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - numpy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - oauth2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - offlineDistutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - paramiko = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - paste = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - paste_deploy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pep8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pexpect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ply = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - polib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - prettytable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - protobuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - psycopg2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - publicsuffix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyasn1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pycryptopp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pycurl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pydot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyfeed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pygments = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pygpgme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyinotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pylast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pylibacl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pylint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pymacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyopengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyparsing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyreport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pysqlite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pysvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pytz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyxattr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyyaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - RBTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rdflib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - readline = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - recaptcha_client = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - recursivePthLoader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - reportlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - reviewboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ropemacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - routes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scipy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scripttest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - selenium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - setuptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - setuptoolsDarcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - setuptoolsTrial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - simplejson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - six = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - skype4py = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sphinx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sqlalchemy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sqlalchemy_migrate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sqlite3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stompclient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - taskcoach = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tempita = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tkinter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - trac = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tracing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ttystatus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - turses = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tweepy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - twisted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - unittest2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - urlgrabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - urwid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - virtualenv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vnc2flv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - webob = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - webtest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - werkzeug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wokkel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wrapPython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wxPython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zbase32 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zfec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - python26Packages = python27Packages; + python26Packages = pkgs.lib.attrsets.listToAttrs + (map + (name: { inherit name; + value = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };}) + (builtins.attrNames + (pkgs.lib.attrsets.filterAttrs + (n: v: (v.type or null) == "derivation") + pkgs.python26Packages))); + python27Packages = python26Packages; python3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pythonDBus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pythonIRClib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 1b110436bf221eebaa98a5993599878973b2d26a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 20:45:01 +0100 Subject: [PATCH 014/162] release-python: remove two non-existing attrs --- pkgs/top-level/release-python.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index ea3c2821dcda..587ea72ddb08 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -645,7 +645,6 @@ with (import ./release-lib.nix); wxc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; wxcore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; X11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - X11_1_5_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; X11Xft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xmobar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xmonad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1182,7 +1181,6 @@ with (import ./release-lib.nix); mrxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; msilbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mtdutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mu0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; multipath_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; multisync = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mumble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 2fd4313f6c13851f73e414a00ac8fb9457ae1674 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 9 Jan 2013 11:49:41 -0800 Subject: [PATCH 015/162] x86info-1.30 --- pkgs/os-specific/linux/x86info/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/x86info/default.nix diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix new file mode 100644 index 000000000000..0cdb7fea1afa --- /dev/null +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, pciutils, python}: + +stdenv.mkDerivation rec { + version = "1.30"; + name = "x86info-${version}"; + + src = fetchurl { + url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz"; + sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; + }; + + buildInputs = [ pciutils python ]; + + installPhase = '' + ensureDir $out/bin + cp x86info lsmsr $out/bin + ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [jcumming]; + description = "x86info, a CPU identification utility."; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5bf3e136a59..2958c9bb4f6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1749,6 +1749,8 @@ let wv2 = callPackage ../tools/misc/wv2 { }; + x86info = callPackage ../os-specific/linux/x86info { }; + x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools { From 9f66bf678e2ca9230a1dd2743d95a7ebda052096 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 22:23:41 +0100 Subject: [PATCH 016/162] release-python: derive python27Package from python27Packages --- pkgs/top-level/release-python.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 587ea72ddb08..7374ede263a8 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -9,6 +9,17 @@ */ with (import ./release-lib.nix); +let + jobsForDerivations = attrset: pkgs.lib.attrsets.listToAttrs + (map + (name: { inherit name; + value = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };}) + (builtins.attrNames + (pkgs.lib.attrsets.filterAttrs + (n: v: (v.type or null) == "derivation") + attrset))); + +in { tarball = import ./make-tarball.nix; @@ -1469,15 +1480,8 @@ with (import ./release-lib.nix); python27 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python26Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python27Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python26Packages = pkgs.lib.attrsets.listToAttrs - (map - (name: { inherit name; - value = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };}) - (builtins.attrNames - (pkgs.lib.attrsets.filterAttrs - (n: v: (v.type or null) == "derivation") - pkgs.python26Packages))); - python27Packages = python26Packages; + python26Packages = jobsForDerivations pkgs.python26Packages; + python27Packages = jobsForDerivations pkgs.python27Packages; python3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pythonDBus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pythonIRClib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 1cd2bd460b5a8847db5cfea87681a04c6c23530e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 22:29:41 +0100 Subject: [PATCH 017/162] whitespace --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 0efd1addfad0..888f58d77487 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -55,7 +55,7 @@ python.stdenv.mkDerivation (attrs // { buildInputStrings = map toString buildInputs; - pythonPath = [ setuptools] ++ pythonPath; + pythonPath = [ setuptools ] ++ pythonPath; preConfigure = '' PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" From 0f52f5a945798957037850377fe5da94fe8485c7 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 22:29:46 +0100 Subject: [PATCH 018/162] Revert "don't propagate recursivePthLoader, it is needed to process it already" This reverts commit edd160452e0c17bb5b0f07693dc1a1a4dd2dd511. If we propagate it, derivations that use a python package will also get the recursivePthLoader needed to process the pth files of the package. --- pkgs/development/python-modules/generic/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 888f58d77487..527d4f3108f1 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -53,6 +53,9 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + # recursivePthLoader is responsible for loading pth files + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; + buildInputStrings = map toString buildInputs; pythonPath = [ setuptools ] ++ pythonPath; From 42d49b47bad81a37366779dd8bf53dc508ec07e5 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 10 Jan 2013 12:50:17 +0100 Subject: [PATCH 019/162] comment unneeded buildInputStrings --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 527d4f3108f1..d650116ada9a 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -56,7 +56,7 @@ python.stdenv.mkDerivation (attrs // { # recursivePthLoader is responsible for loading pth files propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; - buildInputStrings = map toString buildInputs; + #buildInputStrings = map toString buildInputs; pythonPath = [ setuptools ] ++ pythonPath; From 9a41e3630a71773787002368f69ecef7fa28fb64 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 10 Jan 2013 13:10:47 +0100 Subject: [PATCH 020/162] remove some packages also broken in master --- pkgs/top-level/release-python.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 7374ede263a8..e21b4fa59643 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -62,7 +62,6 @@ in apparmor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; aqbanking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; arb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ardour = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ardour3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; arora = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; asc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -141,9 +140,7 @@ in castle_combat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cbrowser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cc1394 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ccid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cdrdao = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - centerim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cflow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cgal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -184,7 +181,6 @@ in consolekit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; construo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; construoBase = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - content = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; coq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; coq_8_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; coriander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1742,7 +1738,6 @@ in virtmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; virtualgl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; virtviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - VisualBoyAdvance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vkeybd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vlc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 212b4df91cccb6bdfaf80b3fc84ea47907e9898b Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 09:53:28 +0100 Subject: [PATCH 021/162] recursivePthLoader included via wrapper, not propagated by modules --- pkgs/development/interpreters/python/wrapper.nix | 4 ++-- pkgs/development/python-modules/generic/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index f4892f92b417..0f2f46cd568d 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,12 +1,12 @@ # Create a python that knows about additional python packages via # PYTHONPATH -{stdenv, python, makeWrapper, extraLibs ? []}: +{ stdenv, python, makeWrapper, recursivePthLoader, extraLibs ? [] }: stdenv.mkDerivation { name = "python-${python.version}-wrapper"; - propagatedBuildInputs = [python makeWrapper] ++ extraLibs; + propagatedBuildInputs = extraLibs ++ [ python makeWrapper recursivePthLoader ]; unpackPhase = "true"; installPhase = '' diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index d650116ada9a..2e5601ae17c4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -53,11 +53,6 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - # recursivePthLoader is responsible for loading pth files - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; - - #buildInputStrings = map toString buildInputs; - pythonPath = [ setuptools ] ++ pythonPath; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b59a8a63deae..c7c97b21da01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2847,6 +2847,7 @@ let python27Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python27.modules; python = python27; + inherit (python27Packages) recursivePthLoader; }; pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { }; From 37abd1e353269dad5be191458c92700027019695 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 10:35:55 +0100 Subject: [PATCH 022/162] fix python26Full expression --- pkgs/top-level/all-packages.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7c97b21da01..06707363b368 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2828,22 +2828,19 @@ let pure = callPackage ../development/interpreters/pure {}; - python = python27; python3 = python32; - - python26 = callPackage ../development/interpreters/python/2.6 { }; - - python27 = callPackage ../development/interpreters/python/2.7 { }; - python32 = callPackage ../development/interpreters/python/3.2 { }; - pythonFull = python27Full; + python = python27; + python26 = callPackage ../development/interpreters/python/2.6 { }; + python27 = callPackage ../development/interpreters/python/2.7 { }; + pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python26.modules; python = python26; + inherit (python26Packages) recursivePthLoader; }; - python27Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python27.modules; python = python27; From a59164e9312f35e4fa45b6168c8b03d315db4b7c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 10:54:25 +0100 Subject: [PATCH 023/162] modules propgate recursivePthLoader An alternative would be to include it with the plain `python`. --- pkgs/development/python-modules/generic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 2e5601ae17c4..c7157110758a 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -53,6 +53,8 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; + pythonPath = [ setuptools ] ++ pythonPath; preConfigure = '' From b4f84e3b1eed301a1bf9ce4f53b33a08bd67f05e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 15:14:53 +0100 Subject: [PATCH 024/162] pythonPackages: introduce sections, no functional change --- pkgs/top-level/python-packages.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6827337dde40..5e93f22ed647 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3,22 +3,28 @@ let pythonPackages = python.modules // rec { inherit python; - inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; + # helpers buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; inherit python wrapPython setuptools recursivePthLoader offlineDistutils; }; + wrapPython = pkgs.makeSetupHook + { deps = pkgs.makeWrapper; + substitutions.libPrefix = python.libPrefix; + } + ../development/python-modules/generic/wrap.sh; + + # specials recursivePthLoader = import ../development/python-modules/recursive-pth-loader { inherit (pkgs) stdenv; inherit python; }; - setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; inherit python wrapPython; @@ -34,6 +40,8 @@ let pythonPackages = python.modules // rec { inherit python; }; + # packages defined elsewhere + ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; inherit buildPythonPackage pythonPackages; @@ -49,12 +57,8 @@ let pythonPackages = python.modules // rec { inherit python buildPythonPackage; }; - wrapPython = pkgs.makeSetupHook - { deps = pkgs.makeWrapper; - substitutions.libPrefix = python.libPrefix; - } - ../development/python-modules/generic/wrap.sh; + # packages defined here afew = buildPythonPackage rec { rev = "6bb3915636aaf86f046a017ffffd9a4ef395e199"; From 01f142296ab78e2dd57bc6dc83faa3ec91b2aeea Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 15:15:52 +0100 Subject: [PATCH 025/162] pythonPackages: use unversioned to blend into pkgs, no functional change --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06707363b368..cb7996fc02e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5295,13 +5295,13 @@ let numeric = callPackage ../development/python-modules/numeric { }; - pil = python27Packages.pil; + pil = pythonPackages.pil; psyco = callPackage ../development/python-modules/psyco { }; pycairo = callPackage ../development/python-modules/pycairo { }; - pycrypto = python27Packages.pycrypto; + pycrypto = pythonPackages.pycrypto; pycups = callPackage ../development/python-modules/pycups { }; From 87423443b8e329b9bc90f1475ef456616e2d477f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 15:23:44 +0100 Subject: [PATCH 026/162] pycairo: move to pythonPackages --- pkgs/development/python-modules/pycairo/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 8aebf1d78290..1e8ceed6878f 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, pkgconfig, cairo, x11}: +{ stdenv, fetchurl, python, pkgconfig, cairo, x11 }: stdenv.mkDerivation { name = "pycairo-1.8.8"; @@ -7,5 +7,5 @@ stdenv.mkDerivation { sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig"; }; - buildInputs = [python pkgconfig cairo x11]; + buildInputs = [ python pkgconfig cairo x11 ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb7996fc02e7..7b5cc11a7c30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5299,7 +5299,7 @@ let psyco = callPackage ../development/python-modules/psyco { }; - pycairo = callPackage ../development/python-modules/pycairo { }; + pycairo = pythonPackages.pycairo; pycrypto = pythonPackages.pycrypto; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e93f22ed647..72a44f48f332 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -52,6 +52,11 @@ let pythonPackages = python.modules // rec { inherit python buildPythonPackage; }; + pycairo = import ../development/python-modules/pycairo { + inherit (pkgs) stdenv fetchurl pkgconfig cairo x11; + inherit python; + }; + pycrypto = import ../development/python-modules/pycrypto { inherit (pkgs) fetchurl stdenv gmp; inherit python buildPythonPackage; From e856c72159abb655872bd8d32daf82874cb1d3ee Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 15:30:56 +0100 Subject: [PATCH 027/162] pygobject: in pythonPackages, removed hack handled now by pth --- .../development/python-modules/pygobject/default.nix | 12 ------------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 5 +++++ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 4ef851f5b3ed..5a320cc97ee1 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -12,18 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig glib ]; - postInstall = '' - # All python code is installed into a "gtk-2.0" sub-directory. That - # sub-directory may be useful on systems which share several library - # versions in the same prefix, i.e. /usr/local, but on Nix that directory - # is useless. Furthermore, its existence makes it very hard to guess a - # proper $PYTHONPATH that allows "import gtk" to succeed. - cd $(toPythonPath $out)/gtk-2.0 - for n in *; do - ln -s "gtk-2.0/$n" "../$n" - done - ''; - meta = { homepage = http://live.gnome.org/PyGObject; description = "Python bindings for Glib"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b5cc11a7c30..2303d730720a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5309,7 +5309,7 @@ let pygame = callPackage ../development/python-modules/pygame { }; - pygobject = callPackage ../development/python-modules/pygobject { }; + pygobject = pythonPackages.pygobject; pygtk = callPackage ../development/python-modules/pygtk { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72a44f48f332..65711acf6f8f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -62,6 +62,11 @@ let pythonPackages = python.modules // rec { inherit python buildPythonPackage; }; + pygobject = import ../development/python-modules/pygobject { + inherit (pkgs) stdenv fetchurl pkgconfig glib; + inherit python; + }; + # packages defined here From 59879f6496db062a62574735925a61c6c5473e10 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 16:11:07 +0100 Subject: [PATCH 028/162] fixup: pygobject rename pth --- pkgs/development/python-modules/pygobject/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 5a320cc97ee1..5575243bd9f3 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig glib ]; + # in a "normal" setup, pygobject and pygtk are installed into the + # same site-packages: we need a pth file for both. pygtk.py would be + # used to select a specific version, in our setup it should have no + # effect, but we leave it in case somebody expects and calls it. + postInstall = '' + mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth} + ''; + meta = { homepage = http://live.gnome.org/PyGObject; description = "Python bindings for Glib"; From a7a6173a3f77df4faa6cc9b7e082f37537f459c7 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 17:45:26 +0100 Subject: [PATCH 029/162] pygtk in pythonPackages, checks disabled, demo works, relates #223 Previously the checkPhase was not executed. It is now and a couple of issues with it are seded away. --- .../python-modules/pygtk/default.nix | 43 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +-- pkgs/top-level/python-packages.nix | 14 ++++++ 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 81147fff17dc..07d57591f1ac 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, python, pkgconfig, glib, gtk, pygobject, pycairo -, libglade ? null }: +{ stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo +, buildPythonPackage, libglade ? null }: -stdenv.mkDerivation rec { +buildPythonPackage rec { name = "pygtk-2.22.0"; src = fetchurl { @@ -10,26 +10,35 @@ stdenv.mkDerivation rec { }; buildInputs = - [ makeWrapper python pkgconfig glib gtk ] + [ pkgconfig glib gtk ] ++ stdenv.lib.optional (libglade != null) libglade; propagatedBuildInputs = [ pygobject pycairo ]; + installCommand = "make install"; + checkPhase = stdenv.lib.optionalString (libglade == null) + '' + sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ + tests/common.py + sed -i -e "s/, glade$//" \ + -e "s/.*testGlade.*//" \ + -e "s/.*(glade.*//" \ + tests/test_api.py + '' + '' + sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \ + -e "s/sys.path.insert(0, buildDir)//" \ + tests/common.py + make check + ''; + # XXX: TypeError: Unsupported type: + # The check phase was not executed in the previous + # non-buildPythonPackage setup - not sure why not. + doCheck = false; + postInstall = '' rm $out/bin/pygtk-codegen-2.0 ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 - - # All python code is installed into a "gtk-2.0" sub-directory. That - # sub-directory may be useful on systems which share several library - # versions in the same prefix, i.e. /usr/local, but on Nix that directory - # is useless. Furthermore, its existence makes it very hard to guess a - # proper $PYTHONPATH that allows "import gtk" to succeed. - cd $(toPythonPath $out)/gtk-2.0 - for n in *; do - ln -s "gtk-2.0/$n" "../$n" - done - - wrapProgram $out/bin/pygtk-demo --prefix PYTHONPATH ":" \ - $(toPythonPath "${pygobject} ${pycairo} $out") + ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/${pygobject.name}.pth \ + $out/lib/${python.libPrefix}/site-packages/${name}.pth ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2303d730720a..032538f95053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5311,11 +5311,9 @@ let pygobject = pythonPackages.pygobject; - pygtk = callPackage ../development/python-modules/pygtk { }; + pygtk = pythonPackages.pygtk; - pyGtkGlade = callPackage ../development/python-modules/pygtk { - inherit (gnome) libglade; - }; + pyGtkGlade = pythonPackages.pyGtkGlade; pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { inherit python openssl; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65711acf6f8f..c247f858b5a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -67,6 +67,20 @@ let pythonPackages = python.modules // rec { inherit python; }; + pygtk = import ../development/python-modules/pygtk { + inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; + inherit python buildPythonPackage pygobject pycairo; + }; + + # XXX: how can we get an override here? + #pyGtkGlade = pygtk.override { + # inherit (pkgs.gnome) libglade; + #}; + pyGtkGlade = import ../development/python-modules/pygtk { + inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; + inherit (pkgs.gnome) libglade; + inherit python buildPythonPackage pygobject pycairo; + }; # packages defined here From 24d48d917056bb095c755d8160987e145805ee5c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 18:03:32 +0100 Subject: [PATCH 030/162] don't put propagated recursivePthLoader into pth file, #257 --- pkgs/development/python-modules/generic/wrap.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 71269945d6f4..d42be1469552 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -51,6 +51,9 @@ createBuildInputsPth() { local inputs="$2" if [ foo"$inputs" != foo ]; then for x in $inputs; do + if $(echo -n $x |grep -q python-recursive-pth-loader); then + continue + fi if test -d "$x"/lib/@libPrefix@/site-packages; then echo $x/lib/@libPrefix@/site-packages \ >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth From 0cfd455a67accd8c1617532f8e2377889f8789bc Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 11 Jan 2013 09:25:32 -0800 Subject: [PATCH 031/162] Update x86info description. Add Homepage. --- pkgs/os-specific/linux/x86info/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 0cdb7fea1afa..d8840d08460d 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -17,8 +17,17 @@ stdenv.mkDerivation rec { ''; meta = { + description = "An identification utility for the x86 series of processors."; + longDescription = + '' + x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages + the cpuid kernel module where possible. it supports parsing model specific + registers (MSRs) via the msr kernel module. it will approximate processor + frequency, and identify the cache sizes and layout. + ''; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + homepage = http://codemonkey.org.uk/projects/x86info/; maintainers = with stdenv.lib.maintainers; [jcumming]; - description = "x86info, a CPU identification utility."; }; } From 3fe43187fbec49ec09357f18535bb67673ba53a1 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 11 Jan 2013 09:28:52 -0800 Subject: [PATCH 032/162] urxvt-9.16 --- pkgs/applications/misc/rxvt_unicode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index b643b8a658e2..d52fd178165e 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -3,7 +3,7 @@ let name = "rxvt-unicode"; - version = "9.15"; + version = "9.16"; n = "${name}-${version}"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca81f2b1"; + sha256 = "0x28wyslqnhn2q11y4hncqdl07wgh5ypywl92fq0jxycr36ibfvn"; }; buildInputs = From 2dd59fc4cf74d62d47de613512213c63cf6400b6 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 11 Jan 2013 18:32:45 +0100 Subject: [PATCH 033/162] imagemagick: disable ghostscript on darwin, to make it work --- pkgs/applications/graphics/ImageMagick/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d66db51a4de3..b96d1bc84f74 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -3,7 +3,7 @@ , bzip2 , freetype , graphviz -, ghostscript +, ghostscript ? null , libjpeg , libpng , libtiff @@ -27,16 +27,17 @@ stdenv.mkDerivation rec { sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs"; }; - configureFlags = '' + configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") '' --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts --with-gslib + '' + '' --with-frozenpaths ${if librsvg != null then "--with-rsvg" else ""} ''; propagatedBuildInputs = - [ bzip2 freetype ghostscript libjpeg libpng libtiff libxml2 zlib librsvg - libtool jasper libX11 ]; + [ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg + libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; buildInputs = [ tetex graphviz ]; From d1662d715514e6ef9d3dc29f132f1b3d8e608a18 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Jan 2013 14:42:09 -0500 Subject: [PATCH 034/162] Add the replace-dependency build support function. The use case is to do a deep replacement of a dependency without rebuilding the entire tree. For example, suppose a security hole is found in glibc and a patch released. Ideally, you'd just rebuild everything, but that takes time, space, and CPU that you might not have, so in the mean time you could build a safe version of, say, firefox with: firefox-safe = replace-dependency { drv = firefox; old-dependency = glibc; new-dependency = patched-glibc; }; Building firefox-safe will rebuild glibc, but only do a simple copy/string replacement on all other dependencies of firefox. On my system (MBP 13" mid-2012), after a new glibc had been build building firefox took around 11 seconds. See the comments in the file for more details. --- pkgs/build-support/replace-dependency.nix | 80 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 84 insertions(+) create mode 100644 pkgs/build-support/replace-dependency.nix diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix new file mode 100644 index 000000000000..364d55481518 --- /dev/null +++ b/pkgs/build-support/replace-dependency.nix @@ -0,0 +1,80 @@ +{ runCommand, nix, lib }: + +# Replace a single dependency in the requisites tree of drv, propagating +# the change all the way up the tree, without a full rebuild. This can be +# useful, for example, to patch a security hole in libc and still use your +# system safely without rebuilding the world. This should be a short term +# solution, as soon as a rebuild can be done the properly rebuild derivation +# should be used. The old dependency and new dependency MUST have the same-length +# name, and ideally should have close-to-identical directory layout. +# +# Example: safe-firefox = replace-dependency { +# drv = firefox; +# old-dependency = glibc; +# new-dependency = overrideDerivation glibc (attrs: { +# patches = attrs.patches ++ [ ./fix-glibc-hole.patch ]; +# }); +# }; +# This will rebuild glibc with your security patch, then copy over firefox +# (and all of its dependencies) without rebuilding further. +{ drv, old-dependency, new-dependency }: + +with lib; + +let + references = import (runCommand "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' + (echo { + while read path + do + echo " \"$path\" = [" + read count + read count + while [ "0" != "$count" ] + do + read ref_path + if [ "$ref_path" != "$path" ] + then + echo " (builtins.storePath $ref_path)" + fi + count=$(($count - 1)) + done + echo " ];" + done < graph + echo }) > $out + '').outPath; + + discard = builtins.unsafeDiscardStringContext; + + old-storepath = builtins.storePath (discard old-dependency.outPath); + + references-of = drv: getAttr (discard (toString drv)) references; + + depends-on-old = drv: elem old-storepath (references-of drv) || + any depends-on-old (references-of drv); + + drv-name = drv: + discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); + + replace-strings = drv: rewritten-drvs: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } '' + $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${ + concatStringsSep " -e " (mapAttrsToList (name: value: + "'s|${baseNameOf name}|${baseNameOf value}|g'" + ) rewritten-drvs) + } | $nixStore --restore $out + ''; + + fn = { drv, rewritten-drvs }: rewritten-drvs // ( + if depends-on-old drv + then listToAttrs [ { + name = discard (toString drv); + + value = replace-strings drv (rewritten-drvs // (fold (drv: acc: + (fn { inherit drv rewritten-drvs; }) // acc + ) {} (references-of drv))); + } ] + else {} + ); +in assert (stringLength old-dependency.name == stringLength new-dependency.name); getAttr (discard drv.outPath) (fn { + inherit drv; + rewritten-drvs = listToAttrs [ {name = discard old-dependency.outPath; value = new-dependency;} ]; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b59a8a63deae..e6a5b461f09f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -344,6 +344,10 @@ let inherit stdenv; }; + "replace-dependency" = import ../build-support/replace-dependency.nix { + inherit runCommand nix lib; + }; + nukeReferences = callPackage ../build-support/nuke-references/default.nix { }; vmTools = import ../build-support/vm/default.nix { From 779c74f79575952e14b11bfdbe1b15ec9ce5d001 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Jan 2013 16:09:07 -0500 Subject: [PATCH 035/162] Remove some artifacts of a failed attempt from replace-dependency --- pkgs/build-support/replace-dependency.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 364d55481518..56f324841a80 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -63,18 +63,17 @@ let } | $nixStore --restore $out ''; - fn = { drv, rewritten-drvs }: rewritten-drvs // ( + rewritten-deps = listToAttrs [ {name = discard old-dependency.outPath; value = new-dependency;} ]; + + fn = drv: if depends-on-old drv then listToAttrs [ { name = discard (toString drv); - value = replace-strings drv (rewritten-drvs // (fold (drv: acc: - (fn { inherit drv rewritten-drvs; }) // acc + value = replace-strings drv (rewritten-deps // (fold (drv: acc: + (fn drv) // acc ) {} (references-of drv))); } ] - else {} - ); -in assert (stringLength old-dependency.name == stringLength new-dependency.name); getAttr (discard drv.outPath) (fn { - inherit drv; - rewritten-drvs = listToAttrs [ {name = discard old-dependency.outPath; value = new-dependency;} ]; -}) + else {}; +in assert (stringLength old-dependency.name == stringLength new-dependency.name); +getAttr (discard drv.outPath) (fn drv) From 5dd1b8f20476d17d5499bf43aa1dcfbd42053919 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Jan 2013 16:13:58 -0500 Subject: [PATCH 036/162] replace-dependency: Don't strictly require that drv, old-dependency, and new-dependency be derivations --- pkgs/build-support/replace-dependency.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 56f324841a80..b069a64b49c9 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -45,7 +45,7 @@ let discard = builtins.unsafeDiscardStringContext; - old-storepath = builtins.storePath (discard old-dependency.outPath); + old-storepath = builtins.storePath (discard (toString old-dependency)); references-of = drv: getAttr (discard (toString drv)) references; @@ -63,7 +63,7 @@ let } | $nixStore --restore $out ''; - rewritten-deps = listToAttrs [ {name = discard old-dependency.outPath; value = new-dependency;} ]; + rewritten-deps = listToAttrs [ {name = discard (toString old-dependency); value = new-dependency;} ]; fn = drv: if depends-on-old drv @@ -75,5 +75,5 @@ let ) {} (references-of drv))); } ] else {}; -in assert (stringLength old-dependency.name == stringLength new-dependency.name); -getAttr (discard drv.outPath) (fn drv) +in assert (stringLength (drv-name (toString old-dependency)) == stringLength (drv-name (toString new-dependency))); +getAttr (discard (toString drv)) (fn drv) From 96a834d42a1eaf663d5ba6a77fd3045554a77157 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Jan 2013 16:16:20 -0500 Subject: [PATCH 037/162] replace-dependency: Better function names --- pkgs/build-support/replace-dependency.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index b069a64b49c9..016845dd7548 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -55,25 +55,25 @@ let drv-name = drv: discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); - replace-strings = drv: rewritten-drvs: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } '' + rewrite-hashes = drv: hashes: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } '' $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${ concatStringsSep " -e " (mapAttrsToList (name: value: "'s|${baseNameOf name}|${baseNameOf value}|g'" - ) rewritten-drvs) + ) hashes) } | $nixStore --restore $out ''; rewritten-deps = listToAttrs [ {name = discard (toString old-dependency); value = new-dependency;} ]; - fn = drv: + rewritten-derivations = drv: if depends-on-old drv then listToAttrs [ { name = discard (toString drv); - value = replace-strings drv (rewritten-deps // (fold (drv: acc: - (fn drv) // acc + value = rewrite-hashes drv (rewritten-deps // (fold (drv: acc: + (rewritten-derivations drv) // acc ) {} (references-of drv))); } ] else {}; in assert (stringLength (drv-name (toString old-dependency)) == stringLength (drv-name (toString new-dependency))); -getAttr (discard (toString drv)) (fn drv) +getAttr (discard (toString drv)) (rewritten-derivations drv) From bf86b890c85b0f5a263ffc2d8b263effdcc2bb7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:34 +0100 Subject: [PATCH 038/162] haskell-cipher-aes: update to version 0.1.7 --- pkgs/development/libraries/haskell/cipher-aes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index e61fcfd95b56..bae237375854 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.1.5"; - sha256 = "0n0qbq2hwyksdbr6fn7yj5vwicmdrn58mfz0dprl8fj456r4j3kn"; + version = "0.1.7"; + sha256 = "1iai9c4rvxframylvc0xwx2nk6s0rsj4dc42wi334xyinilvfyng"; meta = { homepage = "http://github.com/vincenthz/hs-cipher-aes"; description = "Fast AES cipher implementation with advanced mode of operations"; From 3180c593f00e3c3cef3dcf5f0b661be002e6444b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:34 +0100 Subject: [PATCH 039/162] haskell-cprng-aes: update to version 0.3.4 --- pkgs/development/libraries/haskell/cprng-aes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index de5f400615a1..4f2aa58b7d29 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.3.2"; - sha256 = "1xwwhg83llf9fzfafxsky65biwk0sla9273rp4gqr7vg9p02k221"; + version = "0.3.4"; + sha256 = "0k1zh4nw30qgdrkgn6x6zfbpp129f9cparzyqsdqfbf44j0mf2rw"; buildDepends = [ cipherAes cryptoApi cryptoRandomApi entropy random ]; From 4d6f490c3142c72456302fb43b2659da47c96d42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 040/162] haskell-gitit: update to version 0.10.1.2 --- pkgs/development/libraries/haskell/gitit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index e518dd879a05..aa06d0178bed 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.1.1"; - sha256 = "1akrc362cf3fzfjyyf1g8bzna093kwsiyxdfpz0d9wd3z6jyc8cg"; + version = "0.10.1.2"; + sha256 = "1dy1wdnld6cxx5xqfszywi4f7xv143ar2dq4nb0dnd1dgd5hgmak"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; - jailbreak = true; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; From 5c4b91506e20ef0a219fdb73dcd60c8457d895e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 041/162] haskell-http-conduit: update to version 1.8.6.3 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index aada13af06ae..5009d4132de9 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.6.2"; - sha256 = "0b9iw8gq0kyfmnpv1jba2dx8rik9136zx5q9xdyvy0lczdgb8i09"; + version = "1.8.6.3"; + sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From a1ac3801dd98703d57dafc5711a19aa496a3bf2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 042/162] haskell-libmpd: update to version 0.8.0.2 --- pkgs/development/libraries/haskell/libmpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index f6185597af17..fc77388727fd 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.8.0.1"; - sha256 = "16j2c0dnwllsb979gqf1cl4ylvpldcj8k32ddpp4wf62lbb1mqxm"; + version = "0.8.0.2"; + sha256 = "1phlbb5lsapw2hb0db7906ddlmvnpyk1xbgxvl9zp9zfd0sn40aj"; buildDepends = [ filepath mtl network text time utf8String ]; meta = { homepage = "http://github.com/joachifm/libmpd-haskell"; From cefe3bf3318dff3de17e8bb06156157fde1862a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 043/162] haskell-reactive-banana: update to version 0.7.1.1 --- .../development/libraries/haskell/reactive-banana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 467addefeebd..ef4016d003d5 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.1.0"; - sha256 = "0diklfkc4fq05g5fhgcdkx8y0vmq26zfnmfkj95yvmwks8p9k22r"; + version = "0.7.1.1"; + sha256 = "0d4dqpzglzkygy2hhn1j1c7vk2782mk66f8aqaadkyhijn7kc6i5"; buildDepends = [ hashable transformers unorderedContainers vault ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; From 8d003b28e4be49ae1fedfd49db41cb8e93963485 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 044/162] haskell-wai-extra: update to version 1.3.2 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index bc55da654692..1f08f3f1fd4f 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.1.1"; - sha256 = "0590i9zs47fxqlz4l7zrk15x4s1rvzvp0fs1caygr5hw32v8h0by"; + version = "1.3.2"; + sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network From 1f07564f8b74e0511a9ee6f26e74dc7e152c9950 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:41:44 +0100 Subject: [PATCH 045/162] smartmontools: update drive database to the latest version --- pkgs/tools/system/smartmontools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 89f8d3f5e77f..7a37e1200b48 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -2,8 +2,8 @@ let driverdb = fetchurl { - url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3685"; - sha256 = "11zczy03asfpj4wwip5bf3fpingdc7biz1cs3cykg4vnlxiwjxkx"; + url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3742"; + sha256 = "04xsgxzc1mqn9szazyr6v3xcpw0pszi8vz7xcsb661rww5482rw0"; name = "smartmontools-drivedb.h"; }; in From 5626c5cdfb6de664881eb8b79dd54a8f4ca19b8f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 12 Jan 2013 09:48:21 -0500 Subject: [PATCH 046/162] replace-dependency: don't break nixpkgs for people living in the stone age --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 325882e66ae0..aead61259053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -344,9 +344,9 @@ let inherit stdenv; }; - "replace-dependency" = import ../build-support/replace-dependency.nix { + "replace-dependency" = if builtins ? langVersion then import ../build-support/replace-dependency.nix { inherit runCommand nix lib; - }; + } else args: throw "You must be using at least nix-1.2 to use replace-dependency"; nukeReferences = callPackage ../build-support/nuke-references/default.nix { }; From 5d1296b03f3dbdb2f34ef6e4085e04caafe6ea5e Mon Sep 17 00:00:00 2001 From: Petar Bogdanovic Date: Fri, 11 Jan 2013 20:24:20 +0100 Subject: [PATCH 047/162] qiv: add version 2.2.4 --- pkgs/applications/graphics/qiv/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/graphics/qiv/default.nix diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix new file mode 100644 index 000000000000..05eb83cee29e --- /dev/null +++ b/pkgs/applications/graphics/qiv/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file } : + +stdenv.mkDerivation (rec { + name = "qiv-2.2.4"; + + src = fetchurl { + url = "http://spiegl.de/qiv/download/${name}.tgz"; + sha256 = "ed6078dc550c1dc2fe35c1e0f46463c13589a24b83d4f7101b71a7485e51abb7"; + }; + + buildInputs = [ pkgconfig gtk imlib2 file ]; + + preBuild=''substituteInPlace Makefile --replace /usr/local "$out"''; + + meta = { + description = "qiv (quick image viewer)"; + homepage = http://spiegl.de/qiv/; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aead61259053..6d8d385fd022 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7693,6 +7693,8 @@ let pqiv = callPackage ../applications/graphics/pqiv { }; + qiv = callPackage ../applications/graphics/qiv { }; + # perhaps there are better apps for this task? It's how I had configured my preivous system. # And I don't want to rewrite all rules procmail = callPackage ../applications/misc/procmail { }; From 778540797d8f401631f5927f97f090991b72dd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 13 Jan 2013 12:15:27 +0100 Subject: [PATCH 048/162] iwlwifi: fix URL: firmware has moved from http://intellinuxwireless.org to http://wireless.kernel.org I've only updated the firmware URLs for the firmware I could install without changing the sha256 --- .../linux/firmware/iwlwifi-1000-ucode/default.nix | 5 +++-- .../linux/firmware/iwlwifi-5150-ucode/default.nix | 5 +++-- .../linux/firmware/iwlwifi-6000-ucode/default.nix | 5 +++-- .../linux/firmware/iwlwifi-6000g2a-ucode/default.nix | 5 +++-- .../linux/firmware/iwlwifi-6000g2b-ucode/default.nix | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix index 2660c0b2493d..8acb75c3ed6f 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-1000-ucode-128.50.3.1"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d"; }; @@ -26,6 +27,6 @@ stdenv.mkDerivation rec { driver found in recent kernels. ''; - homepage = http://intellinuxwireless.org/; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; }; } diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix index 0d409bd8427c..dca427cbff53 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-5150-ucode-8.24.2.2"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5150-ucode-8.24.2.2.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "d253e6ff6624639aded67c82df98b2bc4a66eb66400848d5614921d513540cf9"; }; @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { firmware. It contains the `iwlwifi-5150-2.ucode' file. ''; - homepage = http://intellinuxwireless.org/; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; }; } diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix index e5f3effa4b73..2e88f1bba744 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-6000-ucode-9.221.4.1"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b"; }; @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { firmware. It contains the `iwlwifi-6000-4.ucode' file. ''; - homepage = http://intellinuxwireless.org/; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; }; } diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix index 4aea802244f0..ef259b709754 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-6000g2a-ucode-18.168.6.1"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "a7f2615756addafbf3e6912cb0265f9650b2807d1ccdf54b620735772725bbe9"; }; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://intellinuxwireless.org/"; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; description = "Firmware for the Intel 6000 Series Gen2 wireless card"; longDescription = '' diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix index b3a2a810bf7d..0fee3acd0a3c 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-6000g2b-ucode-17.168.5.2"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052"; }; @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { firmware. It contains the `iwlwifi-6000g2b-4.ucode' file. ''; - homepage = http://intellinuxwireless.org/; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; }; } From eb7063db0ce128e342442b891d47101756e7178e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 13 Jan 2013 15:28:38 +0200 Subject: [PATCH 049/162] Vidalia: version bump to 0.2.21 --- pkgs/tools/security/vidalia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 243604c2c79e..6f34d61908e1 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "vidalia-${version}"; - version = "0.2.17"; + version = "0.2.21"; src = fetchurl { url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz"; - sha256 = "0x0vb37h2d5njxmqkss03ybv7b7jw25682xb793mix1m8l0hs44r"; + sha256 = "1rqvvhdqgk6jqrd15invvc4r7p4nckd3b93hhr5dzpc1fxz8w064"; }; buildInputs = [ cmake qt4 ]; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.phreedom ]; platforms = platforms.all; }; -} \ No newline at end of file +} From 4bd5a8e26dc3ceee2111e8520975063d9bee3eb8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 7 Jan 2013 01:09:37 +0100 Subject: [PATCH 050/162] flymake-cursor: upgrade to 0.1.5 --- .../editors/emacs-modes/flymake-cursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix index b629186033f0..0a26e8fd43df 100644 --- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix +++ b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, emacs }: stdenv.mkDerivation rec { - name = "flymake-cursor-0.1.4"; + name = "flymake-cursor-0.1.5"; src = fetchurl { url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el"; - sha256 = "1wxqqmn2fk2b778nksvgn1mi7ajarcpc5lla90xx9jwz47d9hx02"; + sha256 = "1qqppd1786w8pl1avjb01n23lwihb7m0hr23abjklsxz03gmp4qz"; }; phases = [ "buildPhase" "installPhase"]; From 1f0a6fbf5210c813b429071c6a26e8eac7c70c94 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 6 Jan 2013 15:32:07 +0100 Subject: [PATCH 051/162] htmlize: upgrade to 1.43 --- pkgs/applications/editors/emacs-modes/htmlize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix index d4de24d394c1..da3bde88d752 100644 --- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix +++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "htmlize-1.40"; + name = "htmlize-1.43"; builder = ./builder.sh; src = fetchurl { url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi; - sha256 = "1v7pzif5b7dr6iyllqvzka8i6s23rsjdnmilnma054gv8d4shw6a"; + sha256 = "0bdaxh3pjf4z55i7vz4yz3yz45720h8aalhmx13bgkrpijzn93bi"; }; meta = { From 67ff54e4e9ca66b64a1b0684c991f3a3d6f0591b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 7 Jan 2013 01:23:33 +0100 Subject: [PATCH 052/162] iso-codes: upgrade to 3.40 --- pkgs/development/libraries/iso-codes/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index a0119866df0c..4e6614345c17 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, gettext, python}: +{stdenv, fetchurl, gettext, python, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.23"; + name = "iso-codes-3.40"; src = fetchurl { - url = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${name}.tar.bz2"; - sha256 = "0lf9phrdr10biihqswq1qmwk5cz954nwavgbnpm7a5r6vzfzkfbq"; + url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; + sha256 = "0iph96n8vh4khidxg2zzhmcqnphfzg50agn0lv9cjhmnx0i712pr"; }; patchPhase = '' for i in `find . -name \*.py` @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { done ''; buildInputs = [ gettext ]; + nativeBuildInputs = [ xz ]; meta = { homepage = http://pkg-isocodes.alioth.debian.org/; From 6860ab9946098a5c606d09b6c5b8b9a77db4d033 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 6 Jan 2013 16:47:43 +0100 Subject: [PATCH 053/162] jfsutils: upgrade to 1.1.15 --- pkgs/tools/filesystems/jfsutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 79a9fad0e79b..dc07734b9603 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libuuid }: stdenv.mkDerivation rec { - name = "jfsutils-1.1.12"; + name = "jfsutils-1.1.15"; src = fetchurl { url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz"; - sha256 = "04vqdlg90j0mk5jkxpfg9fp6ss4gs1g5pappgns6183q3i6j02hd"; + sha1 = "291e8bd9d615cf3d27e4000117c81a3602484a50"; }; buildInputs = [ libuuid ]; From 1610c526f9ca8655b243a8148ebc8c183b78c0c8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 7 Jan 2013 01:03:19 +0100 Subject: [PATCH 054/162] xfce4 terminal: fix url --- pkgs/desktops/xfce-4.8/applications/terminal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce-4.8/applications/terminal.nix b/pkgs/desktops/xfce-4.8/applications/terminal.nix index 44aa72d9d8c8..f03a940679a6 100644 --- a/pkgs/desktops/xfce-4.8/applications/terminal.nix +++ b/pkgs/desktops/xfce-4.8/applications/terminal.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation { name = "xfce-terminal-0.4.8"; - + src = fetchurl { - url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.8.tar.bz2; + url = http://archive.xfce.org/src/apps/xfce4-terminal/0.4/Terminal-0.4.8.tar.bz2; sha1 = "2f12c3a0fffad18976d47e531d404ee308cb2f05"; }; From 6f90b481dbfa0fdf6c13af9169307d8d3dd3e49b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 6 Jan 2013 16:13:29 +0100 Subject: [PATCH 055/162] nss: add yet another mirror to get the patch from the original url throws 500 the mirror's patch differs (probably upgraded for newer nss) so I found one more source, with a (versioned) url --- pkgs/development/libraries/nss/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e0bd1d2a53ed..8e4edcad8850 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -13,8 +13,9 @@ let secLoadPatch = fetchurl { name = "security_load.patch"; urls = [ - "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch" - "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD" + # "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch" + # "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD" + "http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch" ]; sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47"; }; From cf546347e539d41e4b89db145a688f0193865276 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 14:06:14 +0100 Subject: [PATCH 056/162] linux-3.0: upgrade to 3.0.58 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 4ac4a4b263b5..97b3a6bfd0dc 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.57"; + version = "3.0.58"; 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 = "12rf48ymwsgr133d6cydsajjxb3zihrcrfhpdv185x07dbri9nbl"; + sha256 = "10ahi60ass970vjlhnzcf0y5fk3g7ck1a1lnwzy0kkywp6nb2c10"; }; config = configWithPlatform stdenv.platform; From 91d4d567036e06345e131fa7bb314815c7a9ba33 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 14:06:28 +0100 Subject: [PATCH 057/162] linux-3.4: upgrade to 3.4.25 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index a03e39508912..eef4847e5b2e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.24"; + version = "3.4.25"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1vxyb68ckzgm88jj7xzmwr2hmj5vdry5irvfr89klgqr95mmhkd1"; + sha256 = "0jlnrjxyyfw2f87mr9y8c4337yfbnrj5jp3vhm33dwy7i3vdpfs6"; }; config = configWithPlatform stdenv.platform; From 2d56a2cc150157c9e0dc5fe6c24b0316874f6342 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 14:06:46 +0100 Subject: [PATCH 058/162] linux-3.7: upgrade to 3.7.2 --- pkgs/os-specific/linux/kernel/linux-3.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 1a02910b5c80..4a092fe6b3a7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.7.1"; + version = "3.7.2"; testing = false; preConfigure = '' @@ -254,7 +254,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0mbjvrr0658gg052hbf32vfcmlzfsr777wgmaxrpkpzbfs1qpjp1"; + sha256 = "09s1z2z15xnnqm2syr76l7s3s14zzsalifnnfmry52ibizllzh04"; }; config = configWithPlatform stdenv.platform; From 2738f6d5cc692addee26d374b8ef61e293855a7a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 14:54:26 +0100 Subject: [PATCH 059/162] node/bson: fix sha256 --- pkgs/top-level/node-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 791eb43358ca..083fb573087c 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -128,7 +128,7 @@ let self = { name = "bson-0.1.5"; src = fetchurl { url = "http://registry.npmjs.org/bson/-/${name}.tgz"; - sha256 = "3fad2209466740ea81d0bc285b92d940efe5104a6314946ea40180c431a19692"; + sha256 = "58af4a1697b015190b40c2a7e5743f9d4494887ef98dfe2f58f24c70f2d31150"; }; deps = [ From 4dc4d1012352a97b440ce68681c9cb9643010a60 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 13 Jan 2013 16:17:43 +0200 Subject: [PATCH 060/162] nvidia-legacy304: fix build --- .../linux/nvidia-x11/builder-legacy304.sh | 101 ++++++++++++++++++ .../linux/nvidia-x11/legacy304.nix | 2 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100755 pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh new file mode 100755 index 000000000000..bb8beab29c58 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh @@ -0,0 +1,101 @@ +source $stdenv/setup + +dontPatchELF=1 # must keep libXv, $out in RPATH + + +unpackFile() { + sh $src -x +} + + +buildPhase() { + if test -z "$libsOnly"; then + # Create the module. + echo "Building linux driver against kernel: $kernel"; + cd kernel + kernelVersion=$(cd $kernel/lib/modules && ls) + sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/) + unset src # used by the nv makefile + # Hack necessary to compile on 2.6.28. + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default -I$sysSrc/include/generated" + make SYSSRC=$sysSrc module + cd .. + fi +} + + +installPhase() { + + # Install libGL and friends. + mkdir -p $out/lib/vendors + + for f in \ + libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \ + libnvidia-glcore libnvidia-ml libnvidia-opencl \ + libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia + do + cp -prd $f.* $out/lib/ + ln -snf $f.so.$versionNumber $out/lib/$f.so + ln -snf $f.so.$versionNumber $out/lib/$f.so.1 + done + + cp -p nvidia.icd $out/lib/vendors/ + cp -prd tls $out/lib/ + cp -prd libOpenCL.so.1.0.0 $out/lib/ + ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so + ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1 + + patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* + patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* + patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* + + if test -z "$libsOnly"; then + + # Install the kernel module. + mkdir -p $out/lib/modules/$kernelVersion/misc + cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc + + # Install the X driver. + mkdir -p $out/lib/xorg/modules + cp -p libnvidia-wfb.* $out/lib/xorg/modules/ + mkdir -p $out/lib/xorg/modules/drivers + cp -p nvidia_drv.so $out/lib/xorg/modules/drivers + mkdir -p $out/lib/xorg/modules/extensions + cp -p libglx.so.* $out/lib/xorg/modules/extensions + + ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 + ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so + + patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* + + # Install the programs. + mkdir -p $out/bin + + for i in nvidia-settings nvidia-xconfig; do + cp $i $out/bin/$i + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + done + + # Header files etc. + mkdir -p $out/include/nvidia + cp -p *.h $out/include/nvidia + + mkdir -p $out/share/man/man1 + cp -p *.1.gz $out/share/man/man1 + + mkdir -p $out/share/applications + cp -p *.desktop $out/share/applications + + mkdir -p $out/share/pixmaps + cp -p nvidia-settings.png $out/share/pixmaps + + # Patch the `nvidia-settings.desktop' file. + substituteInPlace $out/share/applications/nvidia-settings.desktop \ + --replace '__UTILS_PATH__' $out/bin \ + --replace '__PIXMAP_PATH__' $out/share/pixmaps + fi +} + + +genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index ad419610df7e..c88eb77c12f9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -13,7 +13,7 @@ let versionNumber = "304.64"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - builder = ./builder.sh; + builder = ./builder-legacy304.sh; src = if stdenv.system == "i686-linux" then From 553e1b16f006d4b17dc0990a5efc693d06ea2805 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 13 Jan 2013 11:15:01 -0500 Subject: [PATCH 061/162] replace-dependency: Eelco has ruled, lowerCamelCase > dash-case :( --- pkgs/build-support/replace-dependency.nix | 36 +++++++++++------------ pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 016845dd7548..098637b4f9b9 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -8,16 +8,16 @@ # should be used. The old dependency and new dependency MUST have the same-length # name, and ideally should have close-to-identical directory layout. # -# Example: safe-firefox = replace-dependency { +# Example: safeFirefox = replaceDependency { # drv = firefox; -# old-dependency = glibc; -# new-dependency = overrideDerivation glibc (attrs: { +# oldDependency = glibc; +# newDependency = overrideDerivation glibc (attrs: { # patches = attrs.patches ++ [ ./fix-glibc-hole.patch ]; # }); # }; # This will rebuild glibc with your security patch, then copy over firefox # (and all of its dependencies) without rebuilding further. -{ drv, old-dependency, new-dependency }: +{ drv, oldDependency, newDependency }: with lib; @@ -45,17 +45,17 @@ let discard = builtins.unsafeDiscardStringContext; - old-storepath = builtins.storePath (discard (toString old-dependency)); + oldStorepath = builtins.storePath (discard (toString oldDependency)); - references-of = drv: getAttr (discard (toString drv)) references; + referencesOf = drv: getAttr (discard (toString drv)) references; - depends-on-old = drv: elem old-storepath (references-of drv) || - any depends-on-old (references-of drv); + dependsOnOld = drv: elem oldStorepath (referencesOf drv) || + any dependsOnOld (referencesOf drv); - drv-name = drv: + drvName = drv: discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); - rewrite-hashes = drv: hashes: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } '' + rewriteHashes = drv: hashes: runCommand (drvName drv) { nixStore = "${nix}/bin/nix-store"; } '' $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${ concatStringsSep " -e " (mapAttrsToList (name: value: "'s|${baseNameOf name}|${baseNameOf value}|g'" @@ -63,17 +63,17 @@ let } | $nixStore --restore $out ''; - rewritten-deps = listToAttrs [ {name = discard (toString old-dependency); value = new-dependency;} ]; + rewrittenDeps = listToAttrs [ {name = discard (toString oldDependency); value = newDependency;} ]; - rewritten-derivations = drv: - if depends-on-old drv + rewrittenDerivations = drv: + if dependsOnOld drv then listToAttrs [ { name = discard (toString drv); - value = rewrite-hashes drv (rewritten-deps // (fold (drv: acc: - (rewritten-derivations drv) // acc - ) {} (references-of drv))); + value = rewriteHashes drv (rewrittenDeps // (fold (drv: acc: + (rewrittenDerivations drv) // acc + ) {} (referencesOf drv))); } ] else {}; -in assert (stringLength (drv-name (toString old-dependency)) == stringLength (drv-name (toString new-dependency))); -getAttr (discard (toString drv)) (rewritten-derivations drv) +in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency))); +getAttr (discard (toString drv)) (rewrittenDerivations drv) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d8d385fd022..44c92f09142c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -344,9 +344,9 @@ let inherit stdenv; }; - "replace-dependency" = if builtins ? langVersion then import ../build-support/replace-dependency.nix { + replaceDependency = import ../build-support/replace-dependency.nix { inherit runCommand nix lib; - } else args: throw "You must be using at least nix-1.2 to use replace-dependency"; + }; nukeReferences = callPackage ../build-support/nuke-references/default.nix { }; From 0f2874dd081d8e0ae59d47ab855af6c283acdec0 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 3 Jan 2013 11:03:16 +0100 Subject: [PATCH 062/162] nvidia96: update to support new X ABI --- .../os-specific/linux/nvidia-x11/acpixf.patch | 27 --------- .../linux/nvidia-x11/generated.patch | 12 ---- .../os-specific/linux/nvidia-x11/legacy96.nix | 16 +---- .../linux/nvidia-x11/patchlevel.patch | 59 ------------------- .../linux/nvidia-x11/switch_to.patch | 24 -------- 5 files changed, 3 insertions(+), 135 deletions(-) delete mode 100644 pkgs/os-specific/linux/nvidia-x11/acpixf.patch delete mode 100644 pkgs/os-specific/linux/nvidia-x11/generated.patch delete mode 100644 pkgs/os-specific/linux/nvidia-x11/patchlevel.patch delete mode 100644 pkgs/os-specific/linux/nvidia-x11/switch_to.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/acpixf.patch b/pkgs/os-specific/linux/nvidia-x11/acpixf.patch deleted file mode 100644 index c94641c69192..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/acpixf.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -pur 96.43.20/conftest.sh 96.43.20-3.4/conftest.sh ---- 96.43.20/conftest.sh 2011-07-18 10:51:11.000000000 +0400 -+++ 96.43.20-3.4/conftest.sh 2012-06-16 00:04:22.870746239 +0400 -@@ -908,6 +908,7 @@ compile_test() { - # - echo "$CONFTEST_PREAMBLE - #include -+ #include - void conftest_acpi_walk_namespace(void) { - acpi_walk_namespace(); - }" > conftest$$.c -@@ -923,6 +924,7 @@ compile_test() { - - echo "$CONFTEST_PREAMBLE - #include -+ #include - void conftest_acpi_walk_namespace(void) { - acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL); - }" > conftest$$.c -@@ -939,6 +941,7 @@ compile_test() { - - echo "$CONFTEST_PREAMBLE - #include -+ #include - void conftest_acpi_walk_namespace(void) { - acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL); - }" > conftest$$.c diff --git a/pkgs/os-specific/linux/nvidia-x11/generated.patch b/pkgs/os-specific/linux/nvidia-x11/generated.patch deleted file mode 100644 index 6cf7a93c6445..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/generated.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pur 173.14.31/conftest.sh 173.14.31-3.3/conftest.sh ---- 173.14.31/conftest.sh 2011-07-18 09:49:58.000000000 +0400 -+++ 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400 -@@ -123,7 +123,7 @@ build_cflags() { - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" - - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" -+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/generated" - fi - if [ -n "$BUILD_PARAMS" ]; then - CFLAGS="$CFLAGS -D$BUILD_PARAMS" diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix index fd27a989c079..8e1fb784ae34 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -2,7 +2,7 @@ let - versionNumber = "96.43.20"; + versionNumber = "96.43.23"; in @@ -15,27 +15,17 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "05vm36jnydp4cfdkfvrvxczd64i3f0pp0yp7dn8y8pklrxi80xxw"; + sha256 = "0hi10h26l51mknr57zsdg0zaxcqdz1lp3hsz0hi1c1vkpbsavrji"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "0a8ninp4wyql3xh6z93dzhbacvz7g0h8gs4pg5279a0i6h05wb1w"; + sha256 = "09vynha40rsxpklj1m0qjfg853ckdpi9g87h06irikh405x57kzp"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; inherit versionNumber kernel; - # Only for kernels 3.4 and over - # Patches taken from arch linux AUR - # https://aur.archlinux.org/packages.php?ID=57698 - kpatches = stdenv.lib.optionals (stdenv.lib.strings.versionOlder "3.4" kernel.version) - [ ./acpixf.patch - ./generated.patch - ./patchlevel.patch - ./switch_to.patch - ]; - dontStrip = true; glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; diff --git a/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch b/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch deleted file mode 100644 index 256922ca966d..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -pur 96.43.20-t1/conftest.sh 96.43.20-t2/conftest.sh ---- 96.43.20-t1/conftest.sh 2012-06-16 17:14:47.206589267 +0400 -+++ 96.43.20-t2/conftest.sh 2012-06-16 15:35:45.049203248 +0400 -@@ -1303,10 +1303,14 @@ case "$5" in - MAKEFILE=$HEADERS/../Makefile - - if [ -f $MAKEFILE ]; then -+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) - PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) - -- if [ -z "$PATCHLEVEL" ]; then -+ if [ -z "$PATCHLEVEL" -o -z "$VERSION" ]; then - exit 1 -+ elif [ "$VERSION" = '3' ]; then -+ echo 6 -+ exit 0 - else - echo $PATCHLEVEL - exit 0 -@@ -1426,10 +1430,11 @@ case "$5" in - # kernel older than 2.6.6, that's all we require to - # build the module. - # -+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) - PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - -- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -+ if [ "$VERSION" = '2' -a -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ - -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 -@@ -1525,11 +1530,12 @@ case "$5" in - # This source tree is not configured, but includes - # the top-level Makefile. - # -+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) - PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - -- if [ -n "$PATCHLEVEL" -a -n "$SUBLEVEL" ]; then -- echo 2.$PATCHLEVEL.$SUBLEVEL -+ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" ]; then -+ echo $VERSION.$PATCHLEVEL.$SUBLEVEL - RET=0 - fi - fi -diff -pur 96.43.20-t1/Makefile.kbuild 96.43.20-t2/Makefile.kbuild ---- 96.43.20-t1/Makefile.kbuild 2011-07-18 10:51:11.000000000 +0400 -+++ 96.43.20-t2/Makefile.kbuild 2012-06-16 17:08:11.694605133 +0400 -@@ -132,7 +132,7 @@ MODULE_ROOT := /lib/modules/$(KERNEL_UNA - # - - TOPDIR ?= $(KERNEL_SOURCES) --PATCHLEVEL ?= $(shell $(CONFTEST) kernel_patch_level) -+PATCHLEVEL := $(shell $(CONFTEST) kernel_patch_level) - - # - # Linux 2.4 uses the .o module extension. Linux 2.6, however, uses the .ko diff --git a/pkgs/os-specific/linux/nvidia-x11/switch_to.patch b/pkgs/os-specific/linux/nvidia-x11/switch_to.patch deleted file mode 100644 index 51ffa7f83f15..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/switch_to.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -pur 173.14.31-3.3/conftest.sh 173.14.31-3.4/conftest.sh ---- 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400 -+++ 173.14.31-3.4/conftest.sh 2012-04-10 19:50:36.052346728 +0400 -@@ -465,7 +465,7 @@ compile_test() { - # and if it as an 'event' member. - # - echo "$CONFTEST_PREAMBLE -- #include -+ #include - #include - void conftest_pm_message_t(pm_message_t state) { - pm_message_t *p = &state; -diff -pur 173.14.31-3.3/nv-linux.h 173.14.31-3.4/nv-linux.h ---- 173.14.31-3.3/nv-linux.h 2011-07-18 09:49:58.000000000 +0400 -+++ 173.14.31-3.4/nv-linux.h 2012-04-10 19:53:04.853776013 +0400 -@@ -92,7 +92,7 @@ - #include - - #include /* do_div() */ --#include /* cli, sli, save_flags */ -+#include /* cli, sli, save_flags */ - #include /* ioremap, virt_to_phys */ - #include /* access_ok */ - #include /* PAGE_OFFSET */ From 982dd693b3bebf8e0a8b778671cdb7a4bf521fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 14 Jan 2013 00:40:23 +0100 Subject: [PATCH 063/162] Adding ffmpeg 1.1 Moving packages using 1.0 to using 1.1. Vlc built fine here. --- pkgs/development/libraries/ffmpeg/1.1.nix | 85 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++- 2 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/ffmpeg/1.1.nix diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix new file mode 100644 index 000000000000..6651f1783f80 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib +, mp3Support ? true, lame ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vorbisSupport ? true, libvorbis ? null +, vpxSupport ? false, libvpx ? null +, x264Support ? true, x264 ? null +, xvidSupport ? true, xvidcore ? null +, vdpauSupport ? true, libvdpau ? null +, faacSupport ? false, faac ? null +, dc1394Support ? false, libdc1394 ? null +, x11grabSupport ? false, libXext ? null, libXfixes ? null +}: + +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert vorbisSupport -> libvorbis != null; +assert vpxSupport -> libvpx != null; +assert x264Support -> x264 != null; +assert xvidSupport -> xvidcore != null; +assert vdpauSupport -> libvdpau != null; +assert faacSupport -> faac != null; +assert x11grabSupport -> libXext != null && libXfixes != null; + +stdenv.mkDerivation rec { + name = "ffmpeg-1.1"; + + src = fetchurl { + url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; + sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; + }; + + # `--enable-gpl' (as well as the `postproc' and `swscale') mean that + # the resulting library is GPL'ed, so it can only be used in GPL'ed + # applications. + configureFlags = [ + "--enable-gpl" + "--enable-postproc" + "--enable-swscale" + "--disable-ffplay" + "--enable-shared" + "--enable-runtime-cpudetect" + ] + ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" + ++ stdenv.lib.optional speexSupport "--enable-libspeex" + ++ stdenv.lib.optional theoraSupport "--enable-libtheora" + ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" + ++ stdenv.lib.optional vpxSupport "--enable-libvpx" + ++ stdenv.lib.optional x264Support "--enable-libx264" + ++ stdenv.lib.optional xvidSupport "--enable-libxvid" + ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" + ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" + ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" + ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; + + buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] + ++ stdenv.lib.optional mp3Support lame + ++ stdenv.lib.optional speexSupport speex + ++ stdenv.lib.optional theoraSupport libtheora + ++ stdenv.lib.optional vorbisSupport libvorbis + ++ stdenv.lib.optional vpxSupport libvpx + ++ stdenv.lib.optional x264Support x264 + ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional faacSupport faac + ++ stdenv.lib.optional dc1394Support libdc1394 + ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; + + enableParallelBuilding = true; + + crossAttrs = { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + "--cross-prefix=${stdenv.cross.config}-" + "--enable-cross-compile" + "--target_os=linux" + "--arch=${stdenv.cross.arch}" + ]; + }; + + meta = { + homepage = http://www.ffmpeg.org/; + description = "A complete, cross-platform solution to record, convert and stream audio and video"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44c92f09142c..1618dd7e7094 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -545,7 +545,7 @@ let cfdg = builderDefsPackage ../tools/graphics/cfdg { inherit libpng bison flex; - ffmpeg = ffmpeg_1_0; + ffmpeg = ffmpeg_1_1; }; checkinstall = callPackage ../tools/package-management/checkinstall { }; @@ -3612,6 +3612,10 @@ let vpxSupport = !stdenv.isMips; }; + ffmpeg_1_1 = callPackage ../development/libraries/ffmpeg/1.1.nix { + vpxSupport = !stdenv.isMips; + }; + fftw = callPackage ../development/libraries/fftw { singlePrecision = false; }; @@ -8002,7 +8006,7 @@ let }; vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_1_0; + ffmpeg = ffmpeg_1_1; }; vnstat = callPackage ../applications/networking/vnstat { }; From c17fa1ebf23ad1485ce5882d8ffe338b1e2b1f05 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 14 Jan 2013 10:10:06 +0200 Subject: [PATCH 064/162] Quassel: version bump to 0.7.4 --- pkgs/applications/networking/irc/quassel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 8dcde90e538e..16aaf3d9f3b2 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -11,11 +11,11 @@ let in with stdenv; mkDerivation rec { - name = "quassel-0.7.1"; + name = "quassel-0.7.4"; src = fetchurl { url = "http://quassel-irc.org/pub/${name}.tar.bz2"; - sha256 = "1kby1yikiv5bpzkdri5dq39pxnsj9gjrcv1gigvy2jzy3g99qjli"; + sha256 = "08f4m35bkmp9p1n560a3fg711s9izb25ddx2az03xzf1jl8qdrg7"; }; buildInputs = [ cmake qt4 ] From 4f8314fb92ee57cda5103ba961d8dc9c963ffad4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Jan 2013 11:21:12 +0100 Subject: [PATCH 065/162] chromium: Update dev channel to 25.0.1364.29. For this update we needed to fix a bunch of things: * Limit pulse_audio_fix.patch to version 24 only (fixed upstream in 25). * Avoid the use of -fstack-protector for version 25. The -fstack-protector option seems to be passed to libvpx now by default, so simply use -fno-stack-protector in every occurence of -fstack-protector in common.gypi. At least for now this will do it, but ultimately and for the future we may want to have support for that in general. And if we need that support in chromium directly depends on some of the next updates to this package, as it seems that we now can switch to quite a lot of nixpkgs dependencies instead of bundled dependencies. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 5 ++++- pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 62a4c6cc211a..e32b31dc8569 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -78,8 +78,9 @@ let post23 = !versionOlder sourceInfo.version "24.0.0.0"; post24 = !versionOlder sourceInfo.version "25.0.0.0"; + only24 = post23 && !post24; - maybeFixPulseAudioBuild = optional (post23 && pulseSupport) + maybeFixPulseAudioBuild = optional (only24 && pulseSupport) ./pulse_audio_fix.patch; in stdenv.mkDerivation rec { @@ -120,6 +121,8 @@ in stdenv.mkDerivation rec { postPatch = optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl + '' + optionalString post24 '' + sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 7b252da6824e..c7352efc0028 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,9 +1,9 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "25.0.1323.1"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1323.1.tar.bz2"; - sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s"; + version = "25.0.1364.29"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.29.tar.bz2"; + sha256 = "0da3in98b65rb9wkj9jxb3n07d5k7s1xpqwpvk1jz9jbp0hw7ijp"; }; beta = { version = "24.0.1312.35"; From 72b248b932ca87595f400966af34ece8001d5aba Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Jan 2013 11:28:45 +0100 Subject: [PATCH 066/162] chromium: Update stable and beta to v24.0.1312.52. The current beta version of chromium just became stable, which means that we are now exactly in par with the beta channel. Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index c7352efc0028..b274527dfba0 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,13 +6,13 @@ sha256 = "0da3in98b65rb9wkj9jxb3n07d5k7s1xpqwpvk1jz9jbp0hw7ijp"; }; beta = { - version = "24.0.1312.35"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.35.tar.bz2"; - sha256 = "0mb6xz5lrnzjk1zqr83jyprsxv20svy3a7lyxv9iwdb2bh1i13ci"; + version = "24.0.1312.52"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2"; + sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk"; }; stable = { - version = "23.0.1271.97"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.97.tar.bz2"; - sha256 = "1qf21n6msj1jmxhnlw8fapsz7q6dd851rxdqv4334v06ny4i5fip"; + version = "24.0.1312.52"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2"; + sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk"; }; } From 29aa4af7961ff3dd49c84f30242ff7f67cea5543 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 9 Jan 2013 22:43:48 +0100 Subject: [PATCH 067/162] tkabber: Add ${tk}/bin to wrapper's PATH. Pesky little impurity is now fixed, as it has bitten me several times in the last days. Signed-off-by: aszlig --- .../networking/instant-messengers/tkabber/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 03a98cb20597..fd989739c941 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/tkabber \ + --prefix PATH : "${tk}/bin" \ --set TCLLIBPATH '"${tclLibPaths}"' \ --set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins' ''; From e2521650b4ad8200260ca7c51ad2a38d40ca2baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Jan 2013 11:34:19 +0100 Subject: [PATCH 068/162] Update acpi, fix homepage, download from sourceforge. --- pkgs/os-specific/linux/acpi/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 84ee44868079..42119208f125 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "acpi-1.5"; - + name = "acpi-${version}"; + version = "1.6"; + src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/a/acpi/acpi_1.5.orig.tar.gz"; - sha256 = "1pb020j627ldjm1askqfzp6cjxrs79ail8svihanv7pgbg5r3zsp"; + url = "mirror://sf/acpiclient/${version}/${name}.tar.gz"; + sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd"; }; meta = { @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { the "old" `apm' command on ACPI systems. It includes battery and thermal information. ''; - homepage = http://grahame.angrygoats.net/acpi.shtml; + homepage = http://sourceforge.net/projects/acpiclient/; license = "GPLv2+"; }; } From 7fd42a83806404c5a8c6f6eadaad9f6f910d187f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 12:00:32 +0100 Subject: [PATCH 069/162] Get rid of the "sf" alias for "sourceforge" --- pkgs/applications/editors/jedit/default.nix | 2 +- pkgs/applications/misc/semnotes/default.nix | 2 +- pkgs/build-support/fetchurl/mirrors.nix | 2 -- pkgs/data/fonts/libertine/default.nix | 2 +- pkgs/development/libraries/clucene-core/default.nix | 2 +- pkgs/development/libraries/cppunit/default.nix | 2 +- pkgs/development/libraries/hunspell/default.nix | 2 +- pkgs/development/libraries/indilib/default.nix | 2 +- pkgs/development/libraries/libnova/default.nix | 2 +- pkgs/development/libraries/libqalculate/default.nix | 2 +- pkgs/development/libraries/libxklavier/default.nix | 2 +- pkgs/development/libraries/qimageblitz/default.nix | 2 +- pkgs/development/libraries/qjson/default.nix | 2 +- pkgs/development/libraries/science/math/atlas/default.nix | 2 +- pkgs/games/uqm/default.nix | 8 ++++---- pkgs/os-specific/linux/acpi/default.nix | 2 +- pkgs/servers/mail/freepops/default.nix | 2 +- pkgs/tools/misc/ised/default.nix | 2 +- 18 files changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 194f13a090cd..efaf719c7c47 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jedit-4.4.2"; src = fetchurl { - url = mirror://sf/jedit/jedit4.4.2source.tar.bz2; + url = mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2; sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb"; }; diff --git a/pkgs/applications/misc/semnotes/default.nix b/pkgs/applications/misc/semnotes/default.nix index fbc4df3a0b77..52a575130c0e 100644 --- a/pkgs/applications/misc/semnotes/default.nix +++ b/pkgs/applications/misc/semnotes/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "semnotes-0.4.0-1"; src = fetchurl { - url = "mirror://sf/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2"; + url = "mirror://sourceforge/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2"; sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m"; }; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 22b808b71aac..98dd7d8fb8ea 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -20,8 +20,6 @@ rec { http://kent.dl.sourceforge.net/sourceforge/ ]; - sf = sourceforge; - # GNU (http://www.gnu.org/prep/ftp.html). gnu = [ # This one redirects to a (supposedly) nearby and (supposedly) up-to-date diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index 514690cb0cd2..b8c0db222d5f 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -2,7 +2,7 @@ args: with args; rec { name = "linux-libertine-5.3.0"; src = fetchurl { - url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; + url = mirror://sourceforge/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index d180c4761e88..abd6712736f5 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "clucene-core-0.9.21b"; src = fetchurl { - url = "mirror://sf/clucene/${name}.tar.bz2"; + url = "mirror://sourceforge/clucene/${name}.tar.bz2"; sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317"; }; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index dbbcf4388c5a..2504f87a230a 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cppunit-1.12.0"; src = fetchurl { - url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz; + url = mirror://sourceforge/cppunit/cppunit-1.12.0.tar.gz; sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; }; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index c5243bc63930..04be58eb50a6 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "hunspell-1.3.2"; src = fetchurl { - url = "mirror://sf/hunspell/${name}.tar.gz"; + url = "mirror://sourceforge/hunspell/${name}.tar.gz"; sha256 = "1gfxdajnqk2civkshkfjx5ldg7kjdgj76m5khpsbjk4lxsjd9vdl"; }; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 9fc5ac665e8b..31cbe772916d 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "indilib-0.8"; src = fetchurl { - url = mirror://sf/indi/libindi_0.8.tar.gz; + url = mirror://sourceforge/indi/libindi_0.8.tar.gz; sha256 = "d5ed14a5de6fd6e5db15463ada96c2b15b53e84a1ffe199b76f70128493f2a65"; }; diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index e24a93c10439..28decb9cfca0 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libnova-0.12.1"; src = fetchurl { - url = "mirror://sf/libnova/${name}.tar.gz"; + url = "mirror://sourceforge/libnova/${name}.tar.gz"; sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0"; }; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 9c75bd51db14..bf1a1e232bb6 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libqalculate-0.9.7"; src = fetchurl { - url = "mirror://sf/qalculate/${name}.tar.gz"; + url = "mirror://sourceforge/qalculate/${name}.tar.gz"; sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs"; }; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 419f9a497c08..b50399d4f108 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libxklavier-5.0"; src = fetchurl { - url = "mirror://sf/gswitchit/${name}.tar.bz2"; + url = "mirror://sourceforge/gswitchit/${name}.tar.bz2"; sha256 = "1c2dxinjfpq1lzxi0z46r0j80crbmwb0lkvnh6987cjjlwblpnfz"; }; diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 4aac06a51014..5800b562e6b0 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "${pn}-${v}"; src = fetchurl { - url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2"; + url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2"; sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index a4b146ff424f..af960c1b9933 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qjson-0.7.1"; src = fetchurl { - url = "mirror://sf/qjson/${name}.tar.bz2"; + url = "mirror://sourceforge/qjson/${name}.tar.bz2"; sha256 = "155r7nypgnsvjc6w3q51zmjchpqxi4c3azad9cf1fip8bws993iv"; }; diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 2cca8d7d9c44..75f9de5e96a2 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "atlas-3.9.67"; src = fetchurl { - url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2; + url = mirror://sourceforge/math-atlas/atlas3.9.67.tar.bz2; sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa"; }; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 6e67ce660f14..a9fe9d596c78 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -8,22 +8,22 @@ stdenv.mkDerivation rec { version = "0.7.0"; src = fetchurl { - url = "mirror://sf/sc2/uqm-${version}-source.tgz"; + url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz"; sha256 = "a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221"; }; content = fetchurl { - url = "mirror://sf/sc2/uqm-${version}-content.uqm"; + url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm"; sha256 = "b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf"; }; voice = fetchurl { - url = "mirror://sf/sc2/uqm-${version}-voice.uqm"; + url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm"; sha256 = "bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979"; }; music = fetchurl { - url = "mirror://sf/sc2/uqm-${version}-3domusic.uqm"; + url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm"; sha256 = "c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82"; }; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 42119208f125..6bb44d7db449 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6"; src = fetchurl { - url = "mirror://sf/acpiclient/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz"; sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd"; }; diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix index d58660297623..c80d0f04bda9 100644 --- a/pkgs/servers/mail/freepops/default.nix +++ b/pkgs/servers/mail/freepops/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "freepops-0.2.9"; src = fetchurl { - url = mirror://sf/freepops/0.2.9/freepops-0.2.9.tar.gz; + url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz; sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae"; }; buildInputs = [pkgconfig openssl lua5 curl readline bison expat]; diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index f5f9112639c5..0a04886f64c6 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -12,7 +12,7 @@ let baseName="ised"; version="2.2.2"; name="${baseName}-${version}"; - url="mirror://sf/project/ised/${name}.tar.bz2"; + url="mirror://sourceforge/project/ised/${name}.tar.bz2"; hash="1nb1cnsbs2k3j9cy2kc2kg01rd7wf3jwxm62rwn1rjlc46nwdlmn"; }; in From 479b58d706017a56c39acda94e4b868511c9b39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Jan 2013 12:20:34 +0100 Subject: [PATCH 070/162] Update vlc (minor bugfix). --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3341a01101c0..7d04a02f27f5 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "1dixankckfxf8xixfc32rc9mfsv6mx2lk5h13ym8bp4dsk86w1jf"; + sha256 = "0vkbv477a7z0v55sigz6c3abxljz7jyysp7z8s29zk8vhq0fpyfz"; }; buildInputs = From 58e9406f4b834468dbf320754edf12994affc27c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 13:08:09 +0100 Subject: [PATCH 071/162] subversion: Update to 1.7.8 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 8e454ad9f8f0..885e4310a593 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.7"; + version = "1.7.8"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "c9fc0c5992eda36ba9affd93a15929e25958a951"; + sha1 = "12c7d8d5414bba74c9777c4d1dae74f152df63c2"; }; buildInputs = [ zlib apr aprutil sqlite ] From f59881fc30d3e72d72f6f2e9e3688226bea0d2e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 13:10:16 +0100 Subject: [PATCH 072/162] mplayer: Change directory name / attribute name from MPlayer to mplayer --- .../browsers/mozilla-plugins/gecko-mediaplayer/default.nix | 4 ++-- pkgs/applications/video/{MPlayer => mplayer}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/applications/video/{MPlayer => mplayer}/default.nix (100%) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index 0ff7c92d3d89..44f191e54f1d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11 -, GConf, gnome_mplayer, MPlayer, gmtk +, GConf, gnome_mplayer, mplayer, gmtk }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # browser's $PATH. postInstall = '' - echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path + echo "${gnome_mplayer}/bin:${mplayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path ''; passthru.mozillaPlugin = "/lib/mozilla/plugins"; diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/mplayer/default.nix similarity index 100% rename from pkgs/applications/video/MPlayer/default.nix rename to pkgs/applications/video/mplayer/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1618dd7e7094..f5b7409a0155 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7543,7 +7543,7 @@ let ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; - MPlayer = callPackage ../applications/video/MPlayer { + mplayer = callPackage ../applications/video/mplayer { pulseSupport = config.pulseaudio or false; }; From 8497455143be03322259219f5257de7dd230aa6b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 14:38:00 +0100 Subject: [PATCH 073/162] apr-util: Update to 1.5.1 --- pkgs/development/libraries/apr-util/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index ad02f9b84cce..5f6291127e93 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null; assert ldapSupport -> openldap != null; stdenv.mkDerivation rec { - name = "apr-util-1.4.1"; + name = "apr-util-1.5.1"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "52b31b33fb1aa16e65ddaefc76e41151"; + md5 = "9c1db8606e520f201c451ec9a0b095f6"; }; configureFlags = '' @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap; + enableParallelBuilding = true; + passthru = { inherit sslSupport bdbSupport ldapSupport; }; From f286cc65b111df56c5df23af09dbd2d8eb598ccc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 18:26:46 +0100 Subject: [PATCH 074/162] Fix bad URLs lacking a scheme --- pkgs/applications/graphics/gocr/default.nix | 2 +- pkgs/applications/science/logic/iprover/default.nix | 2 +- pkgs/applications/science/logic/opensmt/default.nix | 2 +- pkgs/os-specific/linux/pmtools/default.nix | 4 ++-- pkgs/tools/graphics/mscgen/default.nix | 6 +++--- pkgs/tools/system/hardlink/default.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 0e8f860c5101..0f42ac7743e3 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gocr-0.49"; src = fetchurl { - url = "www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz"; + url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz; sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; }; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 91d8c122a8d4..2acc0ac8d89a 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -13,7 +13,7 @@ let baseName="iprover"; version="0.8.1"; name="${baseName}_v${version}"; - url="${baseName}.googlecode.com/files/${name}.tar.gz"; + url="http://${baseName}.googlecode.com/files/${name}.tar.gz"; hash="15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w"; }; in diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 165c8a2f1484..430537fd57ff 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -15,7 +15,7 @@ let version="20101017"; name="${baseName}-${version}"; filename="${baseName}_src_${version}"; - url="${baseName}.googlecode.com/files/${filename}.tgz"; + url="http://${baseName}.googlecode.com/files/${filename}.tgz"; hash="0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1"; }; in diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix index 1cb2220a3bdc..13a6e87319ed 100644 --- a/pkgs/os-specific/linux/pmtools/default.nix +++ b/pkgs/os-specific/linux/pmtools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pmtools-20071116"; src = fetchurl { - url = "www.lesswatts.org/patches/linux_acpi/${name}.tar.gz"; + url = "http://www.lesswatts.org/patches/linux_acpi/${name}.tar.gz"; sha256 = "91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.lesswatts.org/projects/acpi/utilities.php"; + homepage = http://www.lesswatts.org/projects/acpi/utilities.php; description = "Linux ACPI utilities"; license = "GPLv2"; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 63e6afaa8039..ed69327b752a 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "mscgen-${version}"; src = fetchurl { - url = "www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; + url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; @@ -19,8 +19,8 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.mcternan.me.uk/mscgen/"; - description = "convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; + homepage = http://www.mcternan.me.uk/mscgen/; + description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; license = "GPLv2"; longDescription = '' diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 192f7d871a1f..982aac3c9900 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "hardlink-2012.9.${rev}"; src = fetchurl { - url = "pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; + url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647"; name = "hardlink-${rev}.zip"; }; From bb6db816fe915a589155b45978b4a5a067945b46 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 23:08:27 +0100 Subject: [PATCH 075/162] mplayer: Disable use of unfree binary codecs by default --- pkgs/applications/video/mplayer/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 944af1c26571..357c6eec6e7e 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -18,6 +18,7 @@ , pulseSupport ? false, pulseaudio ? null # For screenshots , libpngSupport ? true, libpng ? null +, useUnfreeCodecs ? false }: assert x11Support -> (libX11 != null && libXext != null && mesa != null); @@ -66,9 +67,7 @@ let cp -prv * $out ''; - meta = { - license = "unfree"; - }; + meta.license = "unfree"; } else null; in @@ -140,8 +139,7 @@ stdenv.mkDerivation rec { ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} ${if jackaudioSupport then "--enable-jack" else "--disable-jack"} ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} - - ${optionalString (codecs != null) "--codecsdir=${codecs}"} + ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} --enable-freetype --disable-xanim @@ -154,6 +152,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + enableParallelBuilding = true; + # Provide a reasonable standard font. Maybe we should symlink here. postInstall = '' From 0731cd042cba0a3176e52f5c0453e79a70338009 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 23:28:18 +0100 Subject: [PATCH 076/162] eval-release.nix: Handle exceptions properly --- maintainers/scripts/eval-release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 7af2b5b5bd92..ccbe064ee321 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -5,7 +5,7 @@ with import ../../pkgs/lib; let - trace = if (builtins.getEnv "VERBOSE") == "1" then builtins.trace else (x: y: y); + trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ]; @@ -13,7 +13,7 @@ let strictAttrs = as: seqList (attrValues as) as; - maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null; + maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" {}; call = attrs: flip mapAttrs attrs (n: v: trace n ( From be989567c88600b7f9af16496485a17ea6c965d0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 15 Jan 2013 07:13:30 +0200 Subject: [PATCH 077/162] Torsocks is not compatible with certain apps like Kopete. Will integrate both in NixOS. Revert "removing tsocks as it has been replaced by torsocks." This reverts commit f947527f184446572ad3e36c4423b23e797aeb5a. --- pkgs/development/libraries/tsocks/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/tsocks/default.nix diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix new file mode 100644 index 000000000000..a0d607517ac3 --- /dev/null +++ b/pkgs/development/libraries/tsocks/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "tsocks-${version}"; + version = "1.8beta5"; + + src = fetchurl { + url = "mirror://sourceforge/tsocks/${name}.tar.gz"; + sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; + }; + + preConfigure = '' + export configureFlags="$configureFlags --libdir=$out/lib" + ''; + + meta = with stdenv.lib; { + description = "Transparent SOCKS v4 proxying library"; + homepage = http://tsocks.sourceforge.net/; + license = "GPLv2"; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b7409a0155..f7e84af2332d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5033,6 +5033,8 @@ let unicap = callPackage ../development/libraries/unicap {}; + tsocks = callPackage ../development/libraries/tsocks { }; + unixODBC = callPackage ../development/libraries/unixODBC { }; unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers { From 5dcdcf4af38bda591f8b11926cbe50b11fd4c855 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 15 Jan 2013 07:42:35 +0200 Subject: [PATCH 078/162] Remove Wine-Warcraft because WarCraft 3 works just fine in vanilla Wine now. --- pkgs/misc/emulators/wine/wine-warcraft.nix | 49 ---------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 51 deletions(-) delete mode 100644 pkgs/misc/emulators/wine/wine-warcraft.nix diff --git a/pkgs/misc/emulators/wine/wine-warcraft.nix b/pkgs/misc/emulators/wine/wine-warcraft.nix deleted file mode 100644 index 3573c0ba4fe1..000000000000 --- a/pkgs/misc/emulators/wine/wine-warcraft.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchgit, xlibs, flex, bison, mesa, alsaLib -, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge -, libxml2, libxslt, openssl, gnutls -}: - -assert stdenv.isLinux; -assert stdenv.gcc.gcc != null; - -stdenv.mkDerivation rec { - name = "wine-warcraft-${version}"; - version = "1.1.19"; - - src = fetchgit { - url = git://repo.or.cz/wine/warcraft3.git; - rev = "38faaffd99331b71284d8da5f76f38625107ed6d"; - }; - - buildInputs = [ - xlibs.xlibs flex bison xlibs.libXi mesa - xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr - xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite - xlibs.xf86vidmodeproto - alsaLib ncurses libpng libjpeg lcms fontforge - libxml2 libxslt openssl gnutls - ]; - - # Wine locates a lot of libraries dynamically through dlopen(). Add - # them to the RPATH so that the user doesn't have to set them in - # LD_LIBRARY_PATH. - NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm - xlibs.libXinerama xlibs.libXrender xlibs.libXrandr - xlibs.libXcursor xlibs.libXcomposite xlibs.libXxf86vm - xlibs.xf86vidmodeproto - openssl gnutls - ]; - - # Don't shrink the ELF RPATHs in order to keep the extra RPATH - # elements specified above. - dontPatchELF = true; - - meta = with stdenv.lib; { - homepage = "http://www.winehq.org/"; - license = "LGPL"; - description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix with patches for Warcraft 3"; - maintainers = [ maintainers.phreedom ]; - platforms = [ "i686-linux" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7e84af2332d..64119eda2aa8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9157,8 +9157,6 @@ let # Wine cannot be built in 64-bit; use a 32-bit build instead. wine = callPackage_i686 ../misc/emulators/wine { }; - wineWarcraft = callPackage_i686 ../misc/emulators/wine/wine-warcraft.nix { }; - x2x = callPackage ../tools/X11/x2x { }; xosd = callPackage ../misc/xosd { }; From 76d8b3a530c3116b21afd25c24fec16983bf94cf Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 15 Jan 2013 08:13:56 +0200 Subject: [PATCH 079/162] torsocks: version bump to 1.2 --- pkgs/tools/security/tor/torsocks.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 83cfee07e66e..ac60ccb16a1f 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "torsocks"; name = "${pname}-${version}"; - version = "1.0-epsilon"; + version = "1.2"; src = fetchurl { url = "http://${pname}.googlecode.com/files/${name}.tar.gz"; - sha256 = "0508i4q9gm0rrav018z1jn4as5if3qrfdng6dmmzgs324hvdgap5"; + sha256 = "1m0is5q24sf7jjlkl0icfkdc0m53nbkg0q72s57p48yp4hv7v9dy"; }; preConfigure = '' From a049615e9143707a48786f5970bd6fbecd42c73c Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 15 Jan 2013 15:03:38 +0100 Subject: [PATCH 080/162] source-tarball.nix: try src.revCount when src.rev is not available. --- pkgs/build-support/release/source-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 85d0b29f5b70..887bfb3125ca 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -9,7 +9,7 @@ , versionSuffix ? if officialRelease then "" - else if src ? rev then "pre${toString src.rev}" else "" + else "pre${toString (src.rev or src.revCount or "")}" , src, stdenv, autoconf, automake, libtool , ... } @ args: From bfa0495344d4236edc51ca3e3d065e6d7c98d5ca Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 15 Jan 2013 17:52:53 +0100 Subject: [PATCH 081/162] remove old inactive pth file creation for buildInputs --- pkgs/development/python-modules/generic/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index c7157110758a..8a70741c36b3 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -90,8 +90,6 @@ python.stdenv.mkDerivation (attrs // { '' wrapPythonPrograms - # these should already be in $name.pth - #createBuildInputsPth build-inputs "$buildInputStrings" for inputsfile in propagated-build-inputs propagated-build-native-inputs; do if test -e $out/nix-support/$inputsfile; then createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" From f5df5847bd7c4cfe4b16af4efdb0257210fb8d44 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 15 Jan 2013 18:29:42 +0100 Subject: [PATCH 082/162] add comment --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdd27b4628c6..3bb41a94bd61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5291,6 +5291,10 @@ let pythonPackages = python27Packages; + # `nix-env -i python-nose` installs for 2.7, the default python. + # Therefore we do not recurse into attributes here, in contrast to + # python27Packages. `nix-env -iA python26Packages.nose` works + # regardless. python26Packages = import ./python-packages.nix { inherit pkgs; python = python26; From 4c9cfd87aad71540bb68b553bd16ef605cd2c824 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 16:39:25 +0100 Subject: [PATCH 083/162] bazaar: Update to 2.5.1 --- pkgs/applications/version-management/bazaar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 856320f01684..1eb114ecd8ce 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "2.3"; + version = "2.5"; release = ".1"; name = "bazaar-${version}${release}"; src = fetchurl { url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; - sha256 = "07kx41w4gqv68bcykdflsg68wvpmcyqknzyb4vr1zqlf27hahp53"; + sha256 = "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; From 45b0bcbc69994d237f734356117f6ee24e87b2ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 16:42:29 +0100 Subject: [PATCH 084/162] v86d: Fix URL --- pkgs/os-specific/linux/v86d/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index aedfe9ac6861..f0f7fcbb9cee 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, klibc, kernel, withKlibc ? true}: stdenv.mkDerivation rec { - name = "v86d-0.1.10-${kernel.version}"; + name = "v86d-${version}-${kernel.version}"; + version = "0.1.10"; src = fetchurl { - url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2"; + url = "mirror://gentoo/distfiles//v86d-${version}.tar.bz2"; sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3"; }; From a6768a8df215bea572832d7c8778dd4d1672a735 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 16:46:30 +0100 Subject: [PATCH 085/162] logrotate: Update to 3.8.3 --- pkgs/tools/system/logrotate/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index a9994f14b57a..784c8e75e768 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, gzip, popt}: +{ stdenv, fetchurl, gzip, popt }: stdenv.mkDerivation rec { - name = "logrotate-3.7.8"; + name = "logrotate-3.8.3"; src = fetchurl { - url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.8.tar.gz; - sha256 = "1p9nqmznqvzn03saw3jxa8xwsdqym8jr778rwig8kk786343vai1"; + url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz"; + sha256 = "0xqrz8xzs2c1vx8l5h9lp2ciwwifj7y52xsppb1vrvbi254vyxh7"; }; # Logrotate wants to access the 'mail' program; to be done. @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ popt ]; meta = { - homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; + homepage = https://fedorahosted.org/releases/l/o/logrotate/; description = "Rotates and compresses system logs"; license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.all; }; } From 634aa5020d3f62f1bb2dda929cabb6865c27578b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:43:53 +0100 Subject: [PATCH 086/162] module-init-tools: Fix URL --- pkgs/os-specific/linux/module-init-tools/default.nix | 2 +- pkgs/os-specific/linux/powertop/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index 077d08f899da..240150b09ddb 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = [ (fetchurl { - url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2; + url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2; sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1"; }) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 68075d115a48..2fb852acc31a 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -2,6 +2,7 @@ stdenv.mkDerivation rec { name = "powertop-2.1"; + src = fetchurl { url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x"; From 7cf37131879eeee67e8a6c0f9511ed5b1abc3202 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:45:39 +0100 Subject: [PATCH 087/162] cpufrequtils: Fix URL --- pkgs/os-specific/linux/cpufrequtils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 35bf57c269ea..e9e0a36f1565 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "cpufrequtils-008"; src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz"; + url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz; md5 = "52d3e09e47ffef634833f7fab168eccf"; }; From 4bca4fa2b81a7ce6427ab01c6c4f89d6962c4adf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:47:21 +0100 Subject: [PATCH 088/162] reiserfsprogs: Fix URL --- pkgs/tools/filesystems/reiserfsprogs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 2283a0c17460..2c14bc624ae3 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "reiserfsprogs-3.6.21"; src = fetchurl { - url = "mirror://kernel/linux/utils/fs/reiserfs/${name}.tar.bz2"; + url = "http://ftp.be.debian.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2"; sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam"; }; From 1d174fb9740732e425d1b5698fbe4d46802fcf6f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:48:54 +0100 Subject: [PATCH 089/162] linux-pam: Fix URL --- pkgs/os-specific/linux/pam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index c18ea2b1f2b4..7da03cf9cad9 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "linux-pam-1.1.1"; src = fetchurl { - url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.1.tar.bz2; + url = http://www.linux-pam.org/library/Linux-PAM-1.1.1.tar.bz2; sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0"; }; From c7701c0786e1afda3f8dd94661e12801cb0677a2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 15 Jan 2013 19:04:41 +0100 Subject: [PATCH 090/162] python-pyquery-1.2.4 and dep python-cssselect-0.7.1 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c247f858b5a4..e2f75b5ce63f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -486,6 +486,16 @@ let pythonPackages = python.modules // rec { }; }; + cssselect = buildPythonPackage rec { + name = "cssselect-0.7.1"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/cssselect/cssselect-0.7.1.tar.gz"; + md5 = "c6c5e9a2e7ca226ce03f6f67a771379c"; + }; + # AttributeError: 'module' object has no attribute 'tests' + doCheck = false; + }; + cssutils = buildPythonPackage (rec { name = "cssutils-0.9.9"; @@ -2199,6 +2209,16 @@ let pythonPackages = python.modules // rec { }; + pyquery = buildPythonPackage rec { + name = "pyquery-1.2.4"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz"; + md5 = "268f08258738d21bc1920d7522f2a63b"; + }; + buildInputs = [ cssselect lxml ]; + }; + + pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; From d3e54e01258cbb1d7b50ff9f1b424c7b14a4ab22 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 15 Jan 2013 19:04:41 +0100 Subject: [PATCH 091/162] python-pyquery-1.2.4 and dep python-cssselect-0.7.1 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41b545a68623..5437ef1e65c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -458,6 +458,16 @@ let pythonPackages = python.modules // rec { }; }; + cssselect = buildPythonPackage rec { + name = "cssselect-0.7.1"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/cssselect/cssselect-0.7.1.tar.gz"; + md5 = "c6c5e9a2e7ca226ce03f6f67a771379c"; + }; + # AttributeError: 'module' object has no attribute 'tests' + doCheck = false; + }; + cssutils = buildPythonPackage (rec { name = "cssutils-0.9.9"; @@ -2171,6 +2181,16 @@ let pythonPackages = python.modules // rec { }; + pyquery = buildPythonPackage rec { + name = "pyquery-1.2.4"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz"; + md5 = "268f08258738d21bc1920d7522f2a63b"; + }; + buildInputs = [ cssselect lxml ]; + }; + + pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; From 4b10fcf1ec2e500bf881e08745c3e113b8de96c8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Jan 2013 18:09:09 -0500 Subject: [PATCH 092/162] Add Google::ProtocolBuffers perlPackage --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b085dfe49bbe..1f6130cabb5e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1774,6 +1774,15 @@ rec { propagatedBuildInputs = [ ParamsValidate SubExporter ]; }; + GoogleProtocolBuffers = buildPerlPackage rec { + name = "Google-ProtocolBuffers-0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GARIEV/${name}.tar.gz"; + sha256 = "0pxfphg671wh56h59pf0zrj7m1cr0yga95hf3w54563pzcw2vqv3"; + }; + propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; + }; + Graph = buildPerlPackage rec { name = "Graph-0.94"; src = fetchurl { From 1775b99112263c56a60241fd8ba78b16d5cbd5c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:22:46 +0100 Subject: [PATCH 093/162] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bb41a94bd61..24f4e4e9ed89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -419,9 +419,9 @@ let inherit pkgs; pkgs_i686 = pkgsi686Linux; }; - + xcodeenv = callPackage ../development/mobile/xcodeenv { }; - + titaniumenv = import ../development/mobile/titaniumenv { inherit pkgs; pkgs_i686 = pkgsi686Linux; From 6abb59cbac478a37d551568a474036c738049278 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 11:52:00 +0100 Subject: [PATCH 094/162] haskell-hashable: update 1.2.x branch to 1.2.0.5 --- .../libraries/haskell/hashable/{1.2.0.3.nix => 1.2.0.5.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/hashable/{1.2.0.3.nix => 1.2.0.5.nix} (81%) diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix similarity index 81% rename from pkgs/development/libraries/haskell/hashable/1.2.0.3.nix rename to pkgs/development/libraries/haskell/hashable/1.2.0.5.nix index 43d99b63d5a4..0547fd67b1f7 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.0.3"; - sha256 = "0q4zl2mry6qfp9vln6pxmgqik7szv1sh7if55gydnxln1ybvvgmp"; + version = "1.2.0.5"; + sha256 = "0frqr294bsx4i21xxd5pw59xpaf0nww0dh4bqn0ywblsm9c7nyqh"; buildDepends = [ text ]; meta = { homepage = "http://github.com/tibbe/hashable"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6f2db83c1941..595cdeb975f2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -913,7 +913,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_0_3 = callPackage ../development/libraries/haskell/hashable/1.2.0.3.nix {}; + hashable_1_2_0_5 = callPackage ../development/libraries/haskell/hashable/1.2.0.5.nix {}; hashable = self.hashable_1_1_2_5; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; From bbb3726fadf1e86b8133f8d2c78e5f6446b1b4ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:30:55 +0100 Subject: [PATCH 095/162] haskell-cipher-rc4: add version 0.1.2 --- .../libraries/haskell/cipher-rc4/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cipher-rc4/default.nix diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix new file mode 100644 index 000000000000..234491cde368 --- /dev/null +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cipher-rc4"; + version = "0.1.2"; + sha256 = "0nyrqms7h3hq236h03sjjjqdcxn3iz3fg4ifqj43f4nb8gv0ifb1"; + meta = { + homepage = "http://github.com/vincenthz/hs-cipher-rc4"; + description = "Fast RC4 cipher implementation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 595cdeb975f2..52eb6b3a99de 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -582,6 +582,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; + cipherRc4 = callPackage ../development/libraries/haskell/cipher-rc4 {}; + classyPrelude = callPackage ../development/libraries/haskell/classy-prelude {}; classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {}; From 8971eb297ae8847ce062026046ff8fb20aa2d17c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:31:04 +0100 Subject: [PATCH 096/162] haskell-crypto-numbers: add version 0.1.3 --- .../libraries/haskell/crypto-numbers/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/crypto-numbers/default.nix diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix new file mode 100644 index 000000000000..70cd3f44252a --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -0,0 +1,14 @@ +{ cabal, cryptoRandomApi, vector }: + +cabal.mkDerivation (self: { + pname = "crypto-numbers"; + version = "0.1.3"; + sha256 = "115lgnay3ly5r53flh3v5jygqks0rg1i8qmbvrqf9nkmnmw6a5x1"; + buildDepends = [ cryptoRandomApi vector ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-numbers"; + description = "Cryptographic numbers: functions and algorithms"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 52eb6b3a99de..155bee325c73 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -636,6 +636,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; + cryptoNumbers = callPackage ../development/libraries/haskell/crypto-numbers {}; + cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {}; cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {}; From eb038185dea917faa890ad455b409e7dc6cb5a23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:31:12 +0100 Subject: [PATCH 097/162] haskell-crypto-pubkey: add version 0.1.2 --- .../haskell/crypto-pubkey/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/crypto-pubkey/default.nix diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix new file mode 100644 index 000000000000..dc6d83a765de --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -0,0 +1,18 @@ +{ cabal, cryptohash, cryptoNumbers, cryptoPubkeyTypes +, cryptoRandomApi +}: + +cabal.mkDerivation (self: { + pname = "crypto-pubkey"; + version = "0.1.2"; + sha256 = "1law5l7j0r0v89dnibmaipjp0yshffq10xs4rvg2j247v29lhns5"; + buildDepends = [ + cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-pubkey"; + description = "Public Key cryptography"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 155bee325c73..0b1f8f80d76e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -640,6 +640,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {}; + cryptoPubkey = callPackage ../development/libraries/haskell/crypto-pubkey {}; + cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {}; cuda = callPackage ../development/libraries/haskell/cuda { From 553dcff84dcdecae3164649bbf7a1d207427a5f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:12 +0100 Subject: [PATCH 098/162] haskell-clientsession: update to version 0.8.1 --- .../libraries/haskell/clientsession/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 82c735b731fc..81ae5ebddb09 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,14 +1,14 @@ -{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi -, cryptocipher, entropy, skein, tagged +{ cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi +, entropy, skein, tagged }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.8.0.2"; - sha256 = "189v030g23lvky4vccdaw3p0p6drn26zly80a8n9bbn7b8kbfh4r"; + version = "0.8.1"; + sha256 = "1x4qfm4hkvm3xmn7hnvcx1j900g97qhks66xzik1wvsjy3piwpgd"; buildDepends = [ - base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy - skein tagged + base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein + tagged ]; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; From f5a15bfffc4a959a6d69cb4927902d31cfebafc9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:12 +0100 Subject: [PATCH 099/162] haskell-crypto-conduit: update to version 0.4.3 --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 9d7ad0825303..d22bfa840e78 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.4.2"; - sha256 = "0kg99kvpm5h8v28sylrp9z868ksz5737377akqy09y90xzb8pak3"; + version = "0.4.3"; + sha256 = "0h9dmr88hqmz2876mlnzz8s5kmi368zs9pljvvmb9vn7m44gpyrk"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; From 1026de58a1f97b789d5e518fe7aef3daea7c49f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 100/162] haskell-cryptocipher: update to version 0.4.0 --- .../libraries/haskell/cryptocipher/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 89b098173ec1..275622d3cad8 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,19 +1,20 @@ -{ cabal, cereal, cpu, cryptoApi, cryptoPubkeyTypes, primitive -, tagged, vector +{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi +, cryptoPubkeyTypes, primitive, tagged, vector }: cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.3.7"; - sha256 = "14qhi3969q1h9n85flb7wwsr50gdn63q7pmcpm2npy5vkp34lkp5"; + version = "0.4.0"; + sha256 = "1qbnhzbzypin7h62sn2sibij7clsgmaiq24q3xhgbjrirb6bhqf0"; isLibrary = true; isExecutable = true; buildDepends = [ - cereal cpu cryptoApi cryptoPubkeyTypes primitive tagged vector + cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes + primitive tagged vector ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptocipher"; - description = "Symmetrical Block, Stream and PubKey Ciphers"; + description = "Symmetrical block and stream ciphers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 8ff6dd943b7d44f0bcfccd9ab94081adddf7b661 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 101/162] haskell-hakyll: update to version 3.5.3.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 50ff535d874b..944246ae234c 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.5.2.1"; - sha256 = "1fp7jak2sfznvg3lfyjqy13m1iq9821mdq6n5qmqz5dh5b960iv4"; + version = "3.5.3.0"; + sha256 = "1r8vz42lxnnxx875jnf0ii9x99g7wz2fmknscxvm40prp2df1z6v"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer From 8ad6adb1275a0ab9964e73d6fd340d346567daa8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 102/162] haskell-mime-types: update to version 0.1.0.2 --- pkgs/development/libraries/haskell/mime-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 75eb11e6a129..1bde4861b3ac 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-types"; - version = "0.1.0.1"; - sha256 = "1a34ckmv8qcyk38jydxwph59zcrhnwaah1h6pzn112kysjqjgcsl"; + version = "0.1.0.2"; + sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs"; buildDepends = [ text ]; meta = { homepage = "https://github.com/yesodweb/wai"; From cce6ae45d60e608529bf4b6430db6fed72d55f25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 103/162] haskell-persistent: update to version 1.1.4 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index a45dbea57ae0..83bc9f53951d 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.1.3.2"; - sha256 = "1q8p5nxsf9fjhsyy1lha852f7vssp9mz6l24gg47mgv6y5mm9myv"; + version = "1.1.4"; + sha256 = "1frxhyyp8l5xvq5h9zf730c7kpnrryw2mw8mpnav2bs5g6rmmrgj"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From fbc40feb39697fc3e4035f0548df7a32751970a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 104/162] haskell-system-fileio: update to version 0.3.11 --- pkgs/development/libraries/haskell/system-fileio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 7b1f7d7bcfd5..f61dedb7b8c5 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.10"; - sha256 = "1f8si6m62nxzj71jgyhxl38szmw8wr3frvgih596vfjxwdhqpkq4"; + version = "0.3.11"; + sha256 = "0hnjrzhzbqx9l93c8dnl5b54f72ki584cn3jh8m6z56x2lrs24zb"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; From 5897b07a0fd5370f2956f2e4bf3810c4244ca85a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 105/162] haskell-tls-extra: update to version 0.6.0 --- .../libraries/haskell/tls-extra/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index f2017af8f803..5bcce9df16b7 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,16 +1,17 @@ -{ cabal, certificate, cipherAes, cryptoApi, cryptocipher -, cryptohash, mtl, network, pem, text, time, tls, vector +{ cabal, certificate, cipherAes, cipherRc4, cryptohash +, cryptoPubkey, cryptoRandomApi, mtl, network, pem, text, time, tls +, vector }: cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.5.1"; - sha256 = "0a977qy6ig4bhgsl6y5iw0xv52yswmcc2x37ypm1601wikjv38x3"; + version = "0.6.0"; + sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx"; isLibrary = true; isExecutable = true; buildDepends = [ - certificate cipherAes cryptoApi cryptocipher cryptohash mtl network - pem text time tls vector + certificate cipherAes cipherRc4 cryptohash cryptoPubkey + cryptoRandomApi mtl network pem text time tls vector ]; meta = { homepage = "http://github.com/vincenthz/hs-tls"; From b8679af5b08955ef4e60d9810cb3448589d13f6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 106/162] haskell-tls: update to version 1.1.1 --- pkgs/development/libraries/haskell/tls/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index fbd20bebdf1e..29b6b11d7913 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,17 +1,15 @@ -{ cabal, cereal, certificate, cryptoApi, cryptocipher, cryptohash -, mtl, network +{ cabal, cereal, certificate, cryptohash, cryptoPubkey +, cryptoRandomApi, mtl, network }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.0.3"; - sha256 = "14wgwz032skkgkxg2lyh8kwg1fkapmlg2jh74czbacvnssc2iidb"; - isLibrary = true; - isExecutable = true; + version = "1.1.1"; + sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq"; buildDepends = [ - cereal certificate cryptoApi cryptocipher cryptohash mtl network + cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl + network ]; - jailbreak = true; meta = { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; From 9386ecd23b4480631b15e6f967b492422a94f8b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 107/162] haskell-warp: update to version 1.3.7.1 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index edd1dfd19924..6a36e873ca69 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.7"; - sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf"; + version = "1.3.7.1"; + sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From 33db3fb3bb27acec162413fed64ff9e25c465adf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 16 Jan 2013 16:43:35 +0400 Subject: [PATCH 108/162] Update Cuneiform --- pkgs/tools/graphics/cuneiform/default.nix | 6 +++--- pkgs/tools/graphics/cuneiform/default.upstream | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/graphics/cuneiform/default.upstream diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 13f7d4b7f6fc..fb07e0a04b5f 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -2,15 +2,15 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "1.0" a; + version = "1.1.0"; buildInputs = with a; [ cmake imagemagick patchelf ]; in rec { src = fetchurl { - url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.0.tar.bz2"; - sha256 = "bfa7acc6aade966ab62bc0f19e0ac1a843b659a70202229570c087ca8b15f39e"; + url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.tar.bz2"; + sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp"; }; inherit buildInputs; diff --git a/pkgs/tools/graphics/cuneiform/default.upstream b/pkgs/tools/graphics/cuneiform/default.upstream new file mode 100644 index 000000000000..70f7857580ce --- /dev/null +++ b/pkgs/tools/graphics/cuneiform/default.upstream @@ -0,0 +1,7 @@ +url https://launchpad.net/cuneiform-linux/+download + +do_overwrite () { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" +} From f67bc6bbfd97414f7c3f5b488fe1cb9326b4b7d2 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Wed, 16 Jan 2013 11:43:53 +0100 Subject: [PATCH 109/162] Added jbig2enc. --- pkgs/tools/graphics/jbig2enc/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/graphics/jbig2enc/default.nix diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix new file mode 100644 index 000000000000..60704d6300c3 --- /dev/null +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { + name = "jbig2enc-0.28"; + + src = fetchurl { + url = http://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz; + sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; + }; + + propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; + + # This is necessary, because the resulting library has + # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib + # in its rpath, which means that patchelf --shrink-rpath removes + # the /nix/store one. By cleaning up before fixup, we ensure that + # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. + preFixup = '' + make clean + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bb41a94bd61..b50bd8b30006 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1318,6 +1318,8 @@ let pdfjam = callPackage ../tools/typesetting/pdfjam { }; + jbig2enc = callPackage ../tools/graphics/jbig2enc { }; + pdfread = callPackage ../tools/graphics/pdfread { }; briss = callPackage ../tools/graphics/briss { }; From 729a112f726177a2f663d13d6e5ed7e4fdfe256a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 16 Jan 2013 17:09:08 +0100 Subject: [PATCH 110/162] Implemented iosDistribute flag, that allows someone to build iPhone distribution builds --- .../mobile/titaniumenv/build-app.nix | 41 ++++++++++++++++--- .../mobile/titaniumenv/titaniumsdk.nix | 3 ++ 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0fd4929bda76..5a06e809c3d3 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, androidsdk, titaniumsdk, xcodewrapper}: { appId, name, src, target, androidPlatformVersions ? [ "8" ] , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null +, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false }: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; @@ -12,6 +12,8 @@ let platformVersions = androidPlatformVersions; useGoogleAPIs = true; }; + + deleteKeychain = "security delete-keychain $keychainName"; in stdenv.mkDerivation { inherit name src; @@ -30,8 +32,7 @@ stdenv.mkDerivation { "${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}" else if target == "iphone" then - if release then - '' + if iosDistribute then '' export HOME=/Users/$(whoami) export keychainName=$(basename $out) @@ -51,11 +52,39 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain - security delete-keychain $keychainName + ${deleteKeychain} + '' + else + if release then + '' + export HOME=/Users/$(whoami) + export keychainName=$(basename $out) + + # Create a keychain with the component hash name (should always be unique) + security create-keychain -p "" $keychainName + security default-keychain -s $keychainName + security unlock-keychain -p "" $keychainName + security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A + + provisioningId=$(grep UUID -A1 -a ${iosKeyFile} | grep -o "[-A-Z0-9]\{36\}") + + # Ensure that the requested provisioning profile can be found + + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles" ] + then + mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" + cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" + fi + + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + + # Remove our generated keychain + + ${deleteKeychain} '' else '' @@ -84,4 +113,6 @@ stdenv.mkDerivation { else if target == "iphone" then "" else throw "Target: ${target} is not supported!"} ''; + + failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix index 5e1943b1bdc0..d3831a9c2bea 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix @@ -53,5 +53,8 @@ stdenv.mkDerivation { --prefix PYTHONPATH : ${python.modules.sqlite3}/lib/python*/site-packages \ --prefix PATH : ${jdk}/bin \ --prefix JAVA_HOME : ${jdk} + '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work. + sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py ''; } From f1054e5051dd7c604655309166d9ca960ee406f3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 16 Jan 2013 13:59:15 -0500 Subject: [PATCH 111/162] Add patch to handle /**/-style comments in Google::ProtocolBuffers Patch thanks to Daniel Zinn --- .../Google-ProtocolBuffers-multiline-comments.patch | 12 ++++++++++++ pkgs/top-level/perl-packages.nix | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch diff --git a/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch b/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch new file mode 100644 index 000000000000..6b634d0d2424 --- /dev/null +++ b/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch @@ -0,0 +1,12 @@ +diff -Naur Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm +--- Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm 2008-10-23 13:46:01.000000000 -0400 ++++ Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm 2013-01-16 13:52:09.855063997 -0500 +@@ -16,7 +16,7 @@ + + my $grammar = <<'END_OF_GRAMMAR'; + +-proto : ++proto : + ## list of top level declarations. + ## Skip empty declarations and ";". + (message | extend | enum | import | package | option | service | syntax | ";")(s) /\Z/ diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1f6130cabb5e..b1a9283fca97 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1781,6 +1781,9 @@ rec { sha256 = "0pxfphg671wh56h59pf0zrj7m1cr0yga95hf3w54563pzcw2vqv3"; }; propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; + patches = [ + ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch + ]; }; Graph = buildPerlPackage rec { From b85a093b07eb7377f792daeb6a13b32d1e0d6e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 17 Jan 2013 00:18:02 +0100 Subject: [PATCH 112/162] pythonPackages.virtualenv: update to 1.8.4 --- .../virtualenv-change-prefix.patch | 27 ++++++++++--------- pkgs/top-level/python-packages.nix | 4 +-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv-change-prefix.patch index 5093fdbead94..d3e588bd1cd2 100644 --- a/pkgs/development/python-modules/virtualenv-change-prefix.patch +++ b/pkgs/development/python-modules/virtualenv-change-prefix.patch @@ -1,29 +1,32 @@ Without this patch `virtualenv --python=python2.7 .` fails with an error because it notices that the python readline.so is not in the same path as python2.7. I assume this is to avoid copying the wrong file on systems where it is possible to find incompatible libraries by accident. Adding "/nix/store" to the prefix fixes this problem. Unfortunately readline is still not available if you just run `virtualenv .`. - ---- virtualenv-1.6.4/virtualenv.py 2012-05-20 00:40:38.070649647 +0200 -+++ virtualenv-1.6.4/virtualenv.py 2012-05-20 00:45:10.596242604 +0200 -@@ -951,13 +951,7 @@ +--- virtualenv-1.8.4/virtualenv.py 2013-01-16 23:43:37.583615220 +0100 ++++ virtualenv-1.8.4/virtualenv.py 2013-01-16 23:44:47.885973431 +0100 +@@ -1135,17 +1135,7 @@ def change_prefix(filename, dst_prefix): - prefixes = [sys.prefix] - -- if sys.platform == "darwin": +- if is_darwin: - prefixes.extend(( - os.path.join("/Library/Python", sys.version[:3], "site-packages"), - os.path.join(sys.prefix, "Extras", "lib", "python"), -- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"))) +- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"), +- # Python 2.6 no-frameworks +- os.path.join("~", ".local", "lib","python", sys.version[:3], "site-packages"), +- # System Python 2.7 on OSX Mountain Lion +- os.path.join("~", "Library", "Python", sys.version[:3], "lib", "python", "site-packages"))) + prefixes = ["/nix/store", sys.prefix] if hasattr(sys, 'real_prefix'): prefixes.append(sys.real_prefix) -@@ -968,6 +962,8 @@ - _, relpath = filename.split(src_prefix, 1) - assert relpath[0] == os.sep - relpath = relpath[1:] -+ if src_prefix == "/nix/store": -+ relpath = "/".join(relpath.split("/")[1:]) +@@ -1162,6 +1152,8 @@ + if src_prefix != os.sep: # sys.prefix == "/" + assert relpath[0] == os.sep + relpath = relpath[1:] ++ if src_prefix == "/nix/store": ++ relpath = "/".join(relpath.split("/")[1:]) return join(dst_prefix, relpath) assert False, "Filename %s does not start with any of these prefixes: %s" % \ (filename, prefixes) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2f75b5ce63f..07176ad782eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3076,10 +3076,10 @@ let pythonPackages = python.modules // rec { }); virtualenv = buildPythonPackage rec { - name = "virtualenv-1.6.4"; + name = "virtualenv-1.8.4"; src = fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; - md5 = "1072b66d53c24e019a8f1304ac9d9fc5"; + md5 = "1c7e56a7f895b2e71558f96e365ee7a7"; }; patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; From 4b123fee39dd92a34a5f318abdfbc8d742031931 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 17 Jan 2013 11:21:04 +0400 Subject: [PATCH 113/162] Fix URL for Cuneiform --- pkgs/tools/graphics/cuneiform/default.nix | 2 +- pkgs/tools/graphics/cuneiform/default.upstream | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index fb07e0a04b5f..3c75af4bcf38 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -9,7 +9,7 @@ let in rec { src = fetchurl { - url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.tar.bz2"; + url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2"; sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp"; }; diff --git a/pkgs/tools/graphics/cuneiform/default.upstream b/pkgs/tools/graphics/cuneiform/default.upstream index 70f7857580ce..4fb85a2a1e89 100644 --- a/pkgs/tools/graphics/cuneiform/default.upstream +++ b/pkgs/tools/graphics/cuneiform/default.upstream @@ -4,4 +4,5 @@ do_overwrite () { ensure_hash set_var_value version "$CURRENT_VERSION" set_var_value sha256 "$CURRENT_HASH" + set_var_value ' url' "$CURRENT_URL" } From 8150827219951e56f336f5bf90770fe4adc7927f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 17 Jan 2013 11:18:32 +0100 Subject: [PATCH 114/162] haskell-network: update 2.4.x branch to version 2.4.1.0 This change affects only GHC 7.6.1. --- .../libraries/haskell/network/{2.4.0.1.nix => 2.4.1.0.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/network/{2.4.0.1.nix => 2.4.1.0.nix} (80%) diff --git a/pkgs/development/libraries/haskell/network/2.4.0.1.nix b/pkgs/development/libraries/haskell/network/2.4.1.0.nix similarity index 80% rename from pkgs/development/libraries/haskell/network/2.4.0.1.nix rename to pkgs/development/libraries/haskell/network/2.4.1.0.nix index e0aa44c38bde..9d5ac3abe781 100644 --- a/pkgs/development/libraries/haskell/network/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/network/2.4.1.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.4.0.1"; - sha256 = "00jj3pf2gchkx5wmipm2ijxcmhy37g86ggnp6pb92i5nmb93h1iw"; + version = "2.4.1.0"; + sha256 = "0m44iqlcnpsaa3iqxb4wbx2l1k2ycxzq8v07bwz7br7yyikv16y3"; buildDepends = [ parsec ]; meta = { homepage = "https://github.com/haskell/network"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0b1f8f80d76e..19df77300b64 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -129,7 +129,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP = self.HTTP_4000_2_6; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok - network = self.network_2_4_0_1; # 7.6 ok + network = self.network_2_4_1_0; # 7.6 ok OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok parallel = self.parallel_3_2_0_3; # 7.6 ok parsec = self.parsec_3_1_3; # 7.6 ok @@ -1266,8 +1266,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; - network_2_4_0_1 = callPackage ../development/libraries/haskell/network/2.4.0.1.nix {}; - network = self.network_2_4_0_1; + network_2_4_1_0 = callPackage ../development/libraries/haskell/network/2.4.1.0.nix {}; + network = self.network_2_4_1_0; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; From 3544f3223166583f1e5459822250f1821b258c1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 17 Jan 2013 11:19:09 +0100 Subject: [PATCH 115/162] haskell-hakyll: update to version 4.0.0.0 --- .../libraries/haskell/hakyll/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 944246ae234c..9b708eff0203 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,16 +1,19 @@ -{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash -, filepath, hamlet, lrucache, mtl, pandoc, parsec, regexBase -, regexTdfa, snapCore, snapServer, tagsoup, text, time +{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs +, cryptohash, deepseq, filepath, httpConduit, httpTypes, lrucache +, mtl, pandoc, parsec, random, regexBase, regexTdfa, snapCore +, snapServer, tagsoup, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.5.3.0"; - sha256 = "1r8vz42lxnnxx875jnf0ii9x99g7wz2fmknscxvm40prp2df1z6v"; + version = "4.0.0.0"; + sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr"; + isLibrary = true; + isExecutable = true; buildDepends = [ - binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet - lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer - tagsoup text time + binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq + filepath httpConduit httpTypes lrucache mtl pandoc parsec random + regexBase regexTdfa snapCore snapServer tagsoup text time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; From 8faee15126349fe26f06e6e49e281e8be1e67eec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 17:21:31 +0100 Subject: [PATCH 116/162] linux: Update to 3.2.37 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 212a86f36a3c..f843f8b057a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.36"; + version = "3.2.37"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0jyla0mjh1jjk84jywyvd7n6ax27xarkllfjf991rqj32zinlnzn"; + sha256 = "1h8lx0gvb1q962lghjpixa6q89k4yrgvpiw8hplb3w2jicqs4948"; }; config = configWithPlatform stdenv.platform; From 523ee1671b31e254daf87edecc18eea5e1cebe7d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 17 Jan 2013 11:43:56 -0500 Subject: [PATCH 117/162] Add psutil pythonPackage --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07176ad782eb..f89992a2fc0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1838,6 +1838,21 @@ let pythonPackages = python.modules // rec { }; + psutil = buildPythonPackage rec { + name = "psutil-0.6.1"; + + src = fetchurl { + url = "http://psutil.googlecode.com/files/${name}.tar.gz"; + sha256 = "0vqarv63jqzghr4fi1fqdbvg847fq2gqdj8dzc3x59f9b36a8rfn"; + }; + + meta = { + description = "Process and system utilization information interface for python"; + homepage = http://code.google.com/p/psutil/; + }; + }; + + psycopg2 = buildPythonPackage rec { name = "psycopg2-2.0.13"; From 9248dc1a14c751912b1f9e4541812c814d091e09 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 22:05:59 +0100 Subject: [PATCH 118/162] Remove unfree ATI drivers package from the channel Urghhhhh... --- pkgs/os-specific/linux/ati-drivers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 49efcc1e76ee..c30d18fe75b6 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { patchelf unzip ]; - + inherit kernel glibc /* glibc only used for setting interpreter */; - + LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" [ "${xorg.libXrandr}/lib" "${xorg.libXrender}/lib" @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { inherit mesa; # only required to build examples meta = { - description = "ati drivers"; + description = "ATI drivers"; homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = "unfree"; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = [ "x86_64-linux" ]; + #platforms = [ "x86_64-linux" ]; }; # moved assertions here because the name is evaluated when the NixOS manual is generated From 0db6ea6f760500d740f49756918c1807e2f48da5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 22:34:08 +0100 Subject: [PATCH 119/162] Remove some oversized packages from the channel E.g. urbanterror takes up 2x720 MiB. --- pkgs/development/compilers/fpc/lazarus.nix | 4 ++-- pkgs/development/compilers/opa/default.nix | 9 ++++----- pkgs/development/libraries/ncbi/default.nix | 2 +- pkgs/games/naev/default.nix | 2 +- pkgs/games/torcs/default.nix | 2 +- pkgs/games/ufoai/default.nix | 2 +- pkgs/games/urbanterror/default.nix | 2 +- pkgs/games/widelands/default.nix | 3 +-- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index e2a9fd128e98..a2863663bea9 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -38,8 +38,8 @@ rec { name = "lazarus-${version}"; meta = { description = "Lazarus graphical IDE for FreePascal language"; - homepage = http://www.lazarus.freepascal.org ; + homepage = http://www.lazarus.freepascal.org; maintainers = [args.lib.maintainers.raskin]; - platforms = args.lib.platforms.linux; + #platforms = args.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 2a54b90dda98..68413e3e25d1 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -48,13 +48,12 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides."; + description = "A concise and elegant language for writing distributed web applications"; longDescription = '' - Opa is a new generation of web development platform that lets you write distributed - web applications using a single technology. Among the the many features of Opa are these: - Opa is concise, simple, concurrent, dynamically distributed, and secure. + Opa is a new generation of web development platform that lets you write distributed + web applications using a single technology. Among the the many features of Opa are these: + Opa is concise, simple, concurrent, dynamically distributed, and secure. ''; - homepage = http://opalang.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix index 0b795e78ad50..a74cd81854e1 100644 --- a/pkgs/development/libraries/ncbi/default.nix +++ b/pkgs/development/libraries/ncbi/default.nix @@ -49,6 +49,6 @@ rec { maintainers = [ a.lib.maintainers.raskin ]; - platforms = a.lib.platforms.linux ; + #platforms = a.lib.platforms.linux ; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 36ccbf98274f..2e25cf4afb6b 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { homepage = http://www.naev.org; license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index cf740def5116..da4fd01d3a97 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = http://torcs.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 85440f88901e..e642e6f91246 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Squad-based tactical strategy game in the tradition of X-Com"; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 875dfc93bb10..bffc5ad90d18 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { homepage = http://www.urbanterror.net; license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + #platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 45538acdca3e..e20adc8faa73 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -64,8 +64,7 @@ rec { raskin jcumming ]; - platforms = with a.lib.platforms; - linux; + #platforms = a.lib.platforms.linux; license = a.lib.licenses.gpl2Plus; }; passthru = { From deaef8abaf312723300e1c156346573eedfdb70a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 23:24:55 +0100 Subject: [PATCH 120/162] =?UTF-8?q?Pass=20=E2=80=98config=E2=80=99=20to=20?= =?UTF-8?q?stdenv/generic/default.nix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a backport of cf8daf63120adedbeaf5bc8c2f396be2496a741e in stdenv-updates (sans the userHook stuff). --- pkgs/stdenv/default.nix | 7 ++++--- pkgs/stdenv/generic/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 6 +++--- pkgs/stdenv/native/default.nix | 4 ++-- pkgs/stdenv/nix/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 8e0da288eec7..67000670cd1b 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -10,7 +10,7 @@ # system, e.g., cygwin and mingw builds on i686-cygwin. Most people # can ignore it. -{system, stdenvType ? system, allPackages ? import ../.., platform}: +{ system, stdenvType ? system, allPackages ? import ../.., platform, config }: assert system != "i686-cygwin" -> system == stdenvType; @@ -24,7 +24,7 @@ rec { # be used with care, since many Nix packages will not build properly # with it (e.g., because they require GNU Make). stdenvNative = (import ./native { - inherit system allPackages; + inherit system allPackages config; }).stdenv; stdenvNativePkgs = allPackages { @@ -35,13 +35,14 @@ rec { # The Nix build environment. stdenvNix = import ./nix { + inherit config; stdenv = stdenvNative; pkgs = stdenvNativePkgs; }; # Linux standard environment. - stdenvLinux = (import ./linux {inherit system allPackages platform;}).stdenvLinux; + stdenvLinux = (import ./linux { inherit system allPackages platform config;}).stdenvLinux; # MinGW/MSYS standard environment. diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index bed6ad2f90ee..852be9612fb5 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,5 +1,5 @@ { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell -, extraAttrs ? {}, overrides ? (pkgs: {}) +, extraAttrs ? {}, overrides ? (pkgs: {}), config , # The `fetchurl' to use for downloading curl and its dependencies # (see all-packages.nix). diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 3105e76f8177..777b2cf6a328 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -7,7 +7,7 @@ # The function defaults are for easy testing. { system ? builtins.currentSystem , allPackages ? import ../../top-level/all-packages.nix -, platform ? null }: +, platform ? null, config }: rec { @@ -81,7 +81,7 @@ rec { {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? [], fetchurl}: import ../generic { - inherit system; + inherit system config; name = "stdenv-linux-boot"; preHook = '' @@ -261,7 +261,7 @@ rec { # dependency (`nix-store -qR') on bootstrapTools or the # first binutils built. stdenvLinux = import ../generic rec { - inherit system; + inherit system config; preHook = commonPreHook; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index a33a46c8512d..524b2a53337b 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,4 +1,4 @@ -{ system, allPackages ? import ../../.. }: +{ system, allPackages ? import ../../.., config }: rec { @@ -98,7 +98,7 @@ rec { fetchurlBoot = fetchurl; - inherit system shell gcc overrides; + inherit system shell gcc overrides config; }; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 5e242b6e3a1c..668bac5f0ae8 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,6 +1,8 @@ -{ stdenv, pkgs }: +{ stdenv, pkgs, config }: import ../generic rec { + inherit config; + preHook = '' export NIX_ENFORCE_PURITY=1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6038128d5f0b..ad19066617a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -196,7 +196,7 @@ let allStdenvs = import ../stdenv { - inherit system stdenvType platform; + inherit system stdenvType platform config; allPackages = args: import ./all-packages.nix ({ inherit config system; } // args); }; From d8e722985bac5f8448d5287840ee50517154443e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 23:41:37 +0100 Subject: [PATCH 121/162] =?UTF-8?q?Add=20config=20option=20=E2=80=98allowU?= =?UTF-8?q?nfree=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If set to false, mkDerivation will throw an exception if a package has an unfree license. ‘release-lib.nix’ uses this to enforce that we don't build unfree packages as part of the Nixpkgs channel. Since this is set through Nixpkgs' ‘config’ argument, it's more finegrained than $HYDRA_DISALLOW_UNFREE. --- pkgs/os-specific/linux/aufs/3.nix | 1 + pkgs/stdenv/generic/default.nix | 4 ++-- pkgs/top-level/release-lib.nix | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/aufs/3.nix b/pkgs/os-specific/linux/aufs/3.nix index 130fd5075cd5..255804a31de9 100644 --- a/pkgs/os-specific/linux/aufs/3.nix +++ b/pkgs/os-specific/linux/aufs/3.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { ''; passthru = { inherit patch; }; + meta = { description = "Another Unionfs implementation for Linux (third generation)"; homepage = http://aufs.sourceforge.net/; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 852be9612fb5..b6836ca8d79c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -10,7 +10,7 @@ let lib = import ../../lib; - disallowUnfree = builtins.getEnv "HYDRA_DISALLOW_UNFREE" == "1"; + allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; stdenvGenerator = setupScript: rec { @@ -41,7 +41,7 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. mkDerivation = attrs: - if disallowUnfree && attrs.meta.license or "" == "unfree" then + if !allowUnfree && attrs.meta.license or "" == "unfree" then throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" else (derivation ( diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 4a5f7602d02d..d03f2724e1f0 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,7 +1,11 @@ rec { - allPackages = import ./all-packages.nix; - pkgs = allPackages {}; + # Ensure that we don't build packages marked as unfree. + allPackages = args: import ./all-packages.nix (args // { + config.allowUnfree = false; + }); + + pkgs = allPackages { }; /* !!! Hack: poor man's memoisation function. Necessary for prevent Nixpkgs from being evaluated again and again for every From 9720148a1407764792f2a01579b5be514a58a522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 18 Jan 2013 00:20:45 +0100 Subject: [PATCH 122/162] Add pythonPackages.mrbob --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f89992a2fc0e..769584f38a08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1368,6 +1368,26 @@ let pythonPackages = python.modules // rec { }; + mrbob = buildPythonPackage rec { + name = "mrbob-${version}"; + version = "0.1a6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip"; + md5 = "361c8ac7a31953ab94a95cf34d9a0b2b"; + }; + + buildInputs = [ pkgs.unzip ]; + + propagatedBuildInputs = [ argparse jinja2 ]; + + meta = { + homepage = https://github.com/iElectric/mr.bob.git; + description = "A tool to generate code skeletons from templates"; + }; + }; + + mutagen = buildPythonPackage (rec { name = "mutagen-1.20"; From 64950ff58edd8b7ff68a02dbdf64e806f6b57345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 18 Jan 2013 00:45:13 +0100 Subject: [PATCH 123/162] Add pythonPackages.buildout --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 769584f38a08..2e168b731366 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -352,6 +352,22 @@ let pythonPackages = python.modules // rec { # }); + buildout = buildPythonPackage rec { + name = "buildout-${version}"; + version = "1.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.${name}.tar.gz"; + md5 = "4e3b521600e475c56a0a66459a5fc7bb"; + }; + + meta = { + homepage = http://www.buildout.org/; + description = "A software build and configuration system"; + }; + }; + + carrot = buildPythonPackage rec { name = "carrot-0.10.7"; From ffeb15e77bdfd70f7131781c7ad2e3b134b19898 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Fri, 18 Jan 2013 01:01:48 +0100 Subject: [PATCH 124/162] update dropbox to 1.4.21 (stable) --- pkgs/applications/networking/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index f1a906f92508..97b7cb51097a 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -21,8 +21,8 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.4.0"; - sha256 = "93933d95cce5956ed99342fa342d01ce2bde8d2e4339afb97f23e0c0ec98875e"; + version = "1.4.21"; + sha256 = "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2"; # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; From d674d9cf9bb527136f3e551d83a9434e7d7e6105 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Fri, 18 Jan 2013 01:57:01 +0100 Subject: [PATCH 125/162] update minecraft recipe --- pkgs/games/minecraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 3281f07335b0..a72223543aa9 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -2,11 +2,11 @@ , mesa, openal}: stdenv.mkDerivation { - name = "minecraft-1.3.1"; + name = "minecraft-1.4.7"; src = fetchurl { url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar"; - sha256 = "0j8a889w174vwgcxl4yqgp2kbqqha3x505fn7izz38srlx59gnwj"; + sha256 = "92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49"; }; phases = "installPhase"; From 52fb5d86a97ccab82a933a84ac0c33d3308404b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 18 Jan 2013 02:21:24 +0100 Subject: [PATCH 126/162] Add pythonPackages.zodb3 and dependencies --- pkgs/top-level/python-packages.nix | 224 +++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e168b731366..971c41945337 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1271,6 +1271,23 @@ let pythonPackages = python.modules // rec { }; }; + manuel = buildPythonPackage rec { + name = "manuel-${version}"; + version = "1.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz"; + md5 = "53d6a6905301a20f6095e41d11968fff"; + }; + + propagatedBuildInputs = [ six zope_testing ]; + + meta = { + description = "A documentation builder"; + homepage = http://pypi.python.org/pypi/manuel; + license = "ZPL"; + }; + }; markdown = buildPythonPackage rec { version = "2.0.3"; @@ -2910,6 +2927,24 @@ let pythonPackages = python.modules // rec { }); + subunit = buildPythonPackage rec { + name = "subunit-${version}"; + version = "0.0.9"; + + src = fetchurl { + url = "https://launchpad.net/subunit/trunk/0.0.9/+download/python-${name}.tar.gz"; + sha256 = "0g3bk8lfd52zjzg43h47h2kckchm3xyv1gcr85nca2i50rcrpj56"; + }; + + propagatedBuildInputs = [ testtools ]; + + meta = { + description = "A streaming protocol for test results"; + homepage = https://launchpad.net/subunit; + license = pkgs.lib.licenses.asl20; + }; + }; + # XXX: ValueError: ZIP does not support timestamps before 1980 # svneverever = buildPythonPackage rec { # name = "svneverever-778489a8"; @@ -2971,6 +3006,23 @@ let pythonPackages = python.modules // rec { }; + testtools = buildPythonPackage rec { + name = "testtools-${version}"; + version = "0.9.24"; + + src = fetchurl { + url = "https://launchpad.net/testtools/0.9/0.9.24/+download/${name}.tar.gz"; + sha256 = "0mgkvd7c1aw34nlnz2nmll5k01aqhixxiikbs2nfyk3xfa4221x7"; + }; + + meta = { + description = "A set of extensions to the Python standard library's unit testing framework"; + homepage = http://pypi.python.org/pypi/testtools; + license = pkgs.lib.licenses.mit; + }; + }; + + trac = buildPythonPackage { name = "trac-0.12.2"; @@ -2993,6 +3045,26 @@ let pythonPackages = python.modules // rec { }; }; + + transaction = buildPythonPackage rec { + name = "transaction-${version}"; + version = "1.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz"; + md5 = "b7c2ff135939f605a8c54e1c13cd5d66"; + }; + + propagatedBuildInputs = [ zopeInterface ]; + + meta = { + description = "Transaction management"; + homepage = http://pypi.python.org/pypi/transaction; + license = "ZPL"; + }; + }; + + turses = buildPythonPackage (rec { name = "turses-0.2.9"; @@ -3311,6 +3383,62 @@ let pythonPackages = python.modules // rec { }; }); + + zconfig = buildPythonPackage rec { + name = "zconfig-${version}"; + version = "2.9.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-${version}.tar.gz"; + md5 = "2c5f73c216140a705be3d9c44b988722"; + }; + + propagatedBuildInputs = [ zope_testrunner ]; + + meta = { + description = "Structured Configuration Library"; + homepage = http://pypi.python.org/pypi/ZConfig; + license = "ZPL"; + }; + }; + + + zc_lockfile = buildPythonPackage rec { + name = "zc_lockfile-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-${version}.tar.gz"; + md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; + }; + + meta = { + description = "Inter-process locks"; + homepage = http://www.python.org/pypi/zc.lockfile; + license = "ZPL"; + }; + }; + + + zdaemon = buildPythonPackage rec { + name = "zdaemon-${version}"; + version = "3.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz"; + md5 = "975f770544bb4352c5cf32fec22e63c9"; + }; + + propagatedBuildInputs = [ zconfig ]; + + meta = { + description = "A daemon process control library and tools for Unix-based systems"; + homepage = http://pypi.python.org/pypi/zdaemon; + license = "ZPL"; + }; + }; + + zfec = buildPythonPackage (rec { name = "zfec-1.4.7"; @@ -3340,6 +3468,102 @@ let pythonPackages = python.modules // rec { }; }); + + zodb3 = buildPythonPackage rec { + name = "zodb3-${version}"; + version = "3.10.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz"; + md5 = "6f180c6897a1820948fee2a6290503cd"; + }; + + propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zopeInterface zope_event ]; + + meta = { + description = "An object-oriented database for Python"; + homepage = http://pypi.python.org/pypi/ZODB3; + license = "ZPL"; + }; + }; + + + zope_event = buildPythonPackage rec { + name = "zope_event-${version}"; + version = "4.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-${version}.tar.gz"; + md5 = "e08dd299d428d77a1cfcbfe841b81872"; + }; + + meta = { + description = "An event publishing system"; + homepage = http://pypi.python.org/pypi/zope.event; + license = "ZPL"; + }; + }; + + + zope_exceptions = buildPythonPackage rec { + name = "zopeexceptions-${version}"; + version = "4.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-${version}.tar.gz"; + md5 = "c95569fcb444ae541777de7ae5297492"; + }; + + propagatedBuildInputs = [ zopeInterface ]; + + meta = { + description = "Exception interfaces and implementations"; + homepage = http://pypi.python.org/pypi/zope.exceptions; + license = "ZPL"; + }; + }; + + + zope_testing = buildPythonPackage rec { + name = "zope_testing-${version}"; + version = "4.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-${version}.tar.gz"; + md5 = "2e3829841090d6adff718b8b73c87b6b"; + }; + + propagatedBuildInputs = [ zopeInterface zope_exceptions ]; + + meta = { + description = "Zope testing helpers"; + homepage = http://pypi.python.org/pypi/zope.testing; + license = "ZPL"; + }; + }; + + + zope_testrunner = buildPythonPackage rec { + name = "zope_testrunner-${version}"; + version = "4.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.testrunner/zope.testrunner-${version}.zip"; + md5 = "cd648fc865a79aa0950e73342836dd4c"; + }; + + buildInputs = [ pkgs.unzip ]; + + propagatedBuildInputs = [ subunit zopeInterface zope_exceptions zope_testing ]; + + meta = { + description = "A flexible test runner with layer support"; + homepage = http://pypi.python.org/pypi/zope.testrunner; + license = "ZPL"; + }; + }; + + zopeInterface = buildPythonPackage { name = "zope-interface-3.6.1"; src = fetchurl { From d54c8c4b8360aaedbb5b1220d09ef3a2bef9efdc Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 17 Jan 2013 21:42:22 +0100 Subject: [PATCH 127/162] update kernels: 3.0.59, 3.4.26 and 3.7.3 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.7.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 97b3a6bfd0dc..557ee6b52c6f 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.58"; + version = "3.0.59"; 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 = "10ahi60ass970vjlhnzcf0y5fk3g7ck1a1lnwzy0kkywp6nb2c10"; + sha256 = "0w0l0vsky921j6wvhydl8ggzwkwkhr0lk2lkd7lshhmv9c6bdg86"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index eef4847e5b2e..8d8c56daab02 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.25"; + version = "3.4.26"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0jlnrjxyyfw2f87mr9y8c4337yfbnrj5jp3vhm33dwy7i3vdpfs6"; + sha256 = "1zmv1g90fgqrabc0qb5ip551mh12ps1zin3hbygysc89j684rbk1"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 4a092fe6b3a7..2822c33c828c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.7.2"; + version = "3.7.3"; testing = false; preConfigure = '' @@ -254,7 +254,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "09s1z2z15xnnqm2syr76l7s3s14zzsalifnnfmry52ibizllzh04"; + sha256 = "05421g78kx01ia0pq3d3y3gkrzqb5grfhhy7vy1ixlq8a23kc6b7"; }; config = configWithPlatform stdenv.platform; From bc8a6e6c19936d3175999ccca2021b61297b1559 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 17 Jan 2013 21:49:33 +0100 Subject: [PATCH 128/162] new download host for zfsonlinux.org: spl/zfs --- pkgs/os-specific/linux/spl/default.nix | 2 +- pkgs/os-specific/linux/zfs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 5943a231a85d..94e3573b70e6 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "spl-0.6.0-rc13-${kernel.version}"; src = fetchurl { - url = http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc13.tar.gz; sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b"; }; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index b83019ea87a0..17c7d3824d7a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "zfs-0.6.0-rc13-${kernel.version}"; src = fetchurl { - url = http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc13.tar.gz; sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv"; }; From bc331e230eb65dafd3251bc2ca72686206b0cc71 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 18 Jan 2013 12:01:14 +0100 Subject: [PATCH 129/162] mpd: Update to 0.17.3 Additionally, turn on a lot more features in mpd by adding dependencies. Can be controlled by xxxSupport flags, as before. By default, everything is enabled. --- pkgs/servers/mpd/default.nix | 88 +++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index a5cc810ada8a..54c9d1605655 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,39 +1,85 @@ -{ stdenv, fetchurl, pkgconfig, glib, alsaSupport ? true, alsaLib -, flacSupport ? true, flac, vorbisSupport ? true, libvorbis -, madSupport ? true, libmad, id3tagSupport ? true, libid3tag -, mikmodSupport ? true, libmikmod, cueSupport ? true, libcue +{ stdenv, fetchurl, pkgconfig, glib, systemd +, alsaSupport ? true, alsaLib +, flacSupport ? true, flac +, vorbisSupport ? true, libvorbis +, madSupport ? true, libmad +, id3tagSupport ? true, libid3tag +, mikmodSupport ? true, libmikmod , shoutSupport ? true, libshout +, sqliteSupport ? true, sqlite +, curlSupport ? true, curl +, soupSupport ? true, libsoup +, audiofileSupport ? true, audiofile +, bzip2Support ? true, bzip2 +, ffadoSupport ? true, ffado +, ffmpegSupport ? true, ffmpeg +, fluidsynthSupport ? true, fluidsynth +, zipSupport ? true, zziplib +, samplerateSupport ? true, libsamplerate +, mmsSupport ? true, libmms +, mpg123Support ? true, mpg123 +, aacSupport ? true, faad2 }: + let + opt = stdenv.lib.optional; -in -stdenv.mkDerivation rec { - name = "mpd-0.16.8"; + + mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; + +in stdenv.mkDerivation rec { + name = "mpd-0.17.3"; src = fetchurl { url = "mirror://sourceforge/musicpd/${name}.tar.bz2"; - sha256 = "35183ae4a706391f5d739e4378b74f516952adda09a260fecfd531a58b0fff17"; + sha256 = "1iilimlyhw22lpbqiab4qprznxg9c4d68fkrr9jww765b4c7x1ip"; }; - buildInputs = [ pkgconfig glib ] + buildInputs = [ pkgconfig glib systemd ] ++ opt alsaSupport alsaLib ++ opt flacSupport flac ++ opt vorbisSupport libvorbis ++ opt madSupport libmad ++ opt id3tagSupport libid3tag ++ opt mikmodSupport libmikmod - ++ opt cueSupport libcue - ++ opt shoutSupport libshout; + ++ opt shoutSupport libshout + ++ opt sqliteSupport sqlite + ++ opt curlSupport curl + ++ opt soupSupport libsoup + ++ opt bzip2Support bzip2 + ++ opt audiofileSupport audiofile + ++ opt ffadoSupport ffado + ++ opt ffmpegSupport ffmpeg + ++ opt fluidsynthSupport fluidsynth + ++ opt samplerateSupport libsamplerate + ++ opt mmsSupport libmms + ++ opt mpg123Support mpg123 + ++ opt aacSupport faad2 + ++ opt zipSupport zziplib; - configureFlags = '' - ${if alsaSupport then "--enable-alsa" else "--disable-alsa"} - ${if flacSupport then "--enable-flac" else "--disable-flac"} - ${if vorbisSupport then "--enable-vorbis" else "--disable-vorbis"} - ${if madSupport then "--enable-mad" else "--disable-mad"} - ${if mikmodSupport then "--enable-mikmod" else "--disable-mikmod"} - ${if id3tagSupport then "--enable-id3" else "--disable-id3"} - ${if cueSupport then "--enable-cue" else "--disable-cue"} - ${if shoutSupport then "--enable-shout" else "--disable-shout"} - ''; + configureFlags = [ + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + (mkFlag alsaSupport "alsa") + (mkFlag flacSupport "flac") + (mkFlag vorbisSupport "vorbis") + (mkFlag vorbisSupport "vorbis-encoder") + (mkFlag madSupport "mad") + (mkFlag mikmodSupport "mikmod") + (mkFlag id3tagSupport "id3") + (mkFlag shoutSupport "shout") + (mkFlag sqliteSupport "sqlite") + (mkFlag curlSupport "curl") + (mkFlag soupSupport "soup") + (mkFlag audiofileSupport "audiofile") + (mkFlag bzip2Support "bzip2") + (mkFlag ffadoSupport "ffado") + (mkFlag ffmpegSupport "ffmpeg") + (mkFlag fluidsynthSupport "fluidsynth") + (mkFlag zipSupport "zzip") + (mkFlag samplerateSupport "lsr") + (mkFlag mmsSupport "mms") + (mkFlag mpg123Support "mpg123") + (mkFlag aacSupport "aac") + ]; NIX_LDFLAGS = '' ${if shoutSupport then "-lshout" else ""} From 1d94f9051174f0c884ef596d13390d91e4d96bef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Jan 2013 12:29:55 +0100 Subject: [PATCH 130/162] haskell-hs-bibutils: update to version 4.16 --- pkgs/development/libraries/haskell/hs-bibutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index 8acb621fe3f0..b9f3eb3cb8e5 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hs-bibutils"; - version = "4.15"; - sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9"; + version = "4.16"; + sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; From 069c587237b0abfdf2e38ad6b034da9ae2c04db1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Jan 2013 12:29:55 +0100 Subject: [PATCH 131/162] haskell-http-conduit: update to version 1.8.7 --- .../libraries/haskell/http-conduit/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 5009d4132de9..b9f47b440068 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,21 +1,23 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, deepseq, failure -, httpTypes, liftedBase, monadControl, mtl, network, regexCompat -, resourcet, socks, text, time, tls, tlsExtra, transformers -, transformersBase, utf8String, void, zlibConduit +, filepath, httpTypes, liftedBase, mimeTypes, monadControl, mtl +, network, random, regexCompat, resourcet, socks, text, time, tls +, tlsExtra, transformers, transformersBase, utf8String, void +, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.6.3"; - sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r"; + version = "1.8.7"; + sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie - cprngAes dataDefault deepseq failure httpTypes liftedBase - monadControl mtl network regexCompat resourcet socks text time tls - tlsExtra transformers transformersBase utf8String void zlibConduit + cprngAes dataDefault deepseq failure filepath httpTypes liftedBase + mimeTypes monadControl mtl network random regexCompat resourcet + socks text time tls tlsExtra transformers transformersBase + utf8String void zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; From fd6c95461b5983840b2ca40ac2a392a233ecfe8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Jan 2013 12:29:56 +0100 Subject: [PATCH 132/162] haskell-smallcheck: update to version 0.6.2 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index 1086a1929a80..a11eb501a861 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "0.6.1"; - sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb"; + version = "0.6.2"; + sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr"; buildDepends = [ dlist ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; From 9e6d6dae015cc48de6670b874e278ce3f14e4a82 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Jan 2013 13:05:54 +0100 Subject: [PATCH 133/162] Test::Warn: Update to 0.24 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1a9283fca97..138f4b19279a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3953,13 +3953,13 @@ rec { }; TestWarn = buildPerlPackage rec { - name = "Test-Warn-0.23"; + name = "Test-Warn-0.24"; src = fetchurl { url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "1733s39s4pm0hsshvvjsv1vbri09l4g0g7yyg64y65yqcyanfdf0"; + sha256 = "12r1mcwrm6cgc3ppgawwv265vmrighj4bl6xc5c41f4c2l6bdxml"; }; - propagatedBuildInputs = [TestSimple TestException ArrayCompare TreeDAGNode]; - buildInputs = [TestPod]; + propagatedBuildInputs = [ TestSimple TestException ArrayCompare TreeDAGNode ]; + buildInputs = [ TestPod ]; }; TestWWWMechanize = buildPerlPackage rec { From bbd049e9d5b862b779abd5fb9a955e3bf31b62f8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 18 Jan 2013 17:34:01 +0100 Subject: [PATCH 134/162] Allow App names with spaces --- pkgs/development/mobile/titaniumenv/build-app.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 5a06e809c3d3..c675116f88aa 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -16,7 +16,8 @@ let deleteKeychain = "security delete-keychain $keychainName"; in stdenv.mkDerivation { - inherit name src; + name = stdenv.lib.replaceChars [" "] [""] name; + inherit src; buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; @@ -27,9 +28,9 @@ stdenv.mkDerivation { ${if target == "android" then if release then - "${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out" + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out'' else - "${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}" + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}'' else if target == "iphone" then if iosDistribute then '' @@ -52,7 +53,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -80,7 +81,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -95,7 +96,7 @@ stdenv.mkDerivation { cp -av * $out cd $out - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} ${name} + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" '' else throw "Target: ${target} is not supported!"} From 7e8fc622e5e0b7887d43d9885da289531d34ed0d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Jan 2013 15:50:21 -0500 Subject: [PATCH 135/162] libnatspec: Needs libiconv --- pkgs/development/libraries/libnatspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index fbab569e38cc..d2747b50ce05 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt }: +{ stdenv, fetchurl, popt, libiconvOrEmpty }: stdenv.mkDerivation rec { name = "libnatspec-0.2.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3"; }; - buildInputs = [ popt ]; + buildInputs = [ popt ] ++ libiconvOrEmpty; meta = { homepage = http://natspec.sourceforge.net/ ; From 23853fa81b86517a8a5705b77d4c816b42c917e6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Jan 2013 17:01:56 -0500 Subject: [PATCH 136/162] libnatspec: The build process doesn't respect buildInputs, so force use of libiconv on not-Linux --- pkgs/development/libraries/libnatspec/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index d2747b50ce05..985745c38986 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, popt, libiconvOrEmpty }: +{ stdenv, fetchurl, popt, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libnatspec-0.2.6"; src = fetchurl { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3"; }; - buildInputs = [ popt ] ++ libiconvOrEmpty; + buildInputs = [ popt ]; meta = { homepage = http://natspec.sourceforge.net/ ; @@ -16,4 +16,8 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.urkud ]; }; -} +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_CFLAGS_COMPILE = "-I${libiconv}/include"; + + NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv"; +}) From 49dbf7057d2beeb8c7fb0b49c82455130bf0db59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 19 Jan 2013 01:28:15 +0100 Subject: [PATCH 137/162] Add pythonPackages Distutils2 and eggdeps --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 971c41945337..a7799b75b99c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -620,6 +620,25 @@ let pythonPackages = python.modules // rec { }); + distutils2 = buildPythonPackage rec { + name = "distutils2-${version}"; + version = "1.0a4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/D/Distutils2/Distutils2-${version}.tar.gz"; + md5 = "52bc9dffb394970c27e02853ae3a3241"; + }; + + doCheck = false; + + meta = { + description = "A Python Packaging Library"; + homepage = http://pypi.python.org/pypi/Distutils2; + license = "PSF"; + }; + }; + + distutils_extra = buildPythonPackage rec { name = "distutils-extra-2.26"; @@ -3065,6 +3084,24 @@ let pythonPackages = python.modules // rec { }; + eggdeps = buildPythonPackage rec { + name = "eggdeps-${version}"; + version = "0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/tl.eggdeps/tl.${name}.tar.gz"; + md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7"; + }; + + propagatedBuildInputs = [ zopeInterface zope_testing ]; + meta = { + description = "A tool which computes a dependency graph between active Python eggs"; + homepage = http://thomas-lotze.de/en/software/eggdeps/; + license = "ZPL"; + }; + }; + + turses = buildPythonPackage (rec { name = "turses-0.2.9"; From c296be5519bad552a98882eb53ac5e85e04b48fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Jan 2013 02:26:03 +0100 Subject: [PATCH 138/162] stellarium: update to version 0.11.4a --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index e890ee58307c..541340df6299 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}: let - name = "stellarium-0.11.4"; + name = "stellarium-0.11.4a"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "8ad5e9878eb36c2c27f4754dcfc69279123e0eae02cc388074e3cf9b23746535"; + sha256 = "0gs3lf2061chgcyx22xbnn6b284nsnj8xal7jyjzj57s8yk4n619"; }; buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; From ff461b0755f35de49cfe6d29a49fbf5c4c457b33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Jan 2013 02:31:21 +0100 Subject: [PATCH 139/162] maxima: update to version 5.29.1 --- pkgs/applications/science/math/maxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 18d145b6dde2..d644a1633cbb 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.28.0"; + version = "5.29.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda"; + sha256 = "1p94l28adcn0826nah460r9pz71h7wd5klsg885sl2gzds75bn74"; }; buildInputs = [sbcl texinfo perl makeWrapper]; From 8f0ea2b4c09a28553907cd28a24f4e75aad82ebd Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 19 Jan 2013 18:21:23 +0100 Subject: [PATCH 140/162] pythonPackages: default to python's maintainers and platforms --- pkgs/development/python-modules/generic/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8a70741c36b3..b014d93ba126 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -40,6 +40,8 @@ , preInstall ? "" , postInstall ? "" +, meta ? {} + , ... } @ attrs: # Keep extra attributes from ATTR, e.g., `patchPhase', etc. @@ -48,6 +50,12 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; + # default values for maintainers and platforms + meta = { + maintainers = python.meta.maintainers; + platforms = python.meta.platforms; + } // meta; + # checkPhase after installPhase to run tests on installed packages phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase"; From ddba22fa2e9e4c0a5dc0612ffd6d3646e99089b6 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 19 Jan 2013 19:34:52 +0100 Subject: [PATCH 141/162] chromiumBeta and Dev update dev should be 26.0.1386.0, but its link is broken --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index b274527dfba0..a7687e731f5c 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "25.0.1364.29"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.29.tar.bz2"; - sha256 = "0da3in98b65rb9wkj9jxb3n07d5k7s1xpqwpvk1jz9jbp0hw7ijp"; + version = "25.0.1364.36"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2"; + sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; }; beta = { - version = "24.0.1312.52"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2"; - sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk"; + version = "25.0.1364.36"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2"; + sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; }; stable = { version = "24.0.1312.52"; From 4b9df608e286dca85426bca05a67aa86c1d8c400 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sun, 20 Jan 2013 00:39:13 +0100 Subject: [PATCH 142/162] v4l: Fix building of ir-keytable --- pkgs/os-specific/linux/v4l-utils/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index ea63dadc8bd2..70a81605ea01 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -13,11 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg which ] ++ stdenv.lib.optional withQt4 qt4; - # The keytable wants to touch /etc files and udev scripts in /lib. - # I skip it. - patchPhase = '' - sed -i s/keytable// utils/Makefile - ''; + configureFlags = [ + "--with-udevdir=$(out)/lib/udev" + ]; installPhase = '' make PREFIX=$out install From a72c9d728df9be917e4d9e363e3376419d6831db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 20 Jan 2013 11:56:52 +0100 Subject: [PATCH 143/162] Distutils2: patch to work with Python2 (only), until the issue http://bugs.python.org/issue17002 is resolved upstream --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7799b75b99c..592bcbd5b372 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -629,6 +629,10 @@ let pythonPackages = python.modules // rec { md5 = "52bc9dffb394970c27e02853ae3a3241"; }; + patchPhase = '' + sed -e "s#html.entities#htmlentitydefs#g" -i distutils2/pypi/simple.py + ''; + doCheck = false; meta = { From ced57493ee6853fd05cec18c5f9abeaa530e5370 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:23:28 +0100 Subject: [PATCH 144/162] v4l-utils: update to version 0.9.3 This update fixes the build of the SANE back and front-ends. --- pkgs/os-specific/linux/v4l-utils/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 70a81605ea01..8e6584465d07 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -4,28 +4,22 @@ assert withQt4 -> qt4 != null; stdenv.mkDerivation rec { - name = "v4l-utils-0.8.8"; + name = "v4l-utils-0.9.3"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "0zx8f1npsl6g5vjah1gwydg1j5azl74kr83ifbjhshgmnvscd92z"; + sha256 = "0gaag38x47wlvmp4j60wgf9ma1rxzfyg7i12zxxxi4m3cpcb0bah"; }; - buildInputs = [ libjpeg which ] ++ stdenv.lib.optional withQt4 qt4; + buildInputs = [ which ]; + propagatedBuildInputs = [ libjpeg ] ++ stdenv.lib.optional withQt4 qt4; - configureFlags = [ - "--with-udevdir=$(out)/lib/udev" - ]; - - installPhase = '' - make PREFIX=$out install - ''; + preConfigure = ''configureFlags="--with-udevdir=$out/lib/udev"''; meta = { homepage = http://linuxtv.org/projects.php; description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device"; - # (The libs are of LGPLv2.1+, some other pieces are GPL) - license = "free"; + license = "free"; # The libs are of LGPLv2.1+, some other pieces are GPL. maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; From 46843e60a1aca56c2ff6e505be95058430968297 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:49 +0100 Subject: [PATCH 145/162] haskell-certificate: update to version 1.3.5 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index eb40a4744f9c..036e7ddc124c 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.3"; - sha256 = "043xj3xd6cfnbg9hw2f8agckww3fasvraa72jw84zqc7l2gq0rq2"; + version = "1.3.5"; + sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j"; isLibrary = true; isExecutable = true; buildDepends = [ From 5b3e861748467b7756446377811906a73331457a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:49 +0100 Subject: [PATCH 146/162] haskell-hakyll: update to version 4.1.1.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 9b708eff0203..2824234ede3c 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.0.0.0"; - sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr"; + version = "4.1.1.0"; + sha256 = "0v0c2hbwnd56q3vwrf9515v85yn2k850z9jd8y8kj2i79wh7l3dz"; isLibrary = true; isExecutable = true; buildDepends = [ From 0184ed349bf0d2dec1ec3ee023354fd46c827f26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 147/162] haskell-highlighting-kate: update to version 0.5.3.5 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index cc591acf2022..afb6a4be662a 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.4"; - sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77"; + version = "0.5.3.5"; + sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; From f13f0860152f596a85376659fe609240c3616c70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 148/162] haskell-pandoc-types: update to version 1.10 --- pkgs/development/libraries/haskell/pandoc-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 6dfbc1fc15ff..d4f49791d306 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.9.1"; - sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i"; + version = "1.10"; + sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6"; buildDepends = [ syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; From 3a4f88d02bc0bfb56c1253f807807d86395d07c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 149/162] haskell-pandoc: update to version 1.10 --- .../libraries/haskell/pandoc/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b3bfbc50b5f4..98f4dfb05016 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,20 +1,20 @@ { cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs -, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl -, network, pandocTypes, parsec, random, syb, tagsoup, temporary -, texmath, time, utf8String, xml, zipArchive, zlib +, dataDefault, extensibleExceptions, filepath, highlightingKate +, HTTP, json, mtl, network, pandocTypes, parsec, random, syb +, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.4.5"; - sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb"; + version = "1.10"; + sha256 = "11zvyzn16zckgs1zzhl415y14nziw16zhgghg31a459d1ww7c3dg"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml blazeMarkup citeprocHs + base64Bytestring blazeHtml blazeMarkup citeprocHs dataDefault extensibleExceptions filepath highlightingKate HTTP json mtl network pandocTypes parsec random syb tagsoup temporary texmath - time utf8String xml zipArchive zlib + text time xml zipArchive zlib ]; configureFlags = "-fblaze_html_0_5"; meta = { From 6eec1e54c9ef11d771a8db659f02a5af92dbd56a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 150/162] haskell-tls-extra: update to version 0.6.1 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 5bcce9df16b7..c9ab989ed76d 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.6.0"; - sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx"; + version = "0.6.1"; + sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan"; isLibrary = true; isExecutable = true; buildDepends = [ From 58dc4a76ad36bb9de719e9019194fac215cf0b13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 151/162] haskell-yst: update to version 0.3.1 --- pkgs/development/libraries/haskell/yst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 5cb5fb6a2099..5087bfce12cf 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yst"; - version = "0.3.0.1"; - sha256 = "17jp9vdbpp82wzsj8rhp5nh6fbmgm2xrclfnb7jl4gjwls7xggrv"; + version = "0.3.1"; + sha256 = "1ax3j21b4ac9x4vvvfgnhz0sczd7l7ia6mcxnqhbc3166sn91vig"; isLibrary = false; isExecutable = true; buildDepends = [ From f8447dc1e0ef4809a026a12e674a97f7b517cec7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 152/162] haskell-hlint: update to version 1.8.41 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 4cbd57a8c5f9..5b7a925e20b2 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.40"; - sha256 = "18w4dhxv7c1y4x1agdjq99ss5i77jnm8p9vg3jp9gvhk2arhcl0x"; + version = "1.8.41"; + sha256 = "0b585i5v81jh1j2r70x74ykabc5hcd5sbww4kspl3s5i3jwkp16q"; isLibrary = true; isExecutable = true; buildDepends = [ From 7fef7e53ce7e068044a2fb806fa1ec28cf16d90c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 20 Jan 2013 02:28:09 +0100 Subject: [PATCH 153/162] pythonPackages: use pygobject and pygtk of same python version --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 592bcbd5b372..5e4995d2d5d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1600,7 +1600,7 @@ let pythonPackages = python.modules // rec { sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; - buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; + buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -2850,7 +2850,7 @@ let pythonPackages = python.modules // rec { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pkgs.pygobject ]; + propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pygobject ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; From e185691ced86fc517a2daea762d7d11e525c6ae8 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 20 Jan 2013 16:45:02 +0100 Subject: [PATCH 154/162] python: nose2, nose2Cov and covCore --- pkgs/top-level/python-packages.nix | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e4995d2d5d8..b098caebe47d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -502,6 +502,18 @@ let pythonPackages = python.modules // rec { }; }; + covCore = buildPythonPackage rec { + name = "cov-core-1.7"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/cov-core/cov-core-1.7.tar.gz"; + md5 = "59c1e22e636633e10120beacbf45b28c"; + }; + meta = { + description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; + }; + propagatedBuildInputs = [ coverage ]; + }; + cssselect = buildPythonPackage rec { name = "cssselect-0.7.1"; src = fetchurl { @@ -1592,6 +1604,32 @@ let pythonPackages = python.modules // rec { buildInputs = [ coverage ]; }; + nose2 = buildPythonPackage rec { + name = "nose2-0.4.5"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz"; + md5 = "d7e51c848227488e3cc0424faf5511cd"; + }; + meta = { + description = "nose2 is the next generation of nicer testing for Python"; + }; + propagatedBuildInputs = [ six ]; + # AttributeError: 'module' object has no attribute 'collector' + doCheck = false; + }; + + nose2Cov = buildPythonPackage rec { + name = "nose2-cov-1.0a4"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose2-cov/nose2-cov-1.0a4.tar.gz"; + md5 = "6442f03e2ea732b0e38eb5b00fbe0b31"; + }; + meta = { + description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing"; + }; + buildInputs = [ covCore nose2 ]; + }; + notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; From 9c2bc27eb2ccded853aabd1382fd912df4b5e4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 20 Jan 2013 18:51:41 +0100 Subject: [PATCH 155/162] Fixing mcelog, so it puts the proper files in share/doc It was running "cp mce.pdf $out/share/doc", which created the file 'doc'. Then buildEnv complained that 'share/doc' exists. --- pkgs/os-specific/linux/mcelog/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 82c502ede72f..b60b6134fdde 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -25,9 +25,13 @@ in stdenv.mkDerivation { makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc"; + preInstall = '' + ensureDir $out/share/doc + ''; + meta = { description = "Tool to display logged machine check exceptions"; homepage = http://mcelog.org/; license = stdenv.lib.licenses.gpl2; }; -} \ No newline at end of file +} From a865154f62179b1af6546a4d2d3338b5937afcf2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 04:43:59 +0100 Subject: [PATCH 156/162] Add myself as (additional) maintainer to all python packages. --- pkgs/development/python-modules/generic/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index b014d93ba126..70bf92f0ae90 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -50,11 +50,13 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; - # default values for maintainers and platforms + # default to python's platforms and add maintainer(s) to every + # package meta = { - maintainers = python.meta.maintainers; platforms = python.meta.platforms; - } // meta; + } // meta // { + maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ]; + }; # checkPhase after installPhase to run tests on installed packages phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase"; From 9ee07ba54ff80f714610633acf63afa742d2633e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 05:35:41 +0100 Subject: [PATCH 157/162] python-mrbob: add missing dependency --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b098caebe47d..10bb58214478 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1445,7 +1445,7 @@ let pythonPackages = python.modules // rec { md5 = "361c8ac7a31953ab94a95cf34d9a0b2b"; }; - buildInputs = [ pkgs.unzip ]; + buildInputs = [ pkgs.unzip six ]; propagatedBuildInputs = [ argparse jinja2 ]; From b469185673c3e24746cbf54277fc8640b7fe66c0 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 06:42:22 +0100 Subject: [PATCH 158/162] pythonPackages26 fixes --- pkgs/top-level/python-packages.nix | 42 ++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10bb58214478..0ca54c90c4d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1,6 +1,12 @@ { pkgs, python }: -let pythonPackages = python.modules // rec { +let +isPy26 = python.majorVersion == "2.6"; +isPy27 = python.majorVersion == "2.7"; +optional = pkgs.lib.optional; +optionals = pkgs.lib.optionals; + +pythonPackages = python.modules // rec { inherit python; inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; @@ -996,8 +1002,7 @@ let pythonPackages = python.modules // rec { sha256 = "0bhiyx41kilvy04cgjbvjy2r4b6l7zz31fbrg3l6lvnqm26nihb0"; }; - buildInputs = [ pkgs.setuptools ] ++ - (if python.majorVersion == "2.6" then [ argparse ] else []); + buildInputs = [ pkgs.setuptools ] ++ (optional isPy26 argparse); meta = { description = "automatically generated zsh completion function for Python's option parser modules"; @@ -1101,6 +1106,14 @@ let pythonPackages = python.modules // rec { }; }; + importlib = if isPy26 then (buildPythonPackage { + name = "importlib-1.0.2"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz"; + md5 = "4aa23397da8bd7c7426864e88e4db7e1"; + }; + doCheck = false; + }) else null; iptools = buildPythonPackage rec { version = "0.4.0"; @@ -1445,7 +1458,7 @@ let pythonPackages = python.modules // rec { md5 = "361c8ac7a31953ab94a95cf34d9a0b2b"; }; - buildInputs = [ pkgs.unzip six ]; + buildInputs = [ pkgs.unzip six ] ++ (optionals isPy26 [ importlib ordereddict ]); propagatedBuildInputs = [ argparse jinja2 ]; @@ -1604,7 +1617,7 @@ let pythonPackages = python.modules // rec { buildInputs = [ coverage ]; }; - nose2 = buildPythonPackage rec { + nose2 = if isPy26 then null else (buildPythonPackage rec { name = "nose2-0.4.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz"; @@ -1616,9 +1629,9 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [ six ]; # AttributeError: 'module' object has no attribute 'collector' doCheck = false; - }; + }); - nose2Cov = buildPythonPackage rec { + nose2Cov = if isPy26 then null else (buildPythonPackage rec { name = "nose2-cov-1.0a4"; src = fetchurl { url = "http://pypi.python.org/packages/source/n/nose2-cov/nose2-cov-1.0a4.tar.gz"; @@ -1628,7 +1641,7 @@ let pythonPackages = python.modules // rec { description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing"; }; buildInputs = [ covCore nose2 ]; - }; + }); notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; @@ -1743,6 +1756,15 @@ let pythonPackages = python.modules // rec { # }; # }); + ordereddict = if isPy26 then (buildPythonPackage { + name = "ordereddict-1.1"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz"; + md5 = "a0ed854ee442051b249bfad0f638bbec"; + }; + doCheck = false; + }) else null; + ply = buildPythonPackage (rec { name = "ply-3.2"; @@ -3152,9 +3174,7 @@ let pythonPackages = python.modules // rec { sha256 = "c0f32fa31e2c5fa42f5cc19f3dba4e73f0438bf36bf756ba137f2423c0ac4637"; }; - propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ - (if python.majorVersion == "2.6" then [ argparse ] - else []); + propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; #buildInputs = [ tox ]; # needs tox From 3ab50c106df00400ca754e1bbd77fe698f565238 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 06:50:10 +0100 Subject: [PATCH 159/162] python-ipdb --- pkgs/top-level/python-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ca54c90c4d3..f40997ecc64b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1149,6 +1149,15 @@ pythonPackages = python.modules // rec { }; }; + ipdb = buildPythonPackage { + name = "ipdb-0.7"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/i/ipdb/ipdb-0.7.tar.gz"; + md5 = "d879f9b2b0f26e0e999809585dcaec61"; + }; + propagatedBuildInputs = [ ipython ]; + }; + jedi = buildPythonPackage (rec { name = "jedi-0.5b5"; From 8dd5f835fc4c08aa2f1801d7f96e72ae1b4635bb Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 08:37:07 +0100 Subject: [PATCH 160/162] python-coverage-3.6 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f40997ecc64b..4ebf95072038 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -492,11 +492,11 @@ pythonPackages = python.modules // rec { }); coverage = buildPythonPackage rec { - name = "coverage-3.5.3"; + name = "coverage-3.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; - md5 = "5f1f523940c473faa8a9f6ca29f78efc"; + md5 = "67d4e393f4c6a5ffc18605409d2aa1ac"; }; meta = { From 8b777bbf5751b00ef8179118e1d1a520987245c3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 08:37:28 +0100 Subject: [PATCH 161/162] nose2Cov does not create pth for deps - propagate manually --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ebf95072038..dbc0948d74e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1649,7 +1649,7 @@ pythonPackages = python.modules // rec { meta = { description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing"; }; - buildInputs = [ covCore nose2 ]; + propagatedBuildInputs = [ covCore nose2 ]; }); notify = pkgs.stdenv.mkDerivation (rec { From 52e9981e0e5fc57888377dcfbf5993e5d7fd0bb2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 08:38:54 +0100 Subject: [PATCH 162/162] buildPythonPackage defaults to python.meta.platforms --- pkgs/top-level/python-packages.nix | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dbc0948d74e2..96b338f89dbc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -114,7 +114,6 @@ pythonPackages = python.modules // rec { homepage = https://github.com/teythoon/afew; description = "afew is an initial tagging script for notmuch mail."; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -143,7 +142,6 @@ pythonPackages = python.modules // rec { homepage = https://github.com/pazz/alot; description = "Terminal MUA using notmuch mail"; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -467,7 +465,6 @@ pythonPackages = python.modules // rec { description = "Simple, lightweight, and easily extensible STOMP message broker"; homepage = http://code.google.com/p/coilmq/; license = pkgs.lib.licenses.asl20; - platforms = python.meta.platforms; }; }); @@ -487,7 +484,6 @@ pythonPackages = python.modules // rec { homepage = http://pypi.python.org/pypi/configobj; license = pkgs.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }); @@ -504,7 +500,6 @@ pythonPackages = python.modules // rec { homepage = http://nedbatchelder.com/code/coverage/; license = pkgs.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.shlevy ]; - platforms = python.meta.platforms; }; }; @@ -633,7 +628,6 @@ pythonPackages = python.modules // rec { description = "Easily download, build, install, upgrade, and uninstall Python packages"; homepage = http://packages.python.org/distribute; license = "PSF or ZPL"; - platforms = python.meta.platforms; }; }); @@ -881,7 +875,6 @@ pythonPackages = python.modules // rec { homepage = http://pypi.python.org/pypi/flake8; license = pkgs.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }); @@ -945,7 +938,6 @@ pythonPackages = python.modules // rec { license = "MIT"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; }; }); @@ -1008,7 +1000,6 @@ pythonPackages = python.modules // rec { description = "automatically generated zsh completion function for Python's option parser modules"; license = "BSD"; maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = python.meta.platforms; }; }; @@ -1102,7 +1093,6 @@ pythonPackages = python.modules // rec { description = "A comprehensive HTTP client library"; license = pkgs.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -1171,7 +1161,6 @@ pythonPackages = python.modules // rec { description = "An autocompletion tool for Python that can be used for text editors."; license = pkgs.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }); @@ -1688,7 +1677,6 @@ pythonPackages = python.modules // rec { description = "A Python wrapper around notmuch"; homepage = http://notmuchmail.org/; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -1804,7 +1792,6 @@ pythonPackages = python.modules // rec { license = "revised-BSD"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; }; }); @@ -1835,8 +1822,6 @@ pythonPackages = python.modules // rec { tunnel -- this is how sftp works, for example. it is written entirely in python (no C or platform-dependent code) and is released under the GNU LGPL (lesser GPL). ''; - - platforms = python.meta.platforms; }; }; @@ -1930,7 +1915,6 @@ pythonPackages = python.modules // rec { ''; maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = python.meta.platforms; }; }; @@ -2215,7 +2199,6 @@ pythonPackages = python.modules // rec { description = "A Python wrapper for the GPGME library."; license = pkgs.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -2448,7 +2431,6 @@ pythonPackages = python.modules // rec { license = "revised BSD"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; }; }); @@ -3014,7 +2996,6 @@ pythonPackages = python.modules // rec { description = "Lightweight and extensible STOMP messaging client"; homepage = http://bitbucket.org/hozn/stompclient; license = pkgs.lib.licenses.asl20; - platforms = python.meta.platforms; }; }); @@ -3244,7 +3225,6 @@ pythonPackages = python.modules // rec { license = "MIT"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; }; }; @@ -3302,7 +3282,6 @@ pythonPackages = python.modules // rec { homepage = http://excess.org/urwid; license = pkgs.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }); @@ -3722,7 +3701,6 @@ pythonPackages = python.modules // rec { homepage = http://liw.fi/cliapp/; description = "Python framework for Unix command line programs."; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3743,7 +3721,6 @@ pythonPackages = python.modules // rec { homepage = http://liw.fi/tracing/; description = "Python debug logging helper."; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3764,7 +3741,6 @@ pythonPackages = python.modules // rec { homepage = http://liw.fi/ttystatus/; description = "Progress and status updates on terminals for Python."; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3787,7 +3763,6 @@ pythonPackages = python.modules // rec { homepage = http://liw.fi/larch/; description = "Python B-tree library."; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3807,7 +3782,6 @@ pythonPackages = python.modules // rec { homepage = http://graphite.wikidot.com/; description = "Fixed size round-robin style database"; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3830,7 +3804,6 @@ pythonPackages = python.modules // rec { homepage = http://graphite.wikidot.com/; description = "Backend data caching and persistence daemon for Graphite"; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3849,7 +3822,6 @@ pythonPackages = python.modules // rec { homepage = https://launchpad.net/txamqp; description = "Library for communicating with AMQP peers and brokers using Twisted"; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3871,7 +3843,6 @@ pythonPackages = python.modules // rec { homepage = http://graphite.wikidot.com/; description = "Enterprise scalable realtime graphing"; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; };