diff options
Diffstat (limited to 'pkgs')
272 files changed, 4081 insertions, 3822 deletions
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 378318fbf855..cd30b5b30847 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "high quality software synthesizer"; + description = "High quality software synthesizer"; homepage = http://zynaddsubfx.sourceforge.net; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index 5439ba9e4d6e..d8bbb83c4e58 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix new file mode 100644 index 000000000000..2a35c6ef6950 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, emacs, xmlRpc }: + +stdenv.mkDerivation rec { + name = "metaweblog-0.1"; + + src = fetchgit { + url = https://github.com/punchagan/metaweblog.git; + rev = "ceda65048afaa4c7596c7f50ced998c59ef41167"; + sha256 = "a4c10bb1b4be574e560f87d5f07da4e24e5fffe9ecc83e6d4f9325f3a7eb1e2f"; + }; + + buildInputs = [ emacs ]; + propagatedUserEnvPkgs = [ xmlRpc ]; + + buildPhase = '' + emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install *.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "an emacs library to access metaweblog based weblogs"; + homepage = https://github.com/punchagan/metaweblog; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 768444008ad4..e52011547c7a 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, emacs, texinfo, which, texLive }: +{ fetchurl, stdenv, emacs, texinfo, which, texLive, texLiveCMSuper +, texLiveAggregationFun }: stdenv.mkDerivation rec { name = "org-8.2.7"; @@ -9,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ emacs ]; - nativeBuildInputs = [ texinfo texLive ]; + nativeBuildInputs = [ (texLiveAggregationFun { paths=[ texinfo texLive texLiveCMSuper ]; }) ]; configurePhase = '' sed -i mk/default.mk \ @@ -44,6 +45,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix index e72560be8f44..d2e9e305bffb 100644 --- a/pkgs/applications/editors/emacs-modes/org2blog/default.nix +++ b/pkgs/applications/editors/emacs-modes/org2blog/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchgit, emacs, xmlRpc }: +{ stdenv, fetchgit, emacs, org, xmlRpc, metaweblog }: stdenv.mkDerivation rec { - name = "org2blog-0.5"; + name = "org2blog-0.8.1"; src = fetchgit { url = https://github.com/punchagan/org2blog.git; - rev = "338abe30e9bc89684f8384f8deaf826b63844da6"; - sha256 = "46ab31e90d0d54071c126b7d5599a3e82062baa79ddf26b988bcb88d306d6827"; + rev = "5f573ff3e4007c16517a5fe28c4f5d8dde3f8a77"; + sha256 = "e83c08ceece92bb507be70046db4a7fa87a4af34ad3f84a727e0bd6a1dd99a33"; }; buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ xmlRpc ]; + propagatedUserEnvPkgs = [ org xmlRpc metaweblog ]; buildPhase = '' - emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el + emacs -L . -L ${org}/share/emacs/site-lisp/org \ + -L ${xmlRpc}/share/emacs/site-lisp \ + -L ${metaweblog}/share/emacs/site-lisp \ + --batch -f batch-byte-compile *.el ''; installPhase = '' diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix index 3f974423fd70..0dea1a13977e 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation (rec { ''; homepage = http://proofgeneral.inf.ed.ac.uk; license = "GPLv2+"; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; # arbitrary choice }; }) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix new file mode 100644 index 000000000000..3a492dc0c7f4 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }: + +stdenv.mkDerivation (rec { + name = "ProofGeneral-4.3pre131011"; + + src = fetchurl { + url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.3pre131011.tgz; + sha256 = "0104iy2xik5npkdg9p2ir6zqyrmdc93azrgm3ayvg0z76vmnb816"; + }; + + sourceRoot = name; + + buildInputs = [ emacs texinfo texLive perl which ]; + + prePatch = + '' sed -i "Makefile" \ + -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ + s|/sbin/install-info|install-info|g" + + + sed -i "bin/proofgeneral" -e's/which/type -p/g' + + # @image{ProofGeneral} fails, so remove it. + sed -i '94d' doc/PG-adapting.texi + sed -i '96d' doc/ProofGeneral.texi + ''; + + preBuild = '' + make clean; + ''; + + installPhase = + # Copy `texinfo.tex' in the right place so that `texi2pdf' works. + '' cp -v "${automake}/share/"automake-*/texinfo.tex doc + make install install-doc + ''; + + meta = { + description = "Proof General, an Emacs front-end for proof assistants"; + longDescription = '' + Proof General is a generic front-end for proof assistants (also known as + interactive theorem provers), based on the customizable text editor Emacs. + ''; + homepage = http://proofgeneral.inf.ed.ac.uk; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.unix; # arbitrary choice + }; +}) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 87ea7ee6854e..4166bc1e9e3e 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "export gl_cv_func_fstatat_zero_flag=yes"; meta = { - description = "GNU Zile, a lightweight Emacs clone"; + description = "Lightweight Emacs clone"; longDescription = '' GNU Zile, which is a lightweight Emacs clone. Zile is short diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 6a212a7a931d..ee8543f7039a 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -22,6 +22,14 @@ stdenv.mkDerivation { meta = { description = "Drawing application"; + longDescription = '' + Alchemy is an open drawing project aimed at exploring how we can sketch, + draw, and create on computers in new ways. Alchemy isn’t software for + creating finished artwork, but rather a sketching environment that + focuses on the absolute initial stage of the creation process. + Experimental in nature, Alchemy lets you brainstorm visually to explore + an expanded range of ideas and possibilities in a serendipitous way. + ''; homepage = http://al.chemy.org/; license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix new file mode 100644 index 000000000000..80d8dd801a9b --- /dev/null +++ b/pkgs/applications/misc/camlistore/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, go, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.7"; + name = "camlistore-${version}"; + + src = fetchurl { + url = "https://github.com/bradfitz/camlistore/archive/0.7.tar.gz"; + sha256 = "0lc35x2b9llrnma0m5czivly0c3l4lh3ldw9hwn83lkh8n0bzn11"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + go run make.go + rm bin/README + ''; + + installPhase = '' + ensureDir $out/bin + cp bin/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "Camlistore is a way of storing, syncing, sharing, modelling and backing up content"; + homepage = https://camlistore.org; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix new file mode 100644 index 000000000000..70f3855c3d66 --- /dev/null +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, gettext, kdelibs, makeWrapper, qca2, qca2_ossl, qjson }: + +stdenv.mkDerivation rec { + name = "kdeconnect-${version}"; + version = "0.5.2.1"; + + src = fetchurl { + url = "http://download.kde.org/unstable/kdeconnect/0.5.2/src/kdeconnect-kde-${version}.tar.xz"; + sha256 = "0g632ha7xcqf839c4h0dz5637bz6gnn2gz76dc0qq09zbrq49i08"; + }; + + buildInputs = [ gettext kdelibs makeWrapper qca2 qca2_ossl qjson ]; + + postInstall = '' + wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins + ''; + + meta = with stdenv.lib; { + description = "A tool to connect and sync your devices with KDE"; + longDescription = '' + The corresponding Android app, "KDE Connect", is available in + F-Droid and Google play and has the following features: + + - Share files and URLs to KDE from any app + - Clipboard share: copy from or to your desktop + - Notifications sync (4.3+): Read your Android notifications from KDE + - Multimedia remote control: Use your phone as a remote control + - WiFi connection: no usb wire or bluetooth needed + - RSA Encryption: your information is safe + ''; + license = licenses.gpl2; + homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index fda89f1cd3dd..9c57fbd19a77 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.4.1"; + name = "st-0.5"; src = fetchurl { url = "http://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0cdzwbm5fxrwz8ryxkh90d3vwx54wjyywgj28ymsb5fdv3396bzf"; + sha256 = "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 2a88ed8db659..d425c3f07384 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,17 +1,17 @@ -{ stdenv, mkChromiumDerivation, arch }: +{ stdenv, mkChromiumDerivation }: with stdenv.lib; mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; - buildTargets = [ "mksnapshot.${arch}" "chrome" ]; + buildTargets = [ "mksnapshot" "chrome" ]; installPhase = '' ensureDir "$libExecPath" cp -v "$buildPath/"*.pak "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" - cp -vR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" + cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v $buildPath/libffmpegsumo.so "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 301950e3f44b..3aac5f9b17ae 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -30,7 +30,6 @@ , source , plugins -, archInfo }: buildFun: @@ -133,6 +132,8 @@ let find -iname '*.gyp*' \( -type f -o -type l \) \ -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \ -exec chmod u+w {} + + '' + optionalString (!versionOlder source.version "37.0.0.0") '' + python third_party/libaddressinput/chromium/tools/update-strings.py ''; postPatch = let @@ -143,6 +144,10 @@ let sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \ sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH")); ' ${toPatch} + '' + optionalString (!versionOlder source.version "36.0.0.0") '' + sed -i -e '/module_path *=.*libexif.so/ { + s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| + }' chrome/utility/media_galleries/image_metadata_extractor.cc ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { @@ -161,6 +166,9 @@ let linux_sandbox_chrome_path="${libExecPath}/${packageName}"; werror = ""; + # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated. + use_mojo = versionOlder source.version "37.0.0.0"; + # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, @@ -173,7 +181,13 @@ let # enable support for the H.264 codec proprietary_codecs = true; ffmpeg_branding = "Chrome"; - } // archInfo // (extraAttrs.gypFlags or {})); + } // optionalAttrs (stdenv.system == "x86_64-linux") { + target_arch = "x64"; + python_arch = "x86-64"; + } // optionalAttrs (stdenv.system == "i686-linux") { + target_arch = "ia32"; + python_arch = "ia32"; + } // (extraAttrs.gypFlags or {})); configurePhase = '' # This is to ensure expansion of $out. @@ -185,17 +199,20 @@ let buildPhase = let CC = "${gcc}/bin/gcc"; CXX = "${gcc}/bin/g++"; - buildCommand = target: '' + buildCommand = target: let + # XXX: Only needed for version 36 and older! + targetSuffix = optionalString + (versionOlder source.version "37.0.0.0" && target == "mksnapshot") + (if stdenv.is64bit then ".x64" else ".ia32"); + in '' CC="${CC}" CC_host="${CC}" \ CXX="${CXX}" CXX_host="${CXX}" \ LINK_host="${CXX}" \ "${ninja}/bin/ninja" -C "${buildPath}" \ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - ${target} - - if [[ "${target}" == mksnapshot.* || "${target}" == "chrome" ]]; then - paxmark m "${buildPath}/${target}" - fi + "${target}${targetSuffix}" + '' + optionalString (target == "mksnapshot" || target == "chrome") '' + paxmark m "${buildPath}/${target}${targetSuffix}" ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index efb0a95e9db2..44fd3c69e537 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -15,14 +15,6 @@ }: let - archInfo = with stdenv.lib; optionalAttrs (stdenv.system == "i686-linux") { - target_arch = "ia32"; - python_arch = "ia32"; - } // optionalAttrs (stdenv.system == "x86_64-linux") { - target_arch = "x64"; - python_arch = "x86-64"; - }; - callPackage = newScope chromium; chromium = { @@ -35,13 +27,10 @@ let mkChromiumDerivation = callPackage ./common.nix { inherit enableSELinux enableNaCl useOpenSSL gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport - pulseSupport archInfo; - }; - - browser = callPackage ./browser.nix { - arch = archInfo.target_arch; + pulseSupport; }; + browser = callPackage ./browser.nix { }; sandbox = callPackage ./sandbox.nix { }; plugins = callPackage ./plugins.nix { diff --git a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch b/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch new file mode 100644 index 000000000000..a3e8c91174a4 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch @@ -0,0 +1,347 @@ +commit 9c4b24a52e0ff478aa170d33e26c44acd8c68be3 +Author: Jamie Madill <jmadill@chromium.org> +Date: Thu Jun 12 13:41:17 2014 -0400 + + Use commit_id.py on Windows, and handle missing git. + + This allows us to delete the Windows batch file. + + Changes the commit_id script to take the working directory so that it + can be called from a different working directory than the angle + repository is in. + + Renames the generated commit header to angle_commit.h. This is being + written to the shared generated code directory for the entire build, + and "commit.h" is insufficiently unique. + + BUG=angle:669 + + Change-Id: I35e80411a7e8ba1e02ce3f6a4fc54ed4dbc918f3 + Reviewed-on: https://chromium-review.googlesource.com/202048 + Reviewed-by: Geoff Lang <geofflang@chromium.org> + Tested-by: Jamie Madill <jmadill@chromium.org> + [Removed and/or fixed up Windows specific hunks] + Signed-off-by: aszlig <aszlig@redmoonstudios.org> + +diff --git a/generate_projects b/generate_projects +index 6743254..8175277 100644 +--- a/generate_projects ++++ b/generate_projects +@@ -34,6 +34,7 @@ if __name__ == '__main__': + gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0') + gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0') + gyp_cmd += ' -D release_symbols=' + ('true' if release_symbols else 'false') ++ gyp_cmd += ' -D angle_use_commit_id=0' + gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp') + + print 'Generating projects to ' + generation_dir + ' from gyp files...' +diff --git a/projects/build/all.sln b/projects/build/all.sln +index 1aa0796..5862edd 100644 +--- a/projects/build/all.sln ++++ b/projects/build/all.sln +@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}" + ProjectSection(ProjectDependencies) = postProject + {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} +- {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} + {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} + {276D20F5-2943-414C-0FF6-21F4723A5CF6} = {276D20F5-2943-414C-0FF6-21F4723A5CF6} + {C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679} + {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} ++ {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} + {22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81} + {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} + {FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061} +@@ -30,9 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048 + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" +- ProjectSection(ProjectDependencies) = postProject +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} +- EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" + ProjectSection(ProjectDependencies) = postProject +@@ -68,7 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx + ProjectSection(ProjectDependencies) = postProject + {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} + {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" +diff --git a/projects/samples/samples.sln b/projects/samples/samples.sln +index 53cec34..b927860 100644 +--- a/projects/samples/samples.sln ++++ b/projects/samples/samples.sln +@@ -1,9 +1,6 @@ + Microsoft Visual Studio Solution File, Format Version 11.00 + # Visual C++ Express 2010 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" +- ProjectSection(ProjectDependencies) = postProject +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} +- EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" + ProjectSection(ProjectDependencies) = postProject +@@ -39,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx + ProjectSection(ProjectDependencies) = postProject + {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} + {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" +diff --git a/projects/src/angle.sln b/projects/src/angle.sln +index 0d6ec65..cdf9f53 100644 +--- a/projects/src/angle.sln ++++ b/projects/src/angle.sln +@@ -1,9 +1,6 @@ + Microsoft Visual Studio Solution File, Format Version 11.00 + # Visual C++ Express 2010 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" +- ProjectSection(ProjectDependencies) = postProject +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} +- EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" + ProjectSection(ProjectDependencies) = postProject +@@ -16,7 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", + ProjectSection(ProjectDependencies) = postProject + {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} + {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" +diff --git a/src/angle.gypi b/src/angle.gypi +index 5339369..ef16749 100644 +--- a/src/angle.gypi ++++ b/src/angle.gypi +@@ -7,6 +7,12 @@ + { + 'angle_code': 1, + 'angle_post_build_script%': 0, ++ 'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle', ++ 'angle_id_script_base': 'commit_id.py', ++ 'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)', ++ 'angle_id_header_base': 'commit.h', ++ 'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)', ++ 'angle_use_commit_id%': '<!(python <(angle_id_script_base) check ..)', + }, + 'includes': + [ +@@ -23,57 +29,71 @@ + 'copies': + [ + { +- 'destination': '<(SHARED_INTERMEDIATE_DIR)', +- 'files': [ 'commit_id.bat', 'copy_compiler_dll.bat', 'commit_id.py' ], ++ 'destination': '<(angle_gen_path)', ++ 'files': [ 'copy_compiler_dll.bat', '<(angle_id_script_base)' ], + }, + ], + }, +- ++ ], ++ 'conditions': ++ [ ++ ['angle_use_commit_id!=0', + { +- 'target_name': 'commit_id', +- 'type': 'none', +- 'includes': [ '../build/common_defines.gypi', ], +- 'dependencies': [ 'copy_scripts', ], +- 'conditions': ++ 'targets': + [ +- ['OS=="win"', + { ++ 'target_name': 'commit_id', ++ 'type': 'none', ++ 'includes': [ '../build/common_defines.gypi', ], ++ 'dependencies': [ 'copy_scripts', ], + 'actions': + [ + { +- 'action_name': 'Generate Commit ID Header', +- 'message': 'Generating commit ID header...', ++ 'action_name': 'Generate ANGLE Commit ID Header', ++ 'message': 'Generating ANGLE Commit ID', ++ # reference the git index as an input, so we rebuild on changes to the index ++ 'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ], ++ 'outputs': [ '<(angle_id_header)' ], + 'msvs_cygwin_shell': 0, +- 'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.bat', '<(angle_path)/.git/index' ], +- 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit.h' ], +- 'action': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.bat', '<(SHARED_INTERMEDIATE_DIR)' ], ++ 'action': ++ [ ++ 'python', '<(angle_id_script)', 'gen', '<(angle_path)', '<(angle_id_header)' ++ ], + }, + ], +- }, +- { # OS != win +- 'actions': ++ 'direct_dependent_settings': ++ { ++ 'include_dirs': ++ [ ++ '<(angle_gen_path)', ++ ], ++ }, ++ } ++ ] ++ }, ++ { # angle_use_commit_id==0 ++ 'targets': ++ [ ++ { ++ 'target_name': 'commit_id', ++ 'type': 'none', ++ 'copies': + [ + { +- 'action_name': 'Generate Commit ID Header', +- 'message': 'Generating commit ID header...', +- 'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(angle_path)/.git/index' ], +- 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit.h' ], +- 'action': [ 'python', '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(SHARED_INTERMEDIATE_DIR)/commit.h' ], +- }, ++ 'destination': '<(angle_gen_path)/id', ++ 'files': [ '<(angle_id_header_base)' ] ++ } + ], +- }], +- ], +- 'direct_dependent_settings': +- { +- 'include_dirs': +- [ +- '<(SHARED_INTERMEDIATE_DIR)', +- ], +- }, +- }, +- ], +- 'conditions': +- [ ++ 'direct_dependent_settings': ++ { ++ 'include_dirs': ++ [ ++ '<(angle_gen_path)', ++ ], ++ }, ++ } ++ ] ++ }], + ['OS=="win"', + { + 'targets': +@@ -93,7 +113,7 @@ + 'outputs': [ '<(PRODUCT_DIR)/D3DCompiler_46.dll' ], + 'action': + [ +- "<(SHARED_INTERMEDIATE_DIR)/copy_compiler_dll.bat", ++ "<(angle_gen_path)/copy_compiler_dll.bat", + "$(PlatformName)", + "<(windows_sdk_path)", + "<(PRODUCT_DIR)" +diff --git a/src/commit.h b/src/commit.h +new file mode 100644 +index 0000000..4c89a65 +--- /dev/null ++++ b/src/commit.h +@@ -0,0 +1,14 @@ ++// ++// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++// ++// commit.h: ++// This is a default commit hash header, when git is not available. ++// ++ ++#define ANGLE_COMMIT_HASH "unknown hash" ++#define ANGLE_COMMIT_HASH_SIZE 12 ++#define ANGLE_COMMIT_DATE "unknown date" ++ ++#define ANGLE_DISABLE_PROGRAM_BINARY_LOAD +diff --git a/src/commit_id.py b/src/commit_id.py +index 6339cca..7f711e7 100644 +--- a/src/commit_id.py ++++ b/src/commit_id.py +@@ -1,19 +1,35 @@ + import subprocess as sp + import sys ++import os + +-def grab_output(*command): +- return sp.Popen(command, stdout=sp.PIPE).communicate()[0].strip() ++# Usage: commit_id.py check <angle_dir> (checks if git is present) ++# Usage: commit_id.py gen <angle_dir> <file_to_write> (generates commit id) + ++def grab_output(command, cwd): ++ return sp.Popen(command, stdout=sp.PIPE, shell=True, cwd=cwd).communicate()[0].strip() ++ ++operation = sys.argv[1] ++cwd = sys.argv[2] ++ ++if operation == 'check': ++ index_path = os.path.join(cwd, '.git', 'index') ++ if os.path.exists(index_path): ++ print("1") ++ else: ++ print("0") ++ sys.exit(0) ++ ++output_file = sys.argv[3] + commit_id_size = 12 + + try: +- commit_id = grab_output('git', 'rev-parse', '--short=%d' % commit_id_size, 'HEAD') +- commit_date = grab_output('git', 'show', '-s', '--format=%ci', 'HEAD') ++ commit_id = grab_output('git rev-parse --short=%d HEAD' % commit_id_size, cwd) ++ commit_date = grab_output('git show -s --format=%ci HEAD', cwd) + except: + commit_id = 'invalid-hash' + commit_date = 'invalid-date' + +-hfile = open(sys.argv[1], 'w') ++hfile = open(output_file, 'w') + + hfile.write('#define ANGLE_COMMIT_HASH "%s"\n' % commit_id) + hfile.write('#define ANGLE_COMMIT_HASH_SIZE %d\n' % commit_id_size) +diff --git a/src/common/version.h b/src/common/version.h +index b9781d7..d9148d1 100644 +--- a/src/common/version.h ++++ b/src/common/version.h +@@ -1,4 +1,4 @@ +-#include "commit.h" ++#include "id/commit.h" + + #define ANGLE_MAJOR_VERSION 2 + #define ANGLE_MINOR_VERSION 1 +diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp +index 8525ffb..e3ffa47 100644 +--- a/src/libGLESv2/ProgramBinary.cpp ++++ b/src/libGLESv2/ProgramBinary.cpp +@@ -1018,6 +1018,9 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, FragmentShader *fragmentShade + + bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) + { ++#ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD ++ return false; ++#else + BinaryInputStream stream(binary, length); + + int format = stream.readInt<int>(); +@@ -1260,6 +1263,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) + initializeUniformStorage(); + + return true; ++#endif // #ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD + } + + bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 2c7e7277b814..6a6b299ee511 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation { third_party/WebKit/Source/build/scripts/preprocessor.pm '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl - '' + optionalString (!versionOlder version "34.0.0.0") '' + '' + optionalString (!versionOlder version "37.0.0.0") '' + patch -p1 -d third_party/angle < "${./angle_build_37.patch}" ''; outputs = [ "out" "sandbox" "bundled" "main" ]; diff --git a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch index 8338aa65482d..57f5992a3fa8 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch +++ b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch @@ -1,4 +1,4 @@ -commit c66c07a2ebcd1b68f412a5a2945fef15b3ba567c +commit 0fec7e4a742f001c9816a8b58a1120fb44230867 Author: aszlig <aszlig@redmoonstudios.org> Date: Thu May 16 14:17:56 2013 +0200 @@ -47,7 +47,7 @@ index 9e39fba..00e4c79 100644 #if defined(OS_CHROMEOS) diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc -index fe4da1a..7f118b8 100644 +index 457234f..a99ce9b 100644 --- a/base/process/launch_posix.cc +++ b/base/process/launch_posix.cc @@ -40,6 +40,10 @@ @@ -111,7 +111,7 @@ index fe4da1a..7f118b8 100644 // DANGER: fork() rule: in the child, if you don't end up doing exec*(), // you call _exit() instead of exit(). This is because _exit() does not // call any previously-registered (in the parent) exit handlers, which -@@ -451,6 +480,40 @@ bool LaunchProcess(const std::vector<std::string>& argv, +@@ -452,6 +481,40 @@ bool LaunchProcess(const std::vector<std::string>& argv, _exit(127); } else { // Parent process @@ -153,10 +153,10 @@ index fe4da1a..7f118b8 100644 // While this isn't strictly disk IO, waiting for another process to // finish is the sort of thing ThreadRestrictions is trying to prevent. diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index 94bdc16..3398615 100644 +index 9d63ad9..0885705 100644 --- a/content/browser/zygote_host/zygote_host_impl_linux.cc +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -143,6 +143,9 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { +@@ -144,6 +144,9 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { // A non empty sandbox_cmd means we want a SUID sandbox. using_suid_sandbox_ = !sandbox_cmd.empty(); @@ -166,10 +166,10 @@ index 94bdc16..3398615 100644 // Start up the sandbox host process and get the file descriptor for the // renderers to talk to it. const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -162,11 +165,24 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - dummy_fd.reset(socket(AF_UNIX, SOCK_DGRAM, 0)); - CHECK_GE(dummy_fd.get(), 0); - fds_to_map.push_back(std::make_pair(dummy_fd.get(), kZygoteIdFd)); +@@ -156,11 +159,24 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + sandbox_client->PrependWrapper(&cmd_line); + sandbox_client->SetupLaunchOptions(&options, &fds_to_map, &dummy_fd); + sandbox_client->SetupLaunchEnvironment(); + userns_sandbox = sandbox_client->IsNoSuid(); } @@ -192,7 +192,7 @@ index 94bdc16..3398615 100644 dummy_fd.reset(); diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc -index cc28a6f..e8f665a 100644 +index 11f0602..b7b8214 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -389,6 +389,13 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox) { @@ -210,10 +210,10 @@ index cc28a6f..e8f665a 100644 // Previously, we required that the binary be non-readable. This causes the // kernel to mark the process as non-dumpable at startup. The thinking was diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc -index 3300cb4..4bfa516 100644 +index fc03cdd..a972faa 100644 --- a/sandbox/linux/suid/client/setuid_sandbox_client.cc +++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc -@@ -212,6 +212,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { +@@ -229,6 +229,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { return env_->HasVar(kSandboxNETNSEnvironmentVarName); } @@ -224,7 +224,7 @@ index 3300cb4..4bfa516 100644 bool SetuidSandboxClient::IsSandboxed() const { return sandboxed_; } -@@ -267,8 +271,7 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line, +@@ -277,8 +281,7 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line) { "LinuxSUIDSandboxDevelopment."; } @@ -234,10 +234,10 @@ index 3300cb4..4bfa516 100644 LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " "configured correctly. Rather than run without sandboxing " "I'm aborting now. You need to make sure that " -@@ -284,6 +287,12 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line, - options->allow_new_privs = true; - UnsetExpectedEnvironmentVariables(&options->environ); +@@ -286,6 +289,12 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line) { } + + cmd_line->PrependWrapper(sandbox_binary); + + if (!((st.st_uid == 0) && + (st.st_mode & S_ISUID) && @@ -246,12 +246,12 @@ index 3300cb4..4bfa516 100644 + } } - void SetuidSandboxClient::SetupLaunchEnvironment() { + void SetuidSandboxClient::SetupLaunchOptions( diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h -index 332c63b..4f603f8 100644 +index 2bbad7a..8605475 100644 --- a/sandbox/linux/suid/client/setuid_sandbox_client.h +++ b/sandbox/linux/suid/client/setuid_sandbox_client.h -@@ -70,6 +70,8 @@ class SANDBOX_EXPORT SetuidSandboxClient { +@@ -66,6 +66,8 @@ class SANDBOX_EXPORT SetuidSandboxClient { bool IsInNewPIDNamespace() const; // Did the setuid helper create a new network namespace ? bool IsInNewNETNamespace() const; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index bd5ded3f4c63..965328d43a4a 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "36.0.1964.2"; - sha256 = "0yrp1553pl0310h5pkfh2x27xhfrrxrpc25zad36f3k73iwmbg4c"; - sha256bin32 = "02brz6lj7vfyyapc942dhdw7z26ksvnm7xqryfxn49y1rkd26xrf"; - sha256bin64 = "0ibry2bfjcqnihwb8ykyl48qk25bzfxmw948sm70xnrmwbkv42ny"; + version = "37.0.2054.3"; + sha256 = "1sly1fb9wh10m36crikahn7wgsq7j090jaga4l8zk4kihzprcnj2"; + sha256bin32 = "0242ypzgzskkmsw3iyirxzlm1gbng94lv723ffcr018grq9yg4gs"; + sha256bin64 = "17kzb7k0vn96wa6a4xfx05885li1qjg8bp6y3ngs2i0wws9ypfd9"; }; beta = { - version = "35.0.1916.86"; - sha256 = "0pjgpif8fiq14fk05pxs3js0pcg2jwmw0fklcci11rzq6rcm7r2g"; - sha256bin32 = "1js71l88hqfli6c342iigwddxrqrzlx5fcazfxwlps4bdwgig6f8"; - sha256bin64 = "1sqavz6lh0ryf8jlw8jcfwk265spxs70bhigcgcqsd6647fbdqsr"; + version = "36.0.1985.84"; + sha256 = "02hhqx5m4hxmnf8l3a2ah9k39bpz35sll6gv89vz27vdgb6mza0j"; + sha256bin32 = "1jjxzknyiw6d5p0bcb7c9d0siffg55wmm34lq1phz1jlqq6hz6zy"; + sha256bin64 = "1jr9a386arfmd8rskns9bmlczzr3xzcw9ykv7xf23iz86qqp723r"; }; stable = { - version = "35.0.1916.114"; - sha256 = "1bvpkwjchkzx1qfc93hd8md6sz5sd7pl55xc8b8m3iakbp0csvsn"; - sha256bin32 = "0zm5770cv9dld37xall9lpl9faa0bgjcp8hjx6l1ivfhs6lxbxxa"; - sha256bin64 = "18p302aj2d7xdza9kf438vbz3wqh8db7v2dq5d9b4b3ak6w9ld03"; + version = "35.0.1916.153"; + sha256 = "03p7wmlvbrgd8m94344z4azkhrffwrr5c76dm8c4jcxs0x1yn318"; + sha256bin32 = "0xm34xwdai8ns6bkq5dshh4izls70rwgvya23md4vxq6iv78sykn"; + sha256bin64 = "1x2cm1i8v8d69856b42anms33clv63adzpqy58in6i9vba13swif"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix index de45d4099371..cfa5f1e009b8 100644 --- a/pkgs/applications/networking/browsers/chromium/source/update.nix +++ b/pkgs/applications/networking/browsers/chromium/source/update.nix @@ -99,7 +99,9 @@ in rec { prefetch_sha() { - echo "$(prefetch_main_sha "$@").$(prefetch_deb_sha "$@")"; + main_sha="$(prefetch_main_sha "$@")" || return 1; + deb_sha="$(prefetch_deb_sha "$@")" || return 1; + echo "$main_sha.$deb_sha"; return 0; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index cd96c0a6be88..47381f06d68d 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20140509"; + name = "conkeror-1.0pre-20140616"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "eaf02dccf979d824667d177544103af000ae40bf"; - sha256 = "1896db59d260f34a459402cb0c252b636aab9bf0378ae663a6d039f15af5b350"; + rev = "8a26fff5896a3360549e2adfbf06b1d57e909266"; + sha256 = "56f1c71ca1753a63d7599d3e8bf52277711b2693e7709ed7c146f34940441cb4"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 40b875c8c577..87a548cbb3b7 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas }: stdenv.mkDerivation { - name = "dwb-2014-06-03"; + name = "dwb-2014-06-17"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "d00af56c1e60978060f1b2077f3d49995b98c54f"; - sha256 = "02bs9nbgk8ghaxywhqd8mii4lik748dssn551m00i1305p6q1cjj"; + rev = "9f4bdb9a1f8d5e45071019da4626231dfebd4d8e"; + sha256 = "1nj34w2hhw47jsmswsc1y6a09my8zdd01qxwai8dxdvisld3marm"; }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 378e32c0afb4..438a53b4f8a3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.359"; + version = "11.2.202.378"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "13myq6f999qy1jbgm73gxnadrxdvasi2jiffdyxmwpbwglhhrpka"; + sha256 = "08aw532k8y27s64ffdghz2k4zf0jsz65crvn3i9vxan29064la9c"; } else if stdenv.system == "i686-linux" then if debug then { @@ -58,7 +58,7 @@ let } else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "04wh18jbscp7m3drvsxxhp2vjnhww69vw0pgr23hx81ry0ccvb8m"; + sha256 = "1njy2pnhgr2hjz6kp9vl4cgxxszw2k6gmhjz88hx92aijv7s93wz"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 20a304952a7a..f1ac10639344 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib +{ stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib , libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig -, pulseaudio, usePulseAudio, lib }: +, pulseaudio, lib, ... }: assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "skype-4.2.0.13"; + name = "skype-4.3.0.37"; src = fetchurl { url = "http://download.skype.com/linux/${name}.tar.bz2"; - sha256 = "137kp6c0v4z7n7pp4hwrx4gjgk4knwj815dc6swh44lb5cj1c5m5"; + sha256 = "0bc9kck99rcsqzxzw3j6vnw5byvr8c9wixrx609zp255g0wxr6cc"; }; - buildInputs = - lib.optional usePulseAudio pulseaudio ++ [ - alsaLib + buildInputs = [ stdenv.glibc stdenv.gcc.gcc libXv @@ -27,6 +25,7 @@ stdenv.mkDerivation rec { libXi libXrender libXrandr + pulseaudio freetype fontconfig zlib @@ -44,13 +43,13 @@ stdenv.mkDerivation rec { fullPath=$fullPath''${fullPath:+:}$i/lib done - dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)" + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "$fullPath" $out/libexec/skype/skype cat > $out/bin/skype << EOF #!${stdenv.shell} export PULSE_LATENCY_MSEC=60 # workaround for pulseaudio glitches - export LD_LIBRARY_PATH=$fullPath:$LD_LIBRARY_PATH - $dynlinker $out/libexec/skype/skype --resources=$out/libexec/skype "\$@" + $out/libexec/skype/skype --resources=$out/libexec/skype "\$@" EOF chmod +x $out/bin/skype diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 3a8dab10ff28..85dab3777ba9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,13 +12,14 @@ enableOfficialBranding ? false }: -let version = "17.0.11esr"; in +let version = "17.0.11"; in +let verName = "${version}esr"; in stdenv.mkDerivation { - name = "thunderbird-${version}"; + name = "thunderbird-${verName}"; src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; + url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; sha256 = "1m2lph8x82kgxqzlyaxr1l1x7s4qnqfzfnqck4b777914mrv1mdp"; }; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 3ae4f2a74838..a139531b19a6 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -11,7 +11,16 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2"; - patchPhase = "sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' libretroshare/src/upnp/UPnPBase.cpp"; + patchPhase = '' + sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ + libretroshare/src/upnp/UPnPBase.cpp + # Extensions get installed + sed -i "s,/usr/lib/retroshare/extensions/,$out/share/retroshare," \ + libretroshare/src/rsserver/rsinit.cc + # For bdboot.txt + sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \ + libretroshare/src/rsserver/rsinit.cc + ''; buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig protobuf bzip2 libXScrnSaver curl libxml2 libxslt ]; @@ -24,8 +33,15 @@ stdenv.mkDerivation { postInstall = '' mkdir -p $out/bin - ln -s $out/retroshare-nogui $out/bin - ln -s $out/RetroShare $out/bin + mv $out/retroshare-nogui $out/bin + mv $out/RetroShare $out/bin + + # plugins + mkdir -p $out/share/retroshare + mv $out/lib* $out/share/retroshare + + # BT DHT bootstrap + cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 28603daa9c67..8f169180dd5e 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -2,18 +2,16 @@ stdenv.mkDerivation rec { name = "syncthing-${version}"; - version = "0.8.11"; + version = "0.8.15"; src = fetchgit { url = "git://github.com/calmh/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "16dl9sqwhv0n1602pmi10d5j7z2196ijhvz4rfx7732210qbkpnn"; + sha256 = "0xv8kaji60zqxws72srh5hdi9fyvaipdcsawp6gcyahhr3cz0ddq"; }; buildInputs = [ go ]; - patches = [ ./upnp.patch ]; - buildPhase = '' mkdir -p "./dependencies/src/github.com/calmh/syncthing" diff --git a/pkgs/applications/networking/syncthing/upnp.patch b/pkgs/applications/networking/syncthing/upnp.patch deleted file mode 100644 index f4164b4f6bc3..000000000000 --- a/pkgs/applications/networking/syncthing/upnp.patch +++ /dev/null @@ -1,28 +0,0 @@ -Trying to fix upnp for miniupnpd: -https://github.com/calmh/syncthing/issues/211 - -diff --git a/upnp/upnp.go b/upnp/upnp.go -index 9de719a..9c85b23 100644 ---- a/upnp/upnp.go -+++ b/upnp/upnp.go -@@ -60,14 +60,12 @@ func Discover() (*IGD, error) { - return nil, err - } - -- search := []byte(` --M-SEARCH * HTTP/1.1 --Host: 239.255.255.250:1900 --St: urn:schemas-upnp-org:device:InternetGatewayDevice:1 --Man: "ssdp:discover" --Mx: 3 -- --`) -+ search := []byte("M-SEARCH * HTTP/1.1\r\n" + -+"Host: 239.255.255.250:1900\r\n" + -+"St: urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" + -+"Man: \"ssdp:discover\"\r\n" + -+"Mx: 3\r\n" + -+"\r\n") - - _, err = socket.WriteTo(search, ssdp) - if err != nil { diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 0e5a6afcdc5f..d9b3627507eb 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -27,7 +27,10 @@ stdenv.mkDerivation { libgsf enchant wv libjpeg ]; - meta = { - description = "Word processing program, similar to Microsof Word"; + meta = with stdenv.lib; { + description = "Word processing program, similar to Microsoft Word"; + homepage = http://www.abisource.com/; + license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 5b311956da9e..f0f7d801d8fd 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -3,7 +3,7 @@ assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"); let - version = "4.0.20"; + version = "4.0.21.1"; arch = if stdenv.system == "x86_64-linux" then "linux-x86_64" else "linux-i686"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.zotero.org/standalone/${version}/Zotero-${version}_${arch}.tar.bz2"; sha256 = if stdenv.system == "x86_64-linux" - then "0d7813k3h60fpxabdwiw83g5zfy9knxc9irgxxz60z31vd14zi0x" - else "0nj4mj22bkn2nwbkfs40kg4br6h6gcf718v9lfnvs13cyhx0wapc"; + then "1d6ih9q0daxxqqbr134la5y39648hpd53srf43lljjs8wr71wbn8" + else "121myzwxw3frps77lpzza82glyz9qgwbl5bh3zngfx9vwx3n8q0v"; }; # Strip the bundled xulrunner diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix new file mode 100644 index 000000000000..f5d2d44df425 --- /dev/null +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, smlnj, rsync }: + +stdenv.mkDerivation rec { + name = "twelf-${version}"; + version = "1.7.1"; + + src = fetchurl { + url = "//twelf.plparty.org/releases/twelf-src-1.7.1.tar.gz"; + sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i"; + }; + + buildInputs = [ pkgconfig smlnj rsync ]; + + buildPhase = '' + export SMLNJ_HOME=${smlnj} + make smlnj + ''; + + installPhase = '' + ensureDir $out/bin + rsync -av bin/* $out/bin/ + + ensureDir $out/share/emacs/site-lisp/twelf/ + rsync -av emacs/ $out/share/emacs/site-lisp/twelf/ + + ensureDir $out/share/twelf/examples + rsync -av examples/ $out/share/twelf/examples/ + ensureDir $out/share/twelf/vim + rsync -av vim/ $out/share/twelf/vim/ + ''; + + meta = { + description = "Twelf logic proof assistant"; + longDescription = '' + Twelf is a language used to specify, implement, and prove properties of + deductive systems such as programming languages and logics. Large + research projects using Twelf include the TALT typed assembly language, + a foundational proof-carrying-code system, and a type safety proof for + Standard ML. + ''; + homepage = http://twelf.org/wiki/Main_Page; + license = "MIT"; + maintainers = with stdenv.lib.maintainers; [ jwiegley ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 2ea916052a38..648d59ac01c2 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 96e4631889c7..482866969a11 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -69,7 +69,7 @@ rec { }; tig = import ./tig { - inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45; + inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45 readline; }; hub = import ./hub { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 72f00bbad2ef..8c2ee6a49448 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -11,6 +11,7 @@ , tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers , unixCompat, utf8String, uuid, wai, waiExtra, warp, warpTls, which , xmlTypes, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic +, fsnotify }: cabal.mkDerivation (self: { @@ -21,9 +22,9 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter byteable caseInsensitive - clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus - dlist dns editDistance exceptions extensibleExceptions fdoNotify - feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient + clientsession cryptoApi cryptohash dataDefault dataenc DAV + dlist dns editDistance exceptions extensibleExceptions + feed filepath gnutls hamlet hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse json liftedBase MissingH monadControl mtl network networkConduit networkInfo networkMulticast networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa @@ -31,19 +32,13 @@ cabal.mkDerivation (self: { tastyQuickcheck tastyRerun text time transformers unixCompat utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic - ]; + ] ++ (if (!self.stdenv.isDarwin) then [ + dbus fdoNotify hinotify + ] else [ + fsnotify + ]); buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; - configureFlags = "-fS3 - -fWebDAV - -fInotify - -fDbus - -fAssistant - -fWebapp - -fPairing - -fXMPP - -fDNS - -fProduction - -fTDFA"; + configureFlags = "-fAssistant -fProduction"; preConfigure = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index f95b5a493a65..054b1c1b0f3c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.9.4"; + version = "2.0.1"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1shxa49lsxn81qpfi60wh7rn5ci4zjgljvr0qczdmnqzd8w1zyvb"; + sha256 = "1pylqr2qzndy92x3pq8hkwsb3garww2jxb167s6hshrva81s24mb"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 6f2fe890cfa5..239fa87d32c5 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 }: +{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 +, readline +}: stdenv.mkDerivation rec { name = "tig-2.0.2"; @@ -8,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0gi7iqiij37b0d3izxymxaw5ns2mv1y7qfic0fhl7xj4s2rz075r"; }; - buildInputs = [ ncurses asciidoc xmlto docbook_xsl ]; + buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline ]; preConfigure = '' export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix new file mode 100644 index 000000000000..2dcb13e5db5e --- /dev/null +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, perl, git, fetchgit }: + +stdenv.mkDerivation rec { + name = "gitolite-${version}"; + version = "3.6.1"; + + src = fetchgit { + url = "git://github.com/sitaramc/gitolite"; + rev = "refs/tags/v${version}"; + sha256 = "47e0e9c3137b05af96c091494ba918d61d1d3396749a04d63e7949ebcc6c6dca"; + leaveDotGit = true; + }; + + buildInputs = [ perl git ]; + buildPhase = "true"; + + patchPhase = '' + substituteInPlace ./install --replace " 2>/dev/null" "" + substituteInPlace src/lib/Gitolite/Hooks/PostUpdate.pm \ + --replace /usr/bin/perl "/usr/bin/env perl" + substituteInPlace src/lib/Gitolite/Hooks/Update.pm \ + --replace /usr/bin/perl "/usr/bin/env perl" + ''; + installPhase = '' + mkdir -p $out/bin + git tag v${version} # Gitolite requires a tag for the version information :/ + perl ./install -to $out/bin + ''; + + meta = { + description = "Finely-grained git repository hosting"; + homepage = "http://gitolite.com/gitolite/index.html"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 98ba7a8e137e..ce8bbde2ecd1 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ]; meta = { - description = "Cinelerra - Video Editor"; + description = "Video Editor"; homepage = http://www.cinelerra.org; maintainers = [ stdenv.lib.maintainers.marcweber ]; license = "GPLv2"; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index ebdc7b143c37..17a287f8aae2 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.7.2"; + version = "4.8"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "14zkn5jgm0b7ablvxcxh9gdzq6mjdd6i1kl9dbmifl2a6rg5dr3g"; + sha256 = "0sqvd8yqf9vwqrrvbpbf8k93b3qfa3q9289m82xq15r31wlk8b2h"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 3574f3b7539b..bd1d8b5c1af0 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -217,7 +217,9 @@ clone_user_rev() { fi;; esac - echo "git revision is $(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)" + local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1) + echo "git revision is $full_revision" + echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" # Allow doing additional processing before .git removal eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index eb3b8a105cdb..8417499cd00d 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -373,4 +373,10 @@ rec { http://lib.stat.cmu.edu/ ]; + # Hackage mirrors + hackage = [ + http://hackage.haskell.org/package/ + http://hdiff.luite.com/packages/archive/package/ + ]; + } diff --git a/pkgs/build-support/fetchzip/nix-prefetch-zip b/pkgs/build-support/fetchzip/nix-prefetch-zip new file mode 100755 index 000000000000..76255ab36747 --- /dev/null +++ b/pkgs/build-support/fetchzip/nix-prefetch-zip @@ -0,0 +1,153 @@ +#! /bin/sh -e + +usage(){ + echo >&2 "syntax: nix-prefetch-zip [OPTIONS] [URL [EXPECTED-HASH]] + +Options: + --url url The url of the archive to fetch. + --name name The name to use for the store path (defaults to \`basename \$url\`). + --hash hash The hash of unpacked archive. + --hash-type type Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256. + --leave-root Keep the root directory of the archive. + --help Show this help text. +" + exit 1 +} + + +argi=0 +argfun="" +for arg; do + if test -z "$argfun"; then + case $arg in + --url) argfun=set_url;; + --name) argfun=set_name;; + --hash) argfun=set_expHash;; + --hash-type) argfun=set_hashType;; + --leave-root) leaveRoot=true;; + --help) usage;; + *) argi=$(($argi + 1)) + case $argi in + 1) url=$arg;; + 2) rev=$arg;; + 3) expHash=$arg;; + *) echo "Unexpected argument: $arg" >&2 + usage + ;; + esac + ;; + esac + else + case $argfun in + set_*) + var=$(echo $argfun | sed 's,^set_,,') + eval "$var=\$arg" + ;; + esac + argfun="" + fi +done + +if [ -z "$url" ]; then + echo "Error: No --url flag given" >&2 + usage +fi + +if [ -z "$name" ]; then + name=$(basename "$url") +fi + +if test -z "$hashType"; then + hashType=sha256 +fi + +hashFormat="--base32" + +tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$") +trap "rm -rf '$tmp'" EXIT + +unpackDir=$tmp/unpacked/$name +mkdir -p $unpackDir +downloadedFile=$tmp/$name + +unpackFile() { + local curSrc="$1" + + case "$curSrc" in + *.tar.xz | *.tar.lzma) + # Don't rely on tar knowing about .xz. + xz -d < $curSrc | tar xf - + ;; + *.tar | *.tar.* | *.tgz | *.tbz2) + # GNU tar can automatically select the decompression method + # (info "(tar) gzip"). + tar xf $curSrc + ;; + *.zip) + unzip -qq $curSrc + ;; + *) + echo "source archive $curSrc has unknown type" >&2 + exit 1 + ;; + esac +} + +# If the hash was given, a file with that hash may already be in the +# store. +if test -n "$expHash"; then + finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$name") + if ! nix-store --check-validity "$finalPath" 2> /dev/null; then + finalPath= + fi + hash=$expHash +fi + +# If we don't know the hash or a path with that hash doesn't exist, +# download the file and add it to the store. +if test -z "$finalPath"; then + curl="curl \ + --location --max-redirs 20 \ + --disable-epsv \ + --insecure" + + if ! $curl --fail "$url" --output "$downloadedFile"; then + echo "error: could not download $url" >&2 + exit 1 + fi + + cd $unpackDir + unpackFile "$downloadedFile" + + # FIXME: handle zip files that contain a single regular file. + if [ -z "$leaveRoot" ]; then + shopt -s dotglob + if [ $(ls -d $unpackDir/* | wc -l) != 1 ]; then + echo "error: zip file must contain a single directory." + exit 1 + fi + fn=$(cd "$unpackDir" && echo *) + mv $unpackDir/$fn/* "$unpackDir/" + rmdir "$unpackDir/$fn" + fi + + # Compute the hash. + hash=$(nix-hash --type $hashType $hashFormat $unpackDir) + if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi + + # Add the downloaded file to the Nix store. + finalPath=$(nix-store --add-fixed --recursive "$hashType" $unpackDir) + + if test -n "$expHash" -a "$expHash" != "$hash"; then + echo "hash mismatch for URL \`$url'" + exit 1 + fi +fi + +if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi + +echo $hash + +if test -n "$PRINT_PATH"; then + echo $finalPath +fi diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index a9c60a2afbd0..e66b348d082a 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -5,7 +5,6 @@ with lib; let cfg = { stable = grsecOptions.stable or false; - vserver = grsecOptions.vserver or false; testing = grsecOptions.testing or false; config = { mode = "auto"; @@ -29,12 +28,11 @@ let }; test-patch = with pkgs.kernelPatches; grsecurity_unstable; - stable-patch = with pkgs.kernelPatches; - if cfg.vserver then grsecurity_vserver else grsecurity_stable; + stable-patch = with pkgs.kernelPatches; grsecurity_stable; - grKernel = if (cfg.stable || cfg.vserver) - then mkKernel pkgs.linux_3_2 stable-patch - else mkKernel pkgs.linux_3_14 test-patch; + grKernel = if cfg.stable + then mkKernel pkgs.linux_3_14 stable-patch + else mkKernel pkgs.linux_3_15 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/build-support/grsecurity/flavors.nix b/pkgs/build-support/grsecurity/flavors.nix index 57d52e7cf943..969ca579f5a6 100644 --- a/pkgs/build-support/grsecurity/flavors.nix +++ b/pkgs/build-support/grsecurity/flavors.nix @@ -16,12 +16,6 @@ in linux_grsec_stable_server_xen = mkOpts "stable" "security" "server" "guest" "xen" true; - # Stable+vserver kernels - server versions only - linux_grsec_vserver_server = - mkOpts "vserver" "security" "server" "host" "kvm" true; - linux_grsec_vserver_server_xen = - mkOpts "vserver" "security" "server" "guest" "xen" true; - # Testing kernels linux_grsec_testing_desktop = mkOpts "testing" "performance" "desktop" "host" "kvm" true; @@ -29,4 +23,4 @@ in mkOpts "testing" "security" "server" "host" "kvm" true; linux_grsec_testing_server_xen = mkOpts "testing" "security" "server" "guest" "xen" true; -} \ No newline at end of file +} diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix new file mode 100644 index 000000000000..a56efa35c7c8 --- /dev/null +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchgit}: + +stdenv.mkDerivation rec { + name = "aurulent-sans-0.1"; + src = fetchgit { + url = "https://github.com/deepfire/hartke-aurulent-sans.git"; + rev = "refs/tags/${name}"; + sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk"; + }; + buildPhase = "true"; + installPhase = " + fontDir=$out/share/fonts/opentype + mkdir -p $fontDir + cp *.otf $fontDir + "; + meta = { + description = "Aurulent Sans"; + longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; + homepage = http://delubrum.org/; + license = "SIL"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 2535398380b6..edcd868b2f31 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurlGnome, pkgconfig, glib, popt, zlib, libcanberra -, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool}: +, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg +}: stdenv.mkDerivation rec { name = src.pkgname; @@ -14,5 +15,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; - propagatedBuildInputs = [ glib libbonobo ]; + propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix index 3df5ab40eaf8..5e53a7e86cbb 100644 --- a/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11 +{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountsservice, libX11 , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl"; }; - buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice + buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix index 1222f03d66e3..4e472514348c 100644 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig +, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, krb5, networkmanagerapplet, networkmanager @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile + accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns networkmanager modemmanager makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix index 554b09a1e592..d468e06d429f 100644 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix @@ -2,7 +2,7 @@ , python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice + [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-shell" \ --prefix PATH : "${unzip}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \ + --prefix LD_LIBRARY_PATH : "${accountsservice}/lib:${ibus}/lib:${gdm}/lib" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:${gtk}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix index e5f6a0aa9b8b..1875c1491f96 100644 --- a/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 glib ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix index 070f39199d79..4e9acc822e74 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11 +{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountsservice, libX11 , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, dconf }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4"; }; - buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice dconf + buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice dconf gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index eb2324c9c0f2..0aed2e7a410a 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig +, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, krb5, networkmanagerapplet, networkmanager @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile + accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix index 49154aa92218..49514b3dbe44 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix @@ -2,7 +2,7 @@ , python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice + [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-shell" \ --prefix PATH : "${unzip}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \ + --prefix LD_LIBRARY_PATH : "${accountsservice}/lib:${ibus}/lib:${gdm}/lib" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/development/compilers/agda/stdlib-2.4.0.nix b/pkgs/development/compilers/agda/stdlib-0.8.nix index faa55d379b1d..9a78744ca299 100644 --- a/pkgs/development/compilers/agda/stdlib-2.4.0.nix +++ b/pkgs/development/compilers/agda/stdlib-0.8.nix @@ -1,16 +1,15 @@ { cabal, fetchurl, filemanip, Agda }: -cabal.mkDerivation (self: { - pname = "Agda-lib-ffi"; - version = "2.4.0"; +cabal.mkDerivation (self: rec { + pname = "Agda-stdlib"; + version = "0.8"; src = fetchurl { - url = "https://github.com/agda/agda-stdlib/archive/v2.4.0.tar.gz"; - sha256 = "1rz0jrkm1b8d8aj9hbj3yl2k219c57r0cizfx98qqf1b9mwixzbf"; + url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz"; + sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78"; }; buildDepends = [ filemanip Agda ]; - jailbreak = true; # otherwise, it complains about base preConfigure = "cd ffi"; @@ -18,7 +17,7 @@ cabal.mkDerivation (self: { mkdir -p $out/share cd .. runhaskell GenerateEverything - ${Agda}/bin/agda -i . -i src Everything.agda + agda -i . -i src Everything.agda cp -pR src $out/share/agda ''; diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 5ea470bfc870..29e95863921c 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -63,8 +63,13 @@ stdenv.mkDerivation { builder = ./builder.sh; meta = { + description = "Functional programming language based on Standard ML"; + longDescription = '' + Alice ML is a functional programming language based on Standard ML, + extended with rich support for concurrent, distributed, and constraint + programming. + ''; homepage = http://www.ps.uni-saarland.de/alice/; - description = "Alice ML is a functional programming language based on Standard ML, extended with rich support for concurrent, distributed, and constraint programming."; license = "BSD"; }; } diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 1a4e33775017..ff9f5d3f7c2e 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "4.9.0"; + version = "4.9.0.1"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz"; - sha256 = "08jaavr3lhs0z2q9k7b7w8l3fsxpms58zxg8nyk8674p54cbwaig"; + sha256 = "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4"; }; buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix index 99f0828012fa..99f0828012fa 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/5.5.nix diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix new file mode 100644 index 000000000000..573cc8262216 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib +, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib +} : + +stdenv.mkDerivation rec { + name = "cudatoolkit-6.0.37"; + + dontPatchELF = true; + dontStrip = true; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run; + sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40"; + } + else throw "cudatoolkit does not support platform ${stdenv.system}"; + + outputs = [ "out" "sdk" ]; + + buildInputs = [ perl ]; + + runtimeDependencies = [ + ncurses expat python zlib + xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext + gtk2 glib fontconfig freetype unixODBC alsaLib + ]; + + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; + + unpackPhase = '' + sh $src --keep --noexec + cd pkg/run_files + sh cuda-linux64-rel-6.0.37-18176142.run --keep --noexec + sh cuda-samples-linux-6.0.37-18176142.run --keep --noexec + cd pkg + ''; + + buildPhase = '' + find . -type f -executable -exec patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + '{}' \; || true + find . -type f -exec patchelf \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --force-rpath \ + '{}' \; || true + ''; + + installPhase = '' + mkdir $out $sdk + perl ./install-linux.pl --prefix="$out" + rm $out/tools/CUDA_Occupancy_Calculator.xls + perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + ''; + + meta = { + license = [ "nonfree" ]; + }; +} + diff --git a/pkgs/development/compilers/gcc/4.2-apple64/default.nix b/pkgs/development/compilers/gcc/4.2-apple64/default.nix index 011086164adf..229f68fd8411 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/default.nix +++ b/pkgs/development/compilers/gcc/4.2-apple64/default.nix @@ -12,7 +12,7 @@ let revision = "5666.3"; # Apple's fork revision number. in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "gcc-apple-${version}.${revision}"; builder = ./builder.sh; @@ -33,8 +33,10 @@ stdenv.mkDerivation { sourceRoot = "gcc-${revision}/"; + # The floor_log2_patch is from a Gentoo fix for the same issue: + # https://bugs.gentoo.org/attachment.cgi?id=363174&action=diff patches = - [ ./pass-cxxcpp.patch ] + [ ./pass-cxxcpp.patch ./floor_log2_patch.diff ] ++ stdenv.lib.optional noSysDirs ./no-sys-dirs.patch ++ stdenv.lib.optional langCC ./fix-libstdc++-link.patch; diff --git a/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch b/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch index e7b8a55a29af..5a417f8151b5 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch +++ b/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch @@ -3,6 +3,9 @@ Prevent our libstdc++.dylib from having a runtime dependency on passed by g++ when it links libstdc++.dylib. Adding "-nostdlib" to the g++ invocation prevents this. +jww (2014-06-21): I've added several more patches to this, for building on +Mavericks. + diff -ru -x '*~' libstdcxx-39-orig/libstdcxx/libstdc++-v3/src/Makefile.in libstdcxx-39/libstdcxx/libstdc++-v3/src/Makefile.in --- x/libstdcxx/libstdc++-v3/src/Makefile.in 2006-10-16 21:08:22.000000000 +0200 +++ y/libstdcxx/libstdc++-v3/src/Makefile.in 2012-02-17 18:44:05.210570590 +0100 @@ -15,3 +18,54 @@ diff -ru -x '*~' libstdcxx-39-orig/libstdcxx/libstdc++-v3/src/Makefile.in libstd # Use special rules for the deprecated source files so that they find +--- x/libstdcxx/libstdc++-v3/libsupc++/unwind-cxx.h ++++ y/libstdcxx/libstdc++-v3/libsupc++/unwind-cxx.h +@@ -38,7 +38,7 @@ + #include <typeinfo> + #include <exception> + #include <cstddef> +-#include "unwind.h" ++#include "unwind-generic.h" + + #pragma GCC visibility push(default) + +@@ -133,7 +133,7 @@ extern "C" void __cxa_bad_typeid (); + // throws, and if bad_exception needs to be thrown. Called from the + // compiler. + extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn)); +-extern "C" void __cxa_call_terminate (void*) __attribute__((noreturn)); ++extern "C" void __cxa_call_terminate(_Unwind_Exception* ue_header); + + #ifdef __ARM_EABI_UNWINDER__ + // Arm EABI specified routines. +--- x/libstdcxx/libstdc++-v3/include/ext/bitmap_allocator.h ++++ y/libstdcxx/libstdc++-v3/include/ext/bitmap_allocator.h +@@ -549,6 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + */ + class free_list + { ++ public: + typedef size_t* value_type; + typedef __detail::__mini_vector<value_type> vector_type; + typedef vector_type::iterator iterator; +--- x/libstdcxx/libstdc++-v3/include/ext/ropeimpl.h ++++ y/libstdcxx/libstdc++-v3/include/ext/ropeimpl.h +@@ -433,7 +433,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + { + size_t __old_len = __r->_M_size; + _CharT* __new_data = (_CharT*) +- _Data_allocate(_S_rounded_up_size(__old_len + __len)); ++ _Base::_Data_allocate(_S_rounded_up_size(__old_len + __len)); + _RopeLeaf* __result; + + uninitialized_copy_n(__r->_M_data, __old_len, __new_data); +@@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + if (__result_len > __lazy_threshold) + goto lazy; + __section = (_CharT*) +- _Data_allocate(_S_rounded_up_size(__result_len)); ++ _Base::_Data_allocate(_S_rounded_up_size(__result_len)); + try + { (*(__f->_M_fn))(__start, __result_len, __section); } + catch(...) + diff --git a/pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff b/pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff new file mode 100644 index 000000000000..f37e6c4990e2 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff @@ -0,0 +1,62 @@ +--- gcc-5666.3/gcc/toplev.h ++++ gcc-5666.3/gcc/toplev.h +@@ -151,6 +151,8 @@ + /* Return true iff flags are set as if -ffast-math. */ + extern bool fast_math_flags_set_p (void); + ++#if GCC_VERSION < 3004 ++ + /* Return log2, or -1 if not exact. */ + extern int exact_log2 (unsigned HOST_WIDE_INT); + +@@ -158,7 +160,7 @@ + extern int floor_log2 (unsigned HOST_WIDE_INT); + + /* Inline versions of the above for speed. */ +-#if GCC_VERSION >= 3004 ++#else /* GCC_VERSION < 3004 */ + # if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG + # define CLZ_HWI __builtin_clzl + # define CTZ_HWI __builtin_ctzl +@@ -172,18 +172,18 @@ + # define CTZ_HWI __builtin_ctz + # endif + +-extern inline int ++static inline int + floor_log2 (unsigned HOST_WIDE_INT x) + { + return x ? HOST_BITS_PER_WIDE_INT - 1 - (int) CLZ_HWI (x) : -1; + } + +-extern inline int ++static inline int + exact_log2 (unsigned HOST_WIDE_INT x) + { + return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1; + } +-#endif /* GCC_VERSION >= 3004 */ ++#endif /* GCC_VERSION < 3004 */ + + /* Functions used to get and set GCC's notion of in what directory + compilation was started. */ +--- gcc-5666.3/gcc/toplev.c ++++ gcc-5666.3/gcc/toplev.c +@@ -555,7 +555,7 @@ + for floor_log2 and exact_log2; see toplev.h. That construct, however, + conflicts with the ISO C++ One Definition Rule. */ + +-#if GCC_VERSION < 3004 || !defined (__cplusplus) ++#if GCC_VERSION < 3004 + + /* Given X, an unsigned number, return the largest int Y such that 2**Y <= X. + If X is 0, return -1. */ +@@ -607,7 +607,7 @@ + #endif + } + +-#endif /* GCC_VERSION < 3004 || !defined (__cplusplus) */ ++#endif /* GCC_VERSION < 3004 */ + + /* Handler for fatal signals, such as SIGSEGV. These are transformed + into ICE messages, which is much more user friendly. In case the diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix new file mode 100644 index 000000000000..b9178d5e61c1 --- /dev/null +++ b/pkgs/development/compilers/go/1.3.nix @@ -0,0 +1,94 @@ +{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: + +let + loader386 = "${glibc}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc}/lib/ld-linux.so.3"; +in + +stdenv.mkDerivation { + name = "go-1.3"; + + src = fetchurl { + url = https://storage.googleapis.com/golang/go1.3.src.tar.gz; + sha256 = "10jkqgzlinzynciw3wr15c7n2vw5q4d2ni65hbs3i61bbdn3x67b"; + }; + + buildInputs = [ bison bash makeWrapper ] ++ lib.optionals stdenv.isLinux [ glibc ] ; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + # Ensure that the source directory is named go + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + patchShebangs ./ # replace /bin/bash + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go + '' + lib.optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + ''; + + patches = [ ./cacert-1.2.patch ]; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + + installPhase = '' + export CC=cc + + # http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html + # Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work" + # during tests: + export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so))" + + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ cstrahan ]; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/gox.nix b/pkgs/development/compilers/go/gox.nix new file mode 100644 index 000000000000..705cb6e5c28f --- /dev/null +++ b/pkgs/development/compilers/go/gox.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, go, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/mitchellh/gox"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "gox"; + rev = "c7329055e2aeb253a947e5cc876586ff4ca19199"; + sha256 = "0zhb88jjxqn3sdc4bpzvajqvgi9igp5gk03q12gaksaxhy2wl4jy"; + }; + } + { + root = "github.com/mitchellh/iochan"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } + ]; + sources = stdenv.mkDerivation rec { + name = "go-deps"; + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); + }; +in + +stdenv.mkDerivation rec { + name = "gox"; + + src = sources; + + propagatedBuildInputs = [ go ]; + + installPhase = '' + ensureDir $out/bin + export GOPATH=$src + go build -v -o $out/bin/gox github.com/mitchellh/gox + ''; + + meta = with lib; { + description = "A simple, no-frills tool for Go cross compilation that behaves a lot like standard go build"; + homepage = https://github.com/mitchellh/gox; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix new file mode 100644 index 000000000000..c3335ea6d22b --- /dev/null +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "sbcl-bootstrap-${version}"; + version = "1.1.8"; + + src = if stdenv.isDarwin + then fetchurl { + url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-darwin-binary.tar.bz2; + sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j"; + } + else fetchurl { + url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-linux-binary.tar.bz2; + sha256 = "0lh1jglxlfwk4cm6sgwk1jnb6ikhbrkx7p5aha2nbmkd6zl96prx"; + }; + + installPhase = '' + ensureDir $out/bin + cp -p src/runtime/sbcl $out/bin + ensureDir $out/share/sbcl + cp -p output/sbcl.core $out/share/sbcl + ''; + + meta = { + description = "Lisp compiler"; + homepage = "http://www.sbcl.org"; + license = "bsd"; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index e1de4c53de50..579d5ec11eb9 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,36 +1,18 @@ -a : -let - fetchurl = a.fetchurl; - s= # Generated upstream information - rec { - baseName="sbcl"; - version="1.2.0"; - name="${baseName}-${version}"; - hash="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; - url="mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2"; - sha256="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; - }; - buildInputs = with a; [ - clisp makeWrapper - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl, sbclBootstrap, clisp}: - inherit buildInputs; - configureFlags = []; +stdenv.mkDerivation rec { + name = "sbcl-${version}"; + version = "1.2.0"; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doFixNewer" "doFixTests" "setVersion" "doPatch" "doBuild" "doInstall" "doWrap"]; + src = fetchurl { + url = mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2; + sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; + }; - setVars = a.fullDepEntry ('' - export INSTALL_ROOT=$out - mkdir test-home - export HOME=$PWD/test-home - '') ["minInit"]; + buildInputs = [ sbclBootstrap ] ++ stdenv.lib.optional stdenv.isLinux clisp; - setVersion = a.fullDepEntry ('' - echo '"${s.version}.nixos"' > version.lisp-expr + patchPhase = '' + echo '"${version}.nixos"' > version.lisp-expr echo " (lambda (features) (flet ((enable (x) @@ -38,14 +20,11 @@ rec { (disable (x) (setf features (remove x features)))) (enable :sb-thread))) " > customize-target-features.lisp - '') ["minInit" "doUnpack"]; - /* SBCL checks whether files are up-to-date in many places.. Unfortunately, same timestamp - is not good enought - */ - doFixNewer = a.fullDepEntry('' pwd + # SBCL checks whether files are up-to-date in many places.. + # Unfortunately, same timestamp is not good enough sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp sed -i src/cold/slam.lisp -e \ @@ -56,13 +35,8 @@ rec { '/date defaulted-fasl/a)' sed -i src/code/target-load.lisp -e \ '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - '') ["minInit" "doUnpack"]; - doWrap = a.fullDepEntry ('' - wrapProgram "$out/bin/sbcl" --set "SBCL_HOME" "$out/lib/sbcl" - '') ["minInit" "addInputs"]; - - doFixTests = a.fullDepEntry ('' + # Fix the tests sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp @@ -70,24 +44,31 @@ rec { sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - '') ["minInit" "doUnpack"]; + ''; + + preBuild = '' + export INSTALL_ROOT=$out + ensureDir test-home + export HOME=$PWD/test-home + ''; - doBuild = a.fullDepEntry ('' - sh make.sh clisp - '') ["minInit" "doUnpack" "addInputs"]; + buildPhase = if stdenv.isLinux + then '' + sh make.sh clisp --prefix=$out + '' + else '' + sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --core ${sbclBootstrap}/share/sbcl/sbcl.core --disable-debugger --no-userinit --no-sysinit' + ''; - doInstall = a.fullDepEntry ('' - sh install.sh - '') ["doBuild" "minInit" "addInputs"]; + installPhase = '' + INSTALL_ROOT=$out sh install.sh + ''; - inherit(s) name; - inherit(s) version; meta = { description = "Lisp compiler"; - homepage = "http://www.sbcl.org"; - license = "bsd"; - maintainers = [a.lib.maintainers.raskin]; - platforms = with a.lib.platforms; all; - inherit(s) version; + homepage = http://www.sbcl.org; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix new file mode 100644 index 000000000000..27fdf75cc25d --- /dev/null +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, cpio, rsync, makeWrapper }: + +stdenv.mkDerivation rec { + name = "smlnj-bootstrap-${version}"; + + version = "110.76"; + + src = fetchurl { + url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg"; + sha256 = "0n3kdlqffqw97piya7i4lddrhjml2dp1q9hfq2jrd2hbzln8vdjf"; + }; + + buildInputs = [ cpio rsync makeWrapper ]; + + unpackPhase = '' + /usr/bin/xar -xf $src + cd smlnj.pkg + ''; + + buildPhase = '' + cat Payload | gunzip -dc | cpio -i + ''; + + installPhase = '' + ensureDir $out/bin + rsync -av bin/ $out/bin/ + + ensureDir $out/lib + rsync -av lib/ $out/lib/ + ''; + + postInstall = '' + wrapProgram "$out/bin/sml" --set "SMLNJ_HOME" "$out" + ''; + + meta = { + description = "Compiler for the Standard ML '97 programming language"; + homepage = http://www.smlnj.org; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.darwin; + maintainers = [ stdenv.lib.maintainers.jwiegley ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch new file mode 100644 index 000000000000..231853fe51a6 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch @@ -0,0 +1,11 @@ +--- a/hints/darwin.sh 2013-05-08 11:13:45.000000000 -0600 ++++ b/hints/darwin.sh 2013-05-08 11:15:04.000000000 -0600 +@@ -129,7 +129,7 @@ + + # Avoid Apple's cpp precompiler, better for extensions + if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then +- cppflags="${cppflags} -no-cpp-precomp" ++ #cppflags="${cppflags} -no-cpp-precomp" + + # This is necessary because perl's build system doesn't + # apply cppflags to cc compile lines as it should. diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix new file mode 100644 index 000000000000..d9fb32aa43ea --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl }: + +let + + libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr"; + +in + +with { + inherit (stdenv.lib) optional optionalString; +}; + +stdenv.mkDerivation rec { + name = "perl-5.20.0"; + + src = fetchurl { + url = "mirror://cpan/src/${name}.tar.gz"; + sha256 = "00ndpgw4bjing9gy2y6jvs3q46mv2ll6zrxjkhpr12fcdsnji32f"; + }; + + patches = + [ # Do not look in /usr etc. for dependencies. + ./no-sys-dirs.patch + ] + ++ optional stdenv.isSunOS ./ld-shared.patch + ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; + + # Build a thread-safe Perl with a dynamic libperls.o. We need the + # "installstyle" option to ensure that modules are put under + # $out/lib/perl5 - this is the general default, but because $out + # contains the string "perl", Configure would select $out/lib. + # Miniperl needs -lm. perl needs -lrt. + configureFlags = + [ "-de" + "-Dcc=gcc" + "-Uinstallusrbinperl" + "-Dinstallstyle=lib/perl5" + "-Duseshrplib" + "-Dlocincpth=${libc}/include" + "-Dloclibpth=${libc}/lib" + ] + ++ optional (stdenv ? glibc) "-Dusethreads"; + + configureScript = "${stdenv.shell} ./Configure"; + + dontAddPrefix = true; + + enableParallelBuilding = true; + + preConfigure = + '' + configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" + + ${optionalString stdenv.isArm '' + configureFlagsArray=(-Dldflags="-lm -lrt") + ''} + ''; + + preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) + '' + # Make Cwd work on NixOS (where we don't have a /bin/pwd). + substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" + ''; + + setupHook = ./setup-hook.sh; + + passthru.libPrefix = "lib/perl5/site_perl"; +} diff --git a/pkgs/development/interpreters/perl/5.20/ld-shared.patch b/pkgs/development/interpreters/perl/5.20/ld-shared.patch new file mode 100644 index 000000000000..be45230c8a73 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/ld-shared.patch @@ -0,0 +1,11 @@ +--- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 ++++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 +@@ -568,7 +568,7 @@ + # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" + # fi + ldflags="$ldflags -m64" +- lddlflags="$lddlflags -G -m64" ++ lddlflags="$lddlflags -shared -m64" + ;; + *) + getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/perl/5.20/no-libutil.patch b/pkgs/development/interpreters/perl/5.20/no-libutil.patch new file mode 100644 index 000000000000..68d44612bfe6 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/no-libutil.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure +--- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 ++++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100 +@@ -1368,7 +1368,7 @@ + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. + libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun" +-libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" ++libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. + glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` diff --git a/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch new file mode 100644 index 000000000000..1793273a76f9 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch @@ -0,0 +1,250 @@ +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure +--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 ++++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 +@@ -106,15 +106,7 @@ + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1337,8 +1329,7 @@ + archname='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1349,17 +1340,12 @@ + + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1391,8 +1377,6 @@ + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2446,7 +2430,6 @@ + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth $sysroot/lib $sysroot/usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -4936,7 +4919,7 @@ + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8600,13 +8583,8 @@ + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -19900,9 +19878,10 @@ + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +Only in perl-5.20.0/: Configure.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL +--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 +@@ -126,11 +126,7 @@ + if ($dep =~ /(\S+errno\.h)/) { + $file{$1} = 1; + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i +- # might be using, say, Intel's icc +- ) { ++ } elsif (0) { + # When cross-compiling we may store a path for gcc's "sysroot" option: + my $sysroot = $Config{sysroot} || ''; + # Some Linuxes have weird errno.hs which generate +Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh +--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 ++++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 +@@ -119,21 +119,21 @@ + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh +--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 +@@ -150,25 +150,6 @@ + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Unbuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-else +- gcc=gcc +-fi +- + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` +@@ -178,32 +159,6 @@ + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac +- + # Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com> + # for this test. + cat >try.c <<'EOM' +@@ -367,33 +322,6 @@ + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac +- + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then + # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/perl/5.20/setup-hook.sh b/pkgs/development/interpreters/perl/5.20/setup-hook.sh new file mode 100644 index 000000000000..6a144a7f7804 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/setup-hook.sh @@ -0,0 +1,5 @@ +addPerlLibPath () { + addToSearchPath PERL5LIB $1/lib/perl5/site_perl +} + +envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 95120a4d9a20..867821170974 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -228,7 +228,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) '' ); src = fetchurl { - url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"; + url = "http://www.php.net/distributions/php-${version}.tar.bz2"; sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 5aabb61586e6..c194c3aa8a07 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash }: +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds }: let libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.27"; + version = "5.4.30"; name = "php-${version}"; @@ -171,6 +171,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-fpm"]; }; + mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) { + configureFlags = ["--with-mssql=${freetds}"]; + buildInputs = [freetds]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -213,6 +218,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) zipSupport = config.php.zip or true; ftpSupport = config.php.ftp or true; fpmSupport = config.php.fpm or true; + mssqlSupport = config.php.mssql or (!stdenv.isDarwin); }; configurePhase = '' @@ -236,12 +242,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ''; src = fetchurl { - urls = [ - "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror" - "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" - ]; - md5 = "1c6e99187d25023411b663ea09f145ee"; - name = "php-${version}.tar.bz2"; + url = "http://www.php.net/distributions/php-${version}.tar.bz2"; + sha256 = "1rkc977b4k0y6qg5nf8729g5zpica31h1isyds6khmrdwi23df1j"; }; meta = { diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index d67f1c2a8215..d67f1c2a8215 100644 --- a/pkgs/development/interpreters/pypy/2.2/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix diff --git a/pkgs/development/interpreters/pypy/2.2/setup-hook.sh b/pkgs/development/interpreters/pypy/2.3/setup-hook.sh index 35f4915569e6..67c71bf00811 100644 --- a/pkgs/development/interpreters/pypy/2.2/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.3/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.2/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.3/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.2/site-packages" + p="$i/lib/pypy2.3/site-packages" result="${result}${result:+:}$p" done echo $result diff --git a/pkgs/development/libraries/accountservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 0ff5466e5c4f..6609da5ac822 100644 --- a/pkgs/development/libraries/accountservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -24,4 +24,7 @@ stdenv.mkDerivation rec { --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons" ''; + meta = { + description = "D-Bus interface for user account query and manipulation"; + }; } diff --git a/pkgs/development/libraries/accountservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch index a0c7ca23598f..a0c7ca23598f 100644 --- a/pkgs/development/libraries/accountservice/no-create-dirs.patch +++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch diff --git a/pkgs/development/libraries/axis/default.nix b/pkgs/development/libraries/axis/default.nix index f2c466009d45..62ae463b5fc8 100644 --- a/pkgs/development/libraries/axis/default.nix +++ b/pkgs/development/libraries/axis/default.nix @@ -1,12 +1,16 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "axis-1.3"; - directory = "axis-1_3"; - builder = ./builder.sh; - src = fetchurl { - url = "http://apache.cs.uu.nl/dist/ws/axis/1_3/axis-bin-1_3.tar.gz"; - md5 = "dd8203f08c37872f4fd2bfb45c4bfe04"; - }; - inherit stdenv; + name = "axis-1.3"; + directory = "axis-1_3"; + builder = ./builder.sh; + src = fetchurl { + url = "http://archive.apache.org/dist/ws/axis/1_3/axis-bin-1_3.tar.gz"; + md5 = "dd8203f08c37872f4fd2bfb45c4bfe04"; + }; + inherit stdenv; + + meta = { + description = "Implementation of the SOAP (Simple Object Access Protocol) submission to W3C"; + }; } diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index fb3a7d92c8e5..4095c1ae2f4b 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,12 +1,19 @@ -{stdenv, fetchurl, python}: +{ stdenv, fetchurl, python }: stdenv.mkDerivation { name = "clearsilver-0.10.3"; + src = fetchurl { url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz; md5 = "ff4104b0e58bca1b61d528edbd902769"; }; + builder = ./builder.sh; inherit stdenv python; + + meta = { + description = "Fast, powerful, and language-neutral HTML template system"; + homepage = http://www.clearsilver.net/; + }; } diff --git a/pkgs/development/libraries/coredumper/default.nix b/pkgs/development/libraries/coredumper/default.nix index f62289ea1818..ddd0d87a5511 100644 --- a/pkgs/development/libraries/coredumper/default.nix +++ b/pkgs/development/libraries/coredumper/default.nix @@ -6,4 +6,13 @@ stdenv.mkDerivation { url = http://google-coredumper.googlecode.com/files/coredumper-1.1.tar.gz; sha256 = "1phl1zg2n17rp595dyzz9iw01gfdpsdh0l6wy2hfb5shi71h63rx"; }; + + # Doesn't build: + # + # src/elfcore.c: In function 'CreatePipeline': + # src/elfcore.c:1424:26: error: 'CLONE_VM' undeclared (first use in this function) + # CLONE_VM|CLONE_UNTRACED|SIGCHLD, &args, 0, 0, 0); + # ^ + # src/elfcore.c:1424:26: note: each undeclared identifier is reported only once for each function it appears in + meta.broken = true; } diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 0d8fa1bd281c..547e9e813be1 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation { sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; }; + doDist = true; + + distPhase = '' + touch $out/include/tds.h + touch $out/lib/libtds.a + ''; + meta = { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index eee977e97037..9631746691f8 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.15"; + name = "gsl-1.16"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5"; + sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; # ToDo: there might be more impurities than FMA support check @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; + homepage = http://www.gnu.org/software/gsl/; + license = "GPLv3+"; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C @@ -27,10 +29,5 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - - homepage = http://www.gnu.org/software/gsl/; - license = "GPLv3+"; - - maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/haskell/BoundedChan/default.nix b/pkgs/development/libraries/haskell/BoundedChan/default.nix index 0ce294c2258c..0d049c848500 100644 --- a/pkgs/development/libraries/haskell/BoundedChan/default.nix +++ b/pkgs/development/libraries/haskell/BoundedChan/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "BoundedChan"; - version = "1.0.1.0"; - sha256 = "1v4lmp3j8lzk1m2pv5l90j80y0c6yxm6gb1ww9ffsz2jxfzz8vd8"; + version = "1.0.3.0"; + sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k"; meta = { description = "Implementation of bounded channels"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index dfaa69bca93f..4ae0212d6ef5 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.3.1.0"; sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq"; buildDepends = [ extensibleExceptions MonadCatchIOTransformers ]; + jailbreak = true; meta = { homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"; description = "Monad-transformer version of the Control.Exception module"; diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index b6402f63abb5..a37d4bc673b1 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; - version = "0.3.1.0"; - sha256 = "1r5syyalk8a81byhk39yp0j7vdrvlrpppbg52dql1fx6kfhysaxn"; + version = "0.3.1.1"; + sha256 = "1kfq9py053zic69f25gcsm802dhk7y5k01ipsf2jvl8d4r5iw5kk"; buildDepends = [ extensibleExceptions monadsTf transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index d2bc69295421..9b51a3167f75 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SHA"; - version = "1.6.4"; - sha256 = "13d7sg8r0qqs425banrwd15hahy8gnl4k81q0wfqld77xpb2vvbj"; + version = "1.6.4.1"; + sha256 = "03fwpl8hrl9q197w8v1glqi5g1d51c7hz4m8zi5s8x1yvpbwcfvl"; isLibrary = true; isExecutable = true; buildDepends = [ binary ]; diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 8256ff54e191..d151128213e6 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "amqp"; - version = "0.8.3"; - sha256 = "0gl5vdhbic8llhbqmhnwj0wvykhbrci6zz53v5cayqfcwi1v1dw2"; + version = "0.9"; + sha256 = "10yacflzvf7y21yi6frs88gdbhf5g4j99ag8mwv6jrwfzwqszs5j"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch b/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch deleted file mode 100644 index 6a888aa32778..000000000000 --- a/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c401c2c585b5345243211e981c123a92b995b448 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Sat, 25 Jan 2014 13:35:52 +0300 -Subject: [PATCH] authenticate-oauth.cabal: allow RSA-2 - -The only cosmetic change is rename of 'ha_SHA1' to 'hashSHA1' - -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - authenticate-oauth/Web/Authenticate/OAuth.hs | 10 ++++++++-- - authenticate-oauth/authenticate-oauth.cabal | 2 +- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/authenticate-oauth/Web/Authenticate/OAuth.hs b/authenticate-oauth/Web/Authenticate/OAuth.hs -index 3f38c8c..eccd0f1 100644 ---- a/authenticate-oauth/Web/Authenticate/OAuth.hs -+++ b/authenticate-oauth/Web/Authenticate/OAuth.hs -@@ -21,7 +21,7 @@ module Web.Authenticate.OAuth - paramEncode, addScope, addMaybeProxy - ) where - import Blaze.ByteString.Builder (toByteString, Builder) --import Codec.Crypto.RSA (ha_SHA1, rsassa_pkcs1_v1_5_sign) -+import qualified Codec.Crypto.RSA as RSA - import Control.Exception - import Control.Monad - import Control.Monad.IO.Class (MonadIO, liftIO) -@@ -346,7 +346,13 @@ genSign oa tok req = - PLAINTEXT -> - return $ BS.intercalate "&" $ map paramEncode [oauthConsumerSecret oa, tokenSecret tok] - RSASHA1 pr -> -- liftM (encode . toStrict . rsassa_pkcs1_v1_5_sign ha_SHA1 pr) (getBaseString tok req) -+ liftM (encode . toStrict . RSA.rsassa_pkcs1_v1_5_sign -+#if MIN_VERSION_RSA(2, 0, 0) -+ RSA.hashSHA1 -+#else -+ RSA.ha_SHA1 -+#endif -+ pr) (getBaseString tok req) - - #if MIN_VERSION_http_conduit(2, 0, 0) - addAuthHeader :: BS.ByteString -> Credential -> Request -> Request -diff --git a/authenticate-oauth/authenticate-oauth.cabal b/authenticate-oauth/authenticate-oauth.cabal -index 00507da..e11c3bd 100644 ---- a/authenticate-oauth/authenticate-oauth.cabal -+++ b/authenticate-oauth/authenticate-oauth.cabal -@@ -19,7 +19,7 @@ library - , transformers >= 0.1 && < 0.4 - , bytestring >= 0.9 - , crypto-pubkey-types >= 0.1 && < 0.5 -- , RSA >= 1.2 && < 1.3 -+ , RSA >= 1.2 && < 2.1 - , time - , data-default - , base64-bytestring >= 0.1 && < 1.1 --- -1.9.1 - diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 9a75bd0cea50..364e81d9ee38 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -1,18 +1,15 @@ { cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit -, conduit, cryptoPubkeyTypes, dataDefault, httpConduit, httpTypes -, monadControl, random, resourcet, RSA, SHA, time, transformers +, cryptoPubkeyTypes, dataDefault, httpClient, httpTypes, random +, RSA, SHA, time, transformers }: cabal.mkDerivation (self: { pname = "authenticate-oauth"; - version = "1.4.0.8"; - sha256 = "1mc36d6lkmqywzsxhzwv4445mmwdz0rr5ibd2a1nbgw5c5jw76fy"; - patches = [ ./RSA2.patch ]; - patchFlags = "-p2"; + version = "1.5"; + sha256 = "07y9zh4v9by588k86wlyj3czivj5jlb9jk6g4j9p8j1qgbv4hpk9"; buildDepends = [ - base64Bytestring blazeBuilder blazeBuilderConduit conduit - cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl - random resourcet RSA SHA time transformers + base64Bytestring blazeBuilder blazeBuilderConduit cryptoPubkeyTypes + dataDefault httpClient httpTypes random RSA SHA time transformers ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index da4629e93fba..028b2e7d969f 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bson"; - version = "0.2.4"; - sha256 = "1fr0xx9q2l3cb72j5lgrwdlr2gba7idh2v80s8d6dr69dhwaccd9"; + version = "0.3"; + sha256 = "0787z6970lf93mgrsyqcilnkx5bynny88ag15z2f07l1rhva6ac4"; buildDepends = [ binary cryptohash dataBinaryIeee754 mtl network text time ]; diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix index 13e6fd8a2b21..edb44d45d1c8 100644 --- a/pkgs/development/libraries/haskell/compdata/default.nix +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "compdata"; - version = "0.8.1.0"; - sha256 = "06bsdhf40b8111k0fmfc53i5kib9n431f07qyj83pq8isgkk33xc"; + version = "0.8.1.2"; + sha256 = "1jhfhinkn6klh68rzl5skh1rianjycc6cfkrglsi17j60a723v9x"; buildDepends = [ deepseq derive mtl QuickCheck thExpandSyns transformers treeView ]; diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 894d317336d2..ebfff759595e 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.11.5"; - sha256 = "0vxnwnjch2r9d54q5f5bfz60npjc7s7x6a5233md7fa756822b9d"; + version = "0.11.6"; + sha256 = "0dyzcaxr8vhzqq9hj4240rxpi87h4ps87yz09klz723shls26f6s"; buildDepends = [ byteable ]; testDepends = [ byteable HUnit QuickCheck tasty tastyHunit tastyQuickcheck diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix index 14614b8ab008..a5681fe123ef 100644 --- a/pkgs/development/libraries/haskell/data-lens-light/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-light/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-lens-light"; - version = "0.1.1"; - sha256 = "03nsfwpcl7wmw2bgcb8z3w04krlbrbks7bjpnzfdz6cgdr5mnjrs"; + version = "0.1.2"; + sha256 = "1xxphcd36vw1ib48rfmrg207h0i1hlby01bm3xsxnq90ygizvxk7"; buildDepends = [ mtl ]; meta = { homepage = "https://github.com/feuerbach/data-lens-light"; diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index b6a5ae78f825..1b29c506c14e 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.8"; - sha256 = "0qvzr9s0vzgzh7mix6ncjn731krln9w47zrqb5jkj92rv7mf5sgz"; + version = "1.1.9"; + sha256 = "0lm6byv5vayzg2jp0fqkbi4wkbhvnjw5sl61qnvpa1pqk6p64mrm"; buildDepends = [ aeson digestiveFunctors lens safe text vector ]; testDepends = [ aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix new file mode 100644 index 000000000000..80458c808a8d --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -0,0 +1,20 @@ +{ cabal, binary, dataAccessor, deepseq, distributedStatic, hashable +, mtl, networkTransport, random, rank1dynamic, stm, syb, time +, transformers +}: + +cabal.mkDerivation (self: { + pname = "distributed-process"; + version = "0.5.0"; + sha256 = "16lfmkhc6jk2n46w39vf0q1ql426h5jrjgdi6cyjgwy1d5kaqcny"; + buildDepends = [ + binary dataAccessor deepseq distributedStatic hashable mtl + networkTransport random rank1dynamic stm syb time transformers + ]; + meta = { + homepage = "http://haskell-distributed.github.com/"; + description = "Cloud Haskell: Erlang-style concurrency in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index 9147b724ba22..8f7dd0d8cddd 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "distributed-static"; - version = "0.2.1.1"; - sha256 = "08y9554x6avjwdmbf33fw1pw1wl8qmgfngmgb6vgad88krnixq1h"; + version = "0.3.0.0"; + sha256 = "1g8jr01jxlfshsz3mrpzl21q290whwz4va3zjp1h0d1pnfwz6jcj"; buildDepends = [ binary rank1dynamic ]; meta = { - homepage = "http://www.github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Compositional, type-safe, polymorphic static values and closures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index d563348c371a..8cbd44b7dbc0 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dns"; - version = "1.3.0"; - sha256 = "1zd639d69ha3g1yz7ssvwarwiwyi975ps4i5y8vrarcq2jnnsb6n"; + version = "1.4.0"; + sha256 = "1r004wpq0z98f6n3rqqlkqmb799sdldj5087icksi6rxxr3plrs9"; buildDepends = [ attoparsec binary blazeBuilder conduit conduitExtra iproute mtl network random resourcet diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index eb52756ce3b4..a4c4f8ecc7c7 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + jailbreak = true; meta = { homepage = "https://github.com/RobotGymnast/extensible-effects"; description = "An Alternative to Monad Transformers"; diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index d32a57597802..f253d3a927be 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, dataDefault, filepath, ghcPaths, groom , haskellNames, haskellPackages, haskellSrcExts, languageEcmascript , mtl, optparseApplicative, safe, sourcemap, split, spoon, syb -, tasty, tastyHunit, tastyTh, text, transformers, uniplate +, tasty, tastyHunit, tastyTh, text, time, transformers, uniplate , unorderedContainers, utf8String, vector }: cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.0.4"; - sha256 = "0cxcd4nxnq8nl03xgxa1nb0932hq4dz1lxpp3gqqs5k5wvs62303"; + version = "0.20.1.1"; + sha256 = "0jcvq880xnkm8aqr69ihwf7by55fc1bbd8wk8152zqgkih74qzc4"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec dataDefault filepath ghcPaths groom haskellNames haskellPackages haskellSrcExts languageEcmascript mtl optparseApplicative safe sourcemap split spoon syb tasty tastyHunit - tastyTh text transformers uniplate unorderedContainers utf8String - vector + tastyTh text time transformers uniplate unorderedContainers + utf8String vector ]; meta = { homepage = "http://fay-lang.org/"; diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 02f9f03588a8..92f256ae811a 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { aeson conduit dataDefault hspec httpConduit HUnit liftedBase monadControl QuickCheck resourcet text time transformers ]; + jailbreak = true; doCheck = false; meta = { homepage = "https://github.com/meteficha/fb"; diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix index 5224bf11f291..e19eff2a631f 100644 --- a/pkgs/development/libraries/haskell/foldl/default.nix +++ b/pkgs/development/libraries/haskell/foldl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "foldl"; - version = "1.0.4"; - sha256 = "0l5gyaw2rb0wfdm5q13vsxfr0z2y9ad5nsjh605p1jp8i0rgwgkv"; + version = "1.0.5"; + sha256 = "08yjzzplg715hzkhwbf8nv2zm7c5wd2kph4zx94iml0cnc6ip048"; buildDepends = [ primitive text transformers vector ]; meta = { description = "Composable, streaming, and efficient left folds"; diff --git a/pkgs/development/libraries/haskell/folds/default.nix b/pkgs/development/libraries/haskell/folds/default.nix new file mode 100644 index 000000000000..4287ddbeb4f1 --- /dev/null +++ b/pkgs/development/libraries/haskell/folds/default.nix @@ -0,0 +1,23 @@ +{ cabal, comonad, contravariant, deepseq, doctest, filepath, hlint +, lens, mtl, pointed, profunctors, reflection, semigroupoids +, semigroups, tagged, transformers, vector +}: + +cabal.mkDerivation (self: { + pname = "folds"; + version = "0.6.1"; + sha256 = "13p4kyr48g917ib87n14qpqaka6isp73cwy7mvvsqgprj1fghyj1"; + buildDepends = [ + comonad contravariant lens pointed profunctors reflection + semigroupoids tagged transformers vector + ]; + testDepends = [ deepseq doctest filepath hlint mtl semigroups ]; + # The hlint tests presently fail + doCheck = false; + meta = { + homepage = "http://github.com/ekmett/folds"; + description = "Beautiful Folding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/free-operational/default.nix b/pkgs/development/libraries/haskell/free-operational/default.nix deleted file mode 100644 index 804577563845..000000000000 --- a/pkgs/development/libraries/haskell/free-operational/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, comonadTransformers, free, kanExtensions, mtl, comonad -, transformers -}: - -cabal.mkDerivation (self: { - pname = "free-operational"; - version = "0.5.0.0"; - sha256 = "0gim4m0l76sxxg6a8av1gl6qjpwxwdzyviij86d06v1150r08dmb"; - jailbreak = true; # needs an old version of kan-extensions - buildDepends = [ - comonadTransformers free kanExtensions mtl transformers comonad - ]; - meta = { - description = "Operational Applicative, Alternative, Monad and MonadPlus from free types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 04545dda87e4..ee2cbdbd2032 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "4.1.2"; - sha256 = "0xdpy61dc56zvpgr2z9cdyd85d65l426vnbfgsw6w494w0bp3sh7"; + version = "4.1.3"; + sha256 = "0n7nbjbiiphlasqfcxx15fa8axwd9csq2nh3r0wvkrgpsazdlw8c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,11 +21,13 @@ cabal.mkDerivation (self: { configureFlags = "--datasubdir=${self.pname}-${self.version}"; postInstall = '' cd $out/share/$pname-$version + sed -i -e 's/"-b" "\\n" "-l"/"-l" "-b" "\\"\\\\n\\""/' ghc-process.el make rm Makefile cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp + mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped cat - > $out/bin/ghc-mod <<EOF #! ${self.stdenv.shell} @@ -34,6 +36,15 @@ cabal.mkDerivation (self: { eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" EOF chmod +x $out/bin/ghc-mod + + mv $out/bin/ghc-modi $out/bin/.ghc-modi-wrapped + cat - > $out/bin/ghc-modi <<EOF + #! ${self.stdenv.shell} + COMMAND=\$1 + shift + eval exec $out/bin/.ghc-modi-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" + EOF + chmod +x $out/bin/ghc-modi ''; meta = { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index 2c9770b20e30..7ea85f2cb1f5 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.0.9"; - sha256 = "0vphhm9wr80p4brcjzhmp2kh0a5rlwzif26w2q054fshxa97kv2a"; + version = "0.0.10"; + sha256 = "0xffr197m6qam4q7ckgcwl0v9kwrxa5fm894c9vyxdmlcjyn38rm"; buildDepends = [ ghcjsBase mtl ]; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix index 168c6babb3d9..6574b6c208c3 100644 --- a/pkgs/development/libraries/haskell/haskell-packages/default.nix +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haskell-packages"; - version = "0.2.4"; - sha256 = "1ygpa2k0hyx2xwny33kr0h847zvvsp4z1pwqrd92sf7vzpyz5nch"; + version = "0.2.4.1"; + sha256 = "014zcq27rwsgj3n4kdgswbppr5yzf3lnj5gnv45r3i5c3rd1mz6k"; buildDepends = [ aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl optparseApplicative tagged diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix index 369d7fbb8c8f..eac734a8422e 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix @@ -22,6 +22,5 @@ cabal.mkDerivation (self : { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [andres simons]; - broken = true; # cgi and cabal-install won't compile }; }) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix index 65395662a89e..a5107a5fe031 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix @@ -22,6 +22,5 @@ cabal.mkDerivation (self : { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [andres simons]; - broken = true; # cgi libary doesn't compile }; }) diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index eff9ada1da54..68479f6560ff 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.10.2"; - sha256 = "10fgz1vvrx09pvlxp0k772xbfni8c8lxbjp59vzm95v2kc4hnagc"; + version = "3000.10.3"; + sha256 = "082w86vawjiqz589s3gmawssd0b43b1vcw0h6cndadwww8yc35bg"; buildDepends = [ base64Bytestring blazeBuilder HaXml HTTP mtl network time utf8String diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix index 170c885d2405..fa2ab9a145ae 100644 --- a/pkgs/development/libraries/haskell/hcltest/default.nix +++ b/pkgs/development/libraries/haskell/hcltest/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hcltest"; - version = "0.3.1"; - sha256 = "0qnf6ib01njcbjfbwxff8y4sqmrj6nyy9y9hb0l0kw21cxsgl7c9"; + version = "0.3.2"; + sha256 = "0q5b0v2gh0b3a15hg25bqj7scbckrkka2ckk49g2mrdz2gpr28bq"; buildDepends = [ dlist either filepath free lens mmorph monadControl mtl optparseApplicative randomShuffle split stm tagged tasty temporary diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix new file mode 100644 index 000000000000..203eb33844e0 --- /dev/null +++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix @@ -0,0 +1,14 @@ +{ cabal, extensibleExceptions, filepath, hsyslog, mtl }: + +cabal.mkDerivation (self: { + pname = "hdaemonize"; + version = "0.4.5.0"; + sha256 = "1b9aic08pgmp95qy74qcrmq9dn33k6knycy7mn1dg8c5svmchb2w"; + buildDepends = [ extensibleExceptions filepath hsyslog mtl ]; + meta = { + homepage = "http://github.com/madhadron/hdaemonize"; + description = "Library to handle the details of writing daemons for UNIX"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hedis/default.nix b/pkgs/development/libraries/haskell/hedis/default.nix index c4e34b2d3612..daa4370ef7ab 100644 --- a/pkgs/development/libraries/haskell/hedis/default.nix +++ b/pkgs/development/libraries/haskell/hedis/default.nix @@ -12,11 +12,11 @@ cabal.mkDerivation (self: { time vector ]; testDepends = [ HUnit mtl testFramework testFrameworkHunit time ]; + doCheck = false; meta = { homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - doCheck = false; }) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 6418c7f03267..25dc666cfa1e 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.8.2"; - sha256 = "1c85yfzi3ri3j1fmqvd4pc4pp95jpm62a2nbbibpybl2h88dsjsb"; + version = "0.5.8.3"; + sha256 = "03x9vp6mvk9hxs92cmy42aqiyh4prnh343xg36znyjii6xw2x3mf"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 624cc9319812..69f1d679c0ac 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -2,13 +2,12 @@ , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes , parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text , time, transformers, uniplate, vector, vectorAlgorithms, wai, warp -, fetchurl }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.32"; - sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc"; + version = "4.2.33"; + sha256 = "0jwik79qcflaghqxfvsd8xvb7y1czb1xihg1ijd29lx7p5mz03il"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,9 +18,6 @@ cabal.mkDerivation (self: { ]; testDepends = [ filepath ]; testTarget = "--test-option=--no-net"; - patches = [ (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff"; - sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; }) - ]; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index 9f56d028c590..67f38f260e07 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -27,6 +27,7 @@ , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes , parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text , time, transformers, uniplate, vector, vectorAlgorithms, wai, warp +, fetchurl , parallel, perl, wget, rehoo, haskellPlatform , packages ? haskellPlatform.propagatedUserEnvPkgs @@ -51,7 +52,10 @@ cabal.mkDerivation (self: rec { # The tests will fail because of the added documentation. doCheck = false; - patches = [ ./hoogle-local.diff ]; + patches = [ ./hoogle-local.diff + (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff"; + sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; }) + ]; docPackages = packages; diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index 83369ac008b7..85fd26e56056 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hp2any-graph"; - version = "0.5.4"; - sha256 = "1lhp9saw51w09fhk94hz31rjawnnxavd7x3lxjc8xn1778wp3v9h"; + version = "0.5.4.1"; + sha256 = "0cvli36lbipi29fw45mfpv35dn7ndbkxhpd3wjy9xn9gy8g0r9xx"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index 5ec8eecd06c7..320551bcac3f 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "http-client-tls"; - version = "0.2.1.1"; - sha256 = "07kwcamc100y48gghmlfvj5ycf6y3cynqqg5kx0ymgjk85k7vim7"; + version = "0.2.1.2"; + sha256 = "08qq2d4mqdd80jb99wm4gd4bqvnrlcpblvqgn18p8bzhw1qq6siy"; buildDepends = [ connection dataDefaultClass httpClient network tls ]; diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index be261bf60272..54888a4b7b53 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.3.3.1"; - sha256 = "0zzh4vr563f8rb51b64gcwmal7gswif8ndsf2x5kw6f7q55md0dw"; + version = "0.3.3.2"; + sha256 = "02q2zph6clff0k86wkyf19j5dhfglqi3zvbs52hw8lygpkycpkk7"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 918993e6be8c..2f9317817de0 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.2.1"; - sha256 = "17bq72qkgn7sh31ad5w7gqf15dlzl027nmx8k7kmm268mf9bz0b5"; + version = "2.1.2.3"; + sha256 = "07d9lhkqf1kr4mg61q0pcf8y73wkdymazxrvr425wjh9363r89gl"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix new file mode 100644 index 000000000000..dd07ef503a73 --- /dev/null +++ b/pkgs/development/libraries/haskell/hweblib/default.nix @@ -0,0 +1,15 @@ +{ cabal, attoparsec, HUnit, mtl, text, transformers }: + +cabal.mkDerivation (self: { + pname = "hweblib"; + version = "0.6.3"; + sha256 = "03dmx5irlsyb3b9zg2r6nz947sslizkn0nlk65ldb5n4m8my33hy"; + buildDepends = [ attoparsec mtl text transformers ]; + testDepends = [ attoparsec HUnit mtl transformers ]; + meta = { + homepage = "http://github.com/aycanirican/hweblib"; + description = "Haskell Web Library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix index 3343ee9cbe9d..2699666cedda 100644 --- a/pkgs/development/libraries/haskell/io-memoize/default.nix +++ b/pkgs/development/libraries/haskell/io-memoize/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "io-memoize"; - version = "1.1.0.0"; - sha256 = "1xnrzrvs5c3lrzdxm4hrqbh8chl8sxv2j98b28na73w8b7yv2agm"; + version = "1.1.1.0"; + sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7"; buildDepends = [ async ]; meta = { + homepage = "https://github.com/DanBurton/io-memoize"; description = "Memoize IO actions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix new file mode 100644 index 000000000000..f45e95b5e86f --- /dev/null +++ b/pkgs/development/libraries/haskell/ixset/default.nix @@ -0,0 +1,14 @@ +{ cabal, safecopy, syb, sybWithClass }: + +cabal.mkDerivation (self: { + pname = "ixset"; + version = "1.0.5"; + sha256 = "1hznn7f8f13x5125n76dchayi16z72050qbwifnkrca54nf9q2ns"; + buildDepends = [ safecopy syb sybWithClass ]; + meta = { + homepage = "http://happstack.com"; + description = "Efficient relational queries on Haskell sets"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index 027cf20064e4..2713dc919c51 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "json-assertions"; - version = "1.0.2"; - sha256 = "0ppj1xxbi0yrmv6vkmwkz91vvwzjd0ixj60432liwmd6h13apky0"; + version = "1.0.3"; + sha256 = "1iklsgzfxgiizqn90r9wfzfaz84fj8by4arppp139w6ybzh3b0r8"; buildDepends = [ aeson indexed indexedFree lens text ]; meta = { homepage = "http://github.com/ocharles/json-assertions.git"; diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 3f4ec1e54d82..aa6c03e53508 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.7.7"; - sha256 = "0rj508hfv9xf30rfjhalz3yfb15vp4r4acdj8aahwfnbls2qb37v"; + version = "0.8.0"; + sha256 = "0k171hbwj108azhlwpnvkl0r4n0kg4yg2mxqvg8cpf47i9bigw5g"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index 389a79dd6e1e..5c242f9493d4 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "miniutter"; - version = "0.4.3.0"; - sha256 = "0hslks4vr1738pczgzzcl0mrb9jqs1986vjgw4xpvzz9p3ki1n50"; + version = "0.4.4.0"; + sha256 = "1pfgbvnxh3c9b489i121p5bg785bp9ivfwizjfwc9w3r6spgppvk"; buildDepends = [ binary minimorph text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/monadloc-pp/default.nix b/pkgs/development/libraries/haskell/monadloc-pp/default.nix new file mode 100644 index 000000000000..5ec05316ba0f --- /dev/null +++ b/pkgs/development/libraries/haskell/monadloc-pp/default.nix @@ -0,0 +1,18 @@ +{ cabal, filepath, haskellSrcExts, monadloc, syb }: + +cabal.mkDerivation (self: { + pname = "monadloc-pp"; + version = "0.3"; + sha256 = "0jr9ngcj3l6kd5cscll5kr3a4bp52sdjgrdxd1j5a21jyc3gdyvn"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath haskellSrcExts monadloc syb ]; + jailbreak = true; + meta = { + homepage = "http://github.com/pepeiborra/monadloc"; + description = "A preprocessor for generating monadic call traces"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 259a8e2fc2d5..c97676b64d8b 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.5.0"; - sha256 = "0dvy8pa79c26hcngds6nnwnayrhsyz1flj18m9bcyrcvwb5q3dd6"; + version = "2.0"; + sha256 = "1dspx1x20903i44i825ziwmvaax75m8g08kz97cv34077bdir80h"; buildDepends = [ binary bson cryptohash hashtables liftedBase monadControl mtl network parsec random randomShuffle text transformersBase diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index b8acec758dea..a6066c580f2e 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.0.2"; - sha256 = "1ckdx8szllk4np5samfdx7l6lzarmfabm8w4210b5m7yms2w98sy"; + version = "0.6.0.3"; + sha256 = "1zg8hig4wgbiswb0sppjiga1r6sw7fjkxfiwlck4bwvghpyr5bp3"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 995571abc202..b8543d2b3761 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mwc-random"; - version = "0.13.1.1"; - sha256 = "1hi9ci65m3pjkli0rvx2x4fmp73c9fsmnc1zkpaj4g64ibhhir64"; + version = "0.13.1.2"; + sha256 = "0b0amp9nv750azg3jc5yyfpdaqzh0z09jp41hwgrzr0j6kq1ygqi"; buildDepends = [ primitive time vector ]; testDepends = [ HUnit QuickCheck statistics testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix index c1bfea43bde6..2b16cc7d2941 100644 --- a/pkgs/development/libraries/haskell/network-info/default.nix +++ b/pkgs/development/libraries/haskell/network-info/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network-info"; - version = "0.2.0.3"; - sha256 = "04nwl5akrsppxkqqq7a7qi5sixvrzvj4njl8rbz7sglbh9393rs2"; + version = "0.2.0.5"; + sha256 = "0ggxnkjkbspynma0wjrc1wwwb9ygx2dhl0n9lfaq7l8r69z7pqwf"; meta = { homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index 840712e34160..728a40d8d3e6 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -1,22 +1,19 @@ -{ cabal, dataAccessor, dataAccessorTransformers, HUnit -, lockfreeQueue, mtl, network, networkTransport -, networkTransportTests, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, transformers +{ cabal, dataAccessor, network, networkTransport +, networkTransportTests }: cabal.mkDerivation (self: { pname = "network-transport-tcp"; - version = "0.3.1"; - sha256 = "15i4qbx1s3dxaixn6kd2z1hsymfvpqzf4jpqd3mcbpjlgrn6craf"; + version = "0.4.0"; + sha256 = "1jjf1dj67a7l3jg3qgbg0hrjfnx1kr9n7hfvqssq7kr8sq1sc49v"; buildDepends = [ dataAccessor network networkTransport ]; - testDepends = [ - dataAccessor dataAccessorTransformers HUnit lockfreeQueue mtl - network networkTransport networkTransportTests QuickCheck - testFramework testFrameworkHunit testFrameworkQuickcheck2 - transformers - ]; + testDepends = [ network networkTransport networkTransportTests ]; + doCheck = false; + patchPhase = '' + sed -i -e 's|network >=.*,|network,|' -e 's|network >=.*|network|' network-transport-tcp.cabal + ''; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index eaa41944a6bd..032cb043faba 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -1,12 +1,12 @@ -{ cabal, binary, transformers }: +{ cabal, binary, hashable, transformers }: cabal.mkDerivation (self: { pname = "network-transport"; - version = "0.3.0.1"; - sha256 = "1iijcd864znik83smk1bjidinm199wri5fdyrhnffj0n35knrvas"; - buildDepends = [ binary transformers ]; + version = "0.4.0.0"; + sha256 = "1485w86wzszlg4dvl0fkr7wa47snvpw825llrvdgrrkcxamhsmrz"; + buildDepends = [ binary hashable transformers ]; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Network abstraction layer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix index 2a2324027d4b..4fc5b1993a3a 100644 --- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -1,13 +1,10 @@ -{ cabal, pipes, pipesGroup, pipesParse, profunctors, transformers -}: +{ cabal, pipes, pipesGroup, pipesParse, transformers }: cabal.mkDerivation (self: { pname = "pipes-bytestring"; - version = "2.0.1"; - sha256 = "1vsfqqkr5danb0n30av4vk8d4by9f50y5l8ywm1xjrmwrx999gvf"; - buildDepends = [ - pipes pipesGroup pipesParse profunctors transformers - ]; + version = "2.1.0"; + sha256 = "1q98444kpcdc817zbg121g2n1mhblrdfsmd0bs5rqq6ijxb213z0"; + buildDepends = [ pipes pipesGroup pipesParse transformers ]; meta = { description = "ByteString support for pipes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix index 7156b8897893..4b5a7973c525 100644 --- a/pkgs/development/libraries/haskell/pipes-text/default.nix +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors streamingCommons text transformers ]; + jailbreak = true; meta = { homepage = "https://github.com/michaelt/text-pipes"; description = "Text pipes"; diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 4109fc89a2c8..c3fd7a357fbd 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.2.3"; - sha256 = "09z56gb3k1ya5c3yznm49sgd1g9i5wvn5ih4mycf5ys2wvy3v9sl"; + version = "0.5.2.4"; + sha256 = "19k8kggmmy75qgg9xcvvd194s1vf5qx15ljx82zdscvks2j1r1sd"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix index 203f22146b17..0c9a22b5974f 100644 --- a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "quickcheck-property-monad"; - version = "0.2.1"; - sha256 = "1ln8bcsc8hd8jyhd9rp2j90p5h5nhmwidb5my91p09h43y4z9xds"; + version = "0.2.2"; + sha256 = "1liixl4xxpx9f3877sss16m67y5bkwhxdmr8h40rpqdi7dz9s0mj"; buildDepends = [ either QuickCheck transformers ]; testDepends = [ doctest filepath QuickCheck ]; meta = { diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix index 8694d2399b2b..a62fe8d0c8b8 100644 --- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix +++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "rank1dynamic"; - version = "0.1.0.2"; - sha256 = "1341hhbdm6y0mj0qjda0ckqsla51fxiy1yfpbwfvsmpi2bkzgxn6"; + version = "0.2.0.0"; + sha256 = "09p3lggnsn0355440d9cazwijv9qm4siw99gg2xkk2hamp2sj42h"; buildDepends = [ binary ]; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/recursion-schemes/default.nix b/pkgs/development/libraries/haskell/recursion-schemes/default.nix index 78e7da44061a..1d6f5934ba70 100644 --- a/pkgs/development/libraries/haskell/recursion-schemes/default.nix +++ b/pkgs/development/libraries/haskell/recursion-schemes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "recursion-schemes"; - version = "4.0"; - sha256 = "1xc1k04p3birxgv5h3ypw85w0cgq4d5rsmadx4pc3j409y6i5p06"; + version = "4.1"; + sha256 = "03rf65ak6bxsr204j6d8g5zyxva9vbmncycav3smqwfg5n3b3pwf"; buildDepends = [ comonad free transformers ]; meta = { homepage = "http://github.com/ekmett/recursion-schemes/"; diff --git a/pkgs/development/libraries/haskell/robots-txt/default.nix b/pkgs/development/libraries/haskell/robots-txt/default.nix index a325c9e86647..f15391ec5e15 100644 --- a/pkgs/development/libraries/haskell/robots-txt/default.nix +++ b/pkgs/development/libraries/haskell/robots-txt/default.nix @@ -1,10 +1,11 @@ -{ cabal, attoparsec, heredoc, hspec, QuickCheck, transformers }: +{ cabal, attoparsec, heredoc, hspec, QuickCheck, time, transformers +}: cabal.mkDerivation (self: { pname = "robots-txt"; - version = "0.4.0.0"; - sha256 = "1z0bn4v6fx0nx1hr4bbxi5k2c8bv6x3d4pywpav67m5pswxb2yp7"; - buildDepends = [ attoparsec ]; + version = "0.4.1.0"; + sha256 = "1q18pgilrwppmd8d7pby3p6qgk47alzmd8izqspk7n4h4agrscn4"; + buildDepends = [ attoparsec time ]; testDepends = [ attoparsec heredoc hspec QuickCheck transformers ]; meta = { homepage = "http://github.com/meanpath/robots"; diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 398d3a1dfb85..02f63cbf9a17 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,17 +1,18 @@ { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault -, hspec, httpTypes, mtl, regexCompat, text, transformers, wai -, waiExtra, warp +, hspec, httpTypes, liftedBase, monadControl, mtl, regexCompat +, text, transformers, transformersBase, wai, waiExtra, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.8.0"; - sha256 = "07198m8rsavdqr51abxsrmi8jail6h4ldzrr9s47il1djjba6lhh"; + version = "0.8.1"; + sha256 = "182iwsz5h7p08sqwfzb332gwj1wjx7fhhazm6gfdc0incab769m0"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes - mtl regexCompat text transformers wai waiExtra warp + monadControl mtl regexCompat text transformers transformersBase wai + waiExtra warp ]; - testDepends = [ hspec httpTypes wai waiExtra ]; + testDepends = [ hspec httpTypes liftedBase wai waiExtra ]; jailbreak = true; meta = { homepage = "https://github.com/scotty-web/scotty"; diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index f07e0f54b9b8..deb7b65beba9 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.13.1"; - sha256 = "00dvf1ydfgpnkv09fywsvyn0sphjwdrqhvkc21axj580ykbqxrn7"; + version = "0.13.2"; + sha256 = "0ibq0y0dxxahfwgcvamjfhbl5mrqmj7ryzf8bfmqky843fg7dyna"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/shellmate/default.nix b/pkgs/development/libraries/haskell/shellmate/default.nix new file mode 100644 index 000000000000..37383792de1f --- /dev/null +++ b/pkgs/development/libraries/haskell/shellmate/default.nix @@ -0,0 +1,14 @@ +{ cabal, filepath, temporary, time, transformers }: + +cabal.mkDerivation (self: { + pname = "shellmate"; + version = "0.1.6"; + sha256 = "17fpl0h58cw5hp6jzrajkl629mw2c6x15cmlcbdxqk9xlxqrg4hr"; + buildDepends = [ filepath temporary time transformers ]; + meta = { + homepage = "http://github.com/valderman/shellmate"; + description = "Simple interface for shell scripting in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index a37fb044bc01..7f021e82ad6c 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.4"; - sha256 = "1jxw3c25n7azvfyj9vark9149sk36d01pfij6lgamhjs28mb860d"; + version = "1.5.4.1"; + sha256 = "0h38j6vkdgaddj7xardyywibdj5w0wryqxwwpc62idgzlp7mgpb2"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 52c5fd7fe684..604f3f065a9f 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.14"; - sha256 = "00k9cachx7y4811b71f8p468kx018hzvpvw6jgf7zmjhc9v922ni"; + version = "0.2.15"; + sha256 = "1fa20h2zcvxwdb5j5a0nnhl38bry1p5ckya1l7lrxx9r2bvjkyj9"; buildDepends = [ network resourcet ]; testDepends = [ conduit conduitExtra hspec HUnit network networkConduit resourcet diff --git a/pkgs/development/libraries/haskell/simple-sql-parser/default.nix b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix new file mode 100644 index 000000000000..30c3ce4b1053 --- /dev/null +++ b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix @@ -0,0 +1,19 @@ +{ cabal, HUnit, mtl, parsec, testFramework, testFrameworkHunit }: + +cabal.mkDerivation (self: { + pname = "simple-sql-parser"; + version = "0.4.0"; + sha256 = "0mkc2x6x061qdcnaifig26jmq86rvdvp1xjmzn8g2qf0v3dw18hl"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl parsec ]; + testDepends = [ + HUnit mtl parsec testFramework testFrameworkHunit + ]; + meta = { + homepage = "http://jakewheat.github.io/simple-sql-parser/"; + description = "A parser for SQL queries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix index 338e2c4693f5..5f694b45d981 100644 --- a/pkgs/development/libraries/haskell/snap-cors/default.nix +++ b/pkgs/development/libraries/haskell/snap-cors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "snap-cors"; - version = "1.2.4"; - sha256 = "0mg5sjvrcs60s8k28vgi49vbgfpswkcd7i7yyfi1n1649vqb69mb"; + version = "1.2.5"; + sha256 = "1zjvvi1prskkb26yp51j09gfkhpw0ggj69d89098yq0sl6d0vy1c"; buildDepends = [ attoparsec caseInsensitive hashable network snap text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index 83a82ac80ce1..00617f517286 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -4,16 +4,16 @@ cabal.mkDerivation (self: { pname = "snaplet-redis"; - version = "0.1.3.1"; - sha256 = "1aprz9rxs01a86vfr8s7mjydafdfljg89grl7i43vmsw927izc6k"; + version = "0.1.3.2"; + sha256 = "0554farc76ncbynzks4ryi7a2nbahsgnjvazmw5n9b79cp207bjf"; buildDepends = [ configurator hedis lens mtl network snap transformers ]; + jailbreak = true; meta = { homepage = "https://github.com/dzhus/snaplet-redis/"; description = "Redis support for Snap Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - jailbreak = true; }) diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index bfc38fb07e89..1f6cf569b566 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -1,10 +1,9 @@ -{ cabal, baseUnicodeSymbols }: +{ cabal }: cabal.mkDerivation (self: { pname = "string-combinators"; - version = "0.6.0.4"; - sha256 = "0r1za5ypx9fz073h1yljjdkxmz0h77vg94bk827ndwkfgzgpzvh7"; - buildDepends = [ baseUnicodeSymbols ]; + version = "0.6.0.5"; + sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl"; meta = { homepage = "https://github.com/basvandijk/string-combinators"; description = "Polymorphic functions to build and combine stringlike values"; diff --git a/pkgs/development/libraries/haskell/syntactic/default.nix b/pkgs/development/libraries/haskell/syntactic/default.nix index 39fbeebd33c1..17cb5039a640 100644 --- a/pkgs/development/libraries/haskell/syntactic/default.nix +++ b/pkgs/development/libraries/haskell/syntactic/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "syntactic"; - version = "1.12.1"; - sha256 = "0p68jgfwzr9mvgrcjdj3235109nhpaichm5irj9m29076axrsb94"; + version = "1.13"; + sha256 = "1d5mb7ss6xr7rj93mwrdvkxkx1dlmywxx9sxsmqy7l6gaxs6gq8l"; buildDepends = [ constraints dataHash mtl transformers treeView tuple ]; diff --git a/pkgs/development/libraries/haskell/tables/default.nix b/pkgs/development/libraries/haskell/tables/default.nix new file mode 100644 index 000000000000..f97512c7f7f7 --- /dev/null +++ b/pkgs/development/libraries/haskell/tables/default.nix @@ -0,0 +1,23 @@ +{ cabal, binary, cereal, comonad, deepseq, doctest, filepath +, hashable, lens, profunctors, safecopy, transformers +, transformersCompat, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "tables"; + version = "0.4.1"; + sha256 = "131c97lgni0b9pmkdfd5y0lwrb9yh9qyahknhrim8dzpkkfynk49"; + buildDepends = [ + binary cereal comonad deepseq hashable lens profunctors safecopy + transformers transformersCompat unorderedContainers + ]; + testDepends = [ + doctest filepath lens transformers unorderedContainers + ]; + meta = { + homepage = "http://github.com/ekmett/tables/"; + description = "In-memory storage with multiple keys using lenses and traversals"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tcache-AWS/default.nix b/pkgs/development/libraries/haskell/tcache-AWS/default.nix new file mode 100644 index 000000000000..b223f6b36555 --- /dev/null +++ b/pkgs/development/libraries/haskell/tcache-AWS/default.nix @@ -0,0 +1,14 @@ +{ cabal, aws, conduit, httpConduit, network, TCache, text }: + +cabal.mkDerivation (self: { + pname = "tcache-AWS"; + version = "0.0.1"; + sha256 = "18hi8jvc117pxjhpb891hqlsbi4wvmd6nr3vwnqqr7rcw2dsmnwv"; + buildDepends = [ aws conduit httpConduit network TCache text ]; + meta = { + description = "tcache using Amazon Web Services as default persistence mechanism"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 4d14ed4582af..334b7fcfe399 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -1,23 +1,28 @@ -{ cabal, aeson, attoparsec, attoparsecConduit, authenticateOauth -, conduit, dataDefault, doctest, failure, filepath, hlint -, httpClient, httpConduit, httpTypes, lens, liftedBase -, monadControl, monadLogger, resourcet, shakespeare, text, time +{ cabal, aeson, attoparsec, authenticateOauth, caseInsensitive +, conduit, conduitExtra, dataDefault, doctest, filepath, hlint +, hspec, httpClient, httpConduit, httpTypes, lens, monadControl +, monadLogger, network, resourcet, shakespeare, text, time , transformers, transformersBase, twitterTypes }: cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.2.1"; - sha256 = "1z0d8hwjrdw8gkww9zkn9cqv3g40my952li8pm3c164d7ywswszq"; + version = "0.0.4"; + sha256 = "0fv2m3sy1gklch4v3sarvq4xk9p7pdz1s3ssl52riy3mg076ab09"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec attoparsecConduit authenticateOauth conduit - dataDefault failure httpClient httpConduit httpTypes lens - liftedBase monadControl monadLogger resourcet shakespeare text time - transformers transformersBase twitterTypes + aeson attoparsec authenticateOauth conduit conduitExtra dataDefault + httpClient httpConduit httpTypes lens monadLogger resourcet + shakespeare text time transformers twitterTypes + ]; + testDepends = [ + aeson attoparsec authenticateOauth caseInsensitive conduit + conduitExtra dataDefault doctest filepath hlint hspec httpClient + httpConduit httpTypes lens monadControl monadLogger network + resourcet shakespeare text time transformers transformersBase + twitterTypes ]; - testDepends = [ doctest filepath hlint ]; meta = { homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 4b73fc5cf5a5..6783993f7188 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "twitter-types"; - version = "0.3.20140601"; - sha256 = "1z8vdhyklgb4s3jxkavb8n62h9cn3y80qqzab3hswfv5xwri20ni"; + version = "0.3.20140620"; + sha256 = "02mwdgz1l1z5k5k78bjnnbabcr27xixli1gqk6rmqrarcylybvll"; buildDepends = [ aeson httpTypes text unorderedContainers ]; testDepends = [ aeson attoparsec httpTypes HUnit shakespeare testFramework diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index 9742b193e7ba..a43da3b71948 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-compat"; - version = "0.4.1.1"; - sha256 = "1cjny6zca5wdj7d56kjkaxlad85kknn91pisrizjy6wngszyaigf"; + version = "0.4.1.3"; + sha256 = "1vfw3ffzdk9mshhgyp3dnbn8rihkz8qg6n5zqak8966dsdqhm4xb"; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index c6d440a5d471..8badc0d9c510 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-space"; - version = "0.8.6"; - sha256 = "03kz2qhnynbgs4vk7348zjkkakzzwvxhbasl0lcazj1cx1ay7c4l"; + version = "0.8.7"; + sha256 = "1i3c34b3ngksmw4blhldap8fiw1jddm2h1qyr92csn3cllj6j1vm"; buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { description = "Vector & affine spaces, linear maps, and derivatives"; diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix index 725567ff16bb..bac5d880ba32 100644 --- a/pkgs/development/libraries/haskell/vinyl/default.nix +++ b/pkgs/development/libraries/haskell/vinyl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vinyl"; - version = "0.4.1"; - sha256 = "1x8kxb4z4nj7h6pbl0r37rr7k88ly64cn0bf7izyaqjrsf0kxdci"; + version = "0.4.2"; + sha256 = "17vh5yv9dzw6zq1xw22k7mljpha0rcngbk5k0kynh7hyh6xy4zxz"; testDepends = [ doctest lens singletons ]; meta = { description = "Extensible Records"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index d54e8351d4fd..45d4177305ab 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.0"; - sha256 = "0spjyimqfj7hx8zgmal4laqy8p1inj8hl2402b5s6zqdn36lldfs"; + version = "3.0.0.1"; + sha256 = "0i28d3pwz2fskg94xlkapdw07zkq3acnqk21kpgm5ffbj6qvbvsg"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 50ded58f44d8..887b004b93ab 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "3.0.0.1"; - sha256 = "1f8alq4lygjdb4pzb7xm6jml3dviygk18siwfwb751va3j2fmi0v"; + version = "3.0.0.2"; + sha256 = "1zmpalgck8jns45wnlarw26kfw45ml0cp82kdqqpbckscxnr04r1"; buildDepends = [ blazeBuilder httpTypes network text vault ]; testDepends = [ blazeBuilder hspec ]; meta = { diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index d0940345a576..0ccbcfceb39b 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.0.1"; - sha256 = "05x216fj7s1i963xipi0p7vmkz5l0nma1fjqiq040fg3rngw4yqb"; + version = "3.0.0.3"; + sha256 = "0lhmhgbza49lkbay6ydj5h1g04qzs4jx2wyq4bhddjrpmxsdsy2y"; buildDepends = [ blazeBuilder caseInsensitive hashable httpDate httpTypes network simpleSendfile streamingCommons text unixCompat void wai diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix new file mode 100644 index 000000000000..4af61ece80a5 --- /dev/null +++ b/pkgs/development/libraries/haskell/webdriver/default.nix @@ -0,0 +1,27 @@ +{ cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault +, directoryTree, exceptions, filepath, HTTP, liftedBase +, monadControl, mtl, network, parallel, scientific, temporary, text +, time, transformers, transformersBase, unorderedContainers, vector +, zipArchive +}: + +cabal.mkDerivation (self: { + pname = "webdriver"; + version = "0.5.4"; + sha256 = "0839vw7drjn5iray4ma17f0pfgwx44q10ad8m564jvjgcml4yhvq"; + buildDepends = [ + aeson attoparsec base64Bytestring cond dataDefault directoryTree + exceptions filepath HTTP liftedBase monadControl mtl network + scientific temporary text time transformers transformersBase + unorderedContainers vector zipArchive + ]; + testDepends = [ parallel text ]; + jailbreak = true; + doCheck = false; + meta = { + homepage = "https://github.com/kallisti-dev/hs-webdriver"; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index e712a5b2b815..2ec9847e8ef6 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { entropy HUnit ioStreams mtl network QuickCheck random SHA testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; + jailbreak = true; meta = { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index a54c714e979a..ae3c3cd8a008 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.1"; - sha256 = "1fv5z938rpiyhkl4zjb2ss496bgqvdvn7di5im089zmxvx1m81lz"; + version = "1.3.1.1"; + sha256 = "0mw04v8gnhv9gnv7kv2v1x5df63zjdmi52r5bv1fzqay1s5b83ir"; buildDepends = [ aeson attoparsecConduit authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 145df1e625fe..30a75724e0ec 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.10.2"; - sha256 = "18faylxjrd790xv6zr77wikkcy99l7824bb1sq1y225kd7a3alsm"; + version = "1.2.11"; + sha256 = "15bxl52ky0ihm7ak71g6cvb9bac4zvmb8sh74fbjkckmpgh8r3m2"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 7ea674aa0d9d..45bcf97f942f 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.16.1"; - sha256 = "1wr5labhp3wc23ki2wvaypanm54qw9vz3v77rxyj1za1y2n1cprw"; + version = "1.2.17"; + sha256 = "199zj9yz5nmk4h2dwz4zlix3wf1z5fl9a8jg8cr4z6ldgskcfis1"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 4309df0e4c4e..0c045be968a8 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.10"; - sha256 = "1qq0r5phb6xygz4w5ysir3ky7bw0rmd1q4vz57dz1aza2pchb1ih"; + version = "1.3.11"; + sha256 = "15c4qyvz1mn56pl9add865lm351wjhdhrbzm87py2jliglm905n0"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 44b147586236..d1a3b6ab63e9 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.3"; - sha256 = "082zi53q1pw9xv4l6ld1y3xxnvq3iwgbrdnxjknhwsxph7glkn3p"; + version = "1.2.3.1"; + sha256 = "0q4w7q22d8hvsg939w686fb295v8cznnhqlfd1bh0v2lp9dih4ms"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index b11b12020801..492538f18026 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "libogg-1.3.1"; +let + name = "libogg-1.3.2"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "1ynwij1qdibwb2nvcl3ixri0c6pvq1higl96hf87iyqsv1wasnrs"; + sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z"; }; - nativeBuildInputs = [ xz ]; - - meta = { + meta = with stdenv.lib; { homepage = http://xiph.org/ogg/; + license = licenses.bsd3; + maintainers = [ maintainers.emery ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index b1277b87e6a7..0dd99605b336 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,17 +1,26 @@ -{ stdenv, fetchurl, libogg, xz }: +{ stdenv, fetchurl, libogg, pkgconfig }: -stdenv.mkDerivation rec { - name = "libvorbis-1.3.3"; +let + name = "libvorbis-1.3.4"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43"; + sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g"; }; - nativeBuildInputs = [ xz ]; + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ libogg ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { homepage = http://xiph.org/vorbis/; + license = licenses.bsd3; + maintainers = [ maintainers.emery ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 993993cecd07..7b502822a180 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -18,7 +18,13 @@ stdenv.mkDerivation (rec { sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; }; - patches = [ ./patch-ac ]; + clangPatch = fetchurl { + # Patch referenced from https://github.com/Homebrew/homebrew-dupes/issues/43 + url = "http://lists.gnu.org/archive/html/bug-ncurses/2011-04/txtkWQqiQvcZe.txt"; + sha256 = "03lrwqvb0r2qgi8hz7ayd3g26d6xilr3c92j8li3b77kdc0w0rlv"; + }; + + patches = [ ./patch-ac ] ++ stdenv.lib.optional stdenv.isDarwin clangPatch; configureFlags = '' --with-shared --without-debug --enable-pc-files --enable-symlinks diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 38cde3bfd707..159b8e6e8386 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -4,6 +4,6 @@ stdenv.mkDerivation { name = "szip-2.1"; src = fetchurl { url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; - sha256 = "05707lrdhwp8mv0dgzh2b6m2mwamv1z6k29m2v1v7pz0c1w2gb6z"; + sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 92fbe81a32e9..3ef43baca5ed 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { + description = "A service which logs the users's activities and events"; homepage = https://launchpad.net/zeitgeist; - description = "Zeitgeist is a service which logs the users's activities and events"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 088eb1b94930..0938e2a17a79 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = "-static-libgcc"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc"; crossAttrs = { dontStrip = static; @@ -44,4 +44,9 @@ stdenv.mkDerivation rec { cygwinConfigureEnableShared = true; passthru.version = version; + + meta = with stdenv.lib; { + description = "Lossless data-compression library"; + license = licenses.zlib; + }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 055a491f4601..dcfaafc2b7d8 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Zziplib, a library to extract data from files archived in a zip file"; + description = "Library to extract data from files archived in a zip file"; longDescription = '' The zziplib library is intentionally lightweight, it offers the ability diff --git a/pkgs/development/python-modules/4suite/default.nix b/pkgs/development/python-modules/4suite/default.nix index 9f900e4f50ab..94eec40d51fb 100644 --- a/pkgs/development/python-modules/4suite/default.nix +++ b/pkgs/development/python-modules/4suite/default.nix @@ -10,4 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [python]; buildPhase = "true"; installPhase = "python ./setup.py install --prefix=$out"; + + # None of the tools installed to bin/ work. They all throw an exception + # similar to this: + # ImportError: No module named Ft.Xml.XPath._4xpath + meta.broken = true; } diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix new file mode 100644 index 000000000000..d3edf54788ab --- /dev/null +++ b/pkgs/development/python-modules/tables/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, python, buildPythonPackage +, cython, bzip2, lzo, numpy, numexpr, hdf5 }: + +buildPythonPackage rec { + version = "3.1.1"; + name = "tables-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/pytables/${name}.tar.gz"; + sha256 = "18rdzv9xwiapb5c8y47rk2fi3fdm2dpjf68wfycma67ifrih7f9r"; + }; + + buildInputs = [ hdf5 cython bzip2 lzo ]; + propagatedBuildInputs = [ numpy numexpr ]; + + # The setup script complains about missing run-paths, but they are + # actually set. + setupPyBuildFlags = + [ "--hdf5=${hdf5}" + "--lzo=${lzo}" + "--bzip2=${bzip2}" + ]; + setupPyInstallFlags = setupPyBuildFlags; + + # Run the test suite. + # It requires the build path to be in the python search path. + # These tests take quite some time. + # If the hdf5 library is built with zlib then there is only one + # test-failure. That is the same failure as described in the following + # github issue: + # https://github.com/PyTables/PyTables/issues/269 + checkPhase = '' + ${python}/bin/${python.executable} <<EOF + import sysconfig + import sys + import os + f = "lib.{platform}-{version[0]}.{version[1]}" + lib = f.format(platform=sysconfig.get_platform(), + version=sys.version_info) + build = os.path.join(os.getcwd(), 'build', lib) + sys.path.insert(0, build) + import tables + r = tables.test() + if not r.wasSuccessful(): + sys.exit(1) + EOF + ''; + + # Disable tests until the failure described above is fixed. + doCheck = false; + + meta = { + description = "Hierarchical datasets for Python"; + homepage = "http://www.pytables.org/"; + }; +} diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 500cef43bcbe..ca4176dbe1eb 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -4,14 +4,14 @@ let name = "cppcheck"; - version = "1.64"; + version = "1.65"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "0n2hrg99rsp77b3plpip315pyk0x4gh8gljs9z3iwcbcg14mliff"; + sha256 = "0rsxnqvjyiviqsq4y5x4p1jpvcmhf8hh7d710rsvnv5d4cj7lmqn"; }; configurePhase = '' diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 2c4ea8183af3..99353a1a192c 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.4.0"; + version = "2.4.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0mdfp5r5qid42x7rq1cmyxqmvjdj2hk9rjz8pryf4zq3bk38m1cg"; + sha256 = "1qdq3v7wv9jacw4bipgx24knlipw6zdcx43yd1qyw6zwaad51ckw"; }; jarsrc = fetchurl { url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar"; - sha256 = "099r5qcldb214c3857i7dbbqn531aahzrz39qfhqxc6f476ncdh0"; + sha256 = "0n4kpmzw9nvppq758lhnrr7xps5j6gwmdm98m772cj7j4vixsrzb"; }; patches = [ ./lein-fix-jar-path.patch ]; diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix index cfda3b66704a..d3e48c619fac 100644 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "045lmmna5nwj07si81vxms5xkkmqvjsiif20nny5mvlabshxn1yi"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml ]; + buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix index 968efe2260b0..6a2cf668682b 100644 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml ]; + buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix index 3cac6e133236..89a488fdd31f 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "0kpk3bmlyd7cb6s39ix8s0ak65xhrln9mg481y3h24lf5syy5ky9"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal deepseq filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix index 95890f5bd43f..6227f55888b4 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "1qwj13ks3fzar14s587svv1pdiwk80m7x5pzn74v3jrqkn0xbrr5"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal deepseq filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.14.2.nix b/pkgs/development/tools/documentation/haddock/2.14.2.nix index af611de4b9fa..8838b6def422 100644 --- a/pkgs/development/tools/documentation/haddock/2.14.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.14.2.nix @@ -1,5 +1,5 @@ { cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck -, xhtml +, xhtml, makeWrapper }: cabal.mkDerivation (self: { @@ -8,9 +8,14 @@ cabal.mkDerivation (self: { sha256 = "0h96jj6y093h4gcqpiq0nyv7h5wjg8ji7z1im9ydivmsv0627prk"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/etcdctl/default.nix b/pkgs/development/tools/etcdctl/default.nix new file mode 100644 index 000000000000..a37ef26f5412 --- /dev/null +++ b/pkgs/development/tools/etcdctl/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.4.3"; + name = "etcdctl-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o etcdctl github.com/coreos/etcdctl + ''; + + installPhase = '' + ensureDir $out/bin + mv etcdctl $out/bin + ''; + + meta = with stdenv.lib; { + description = "A simple command line client for etcd"; + homepage = http://coreos.com/using-coreos/etcd/; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/etcdctl/deps.nix b/pkgs/development/tools/etcdctl/deps.nix new file mode 100644 index 000000000000..98bdda95a433 --- /dev/null +++ b/pkgs/development/tools/etcdctl/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/coreos/etcdctl"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "etcdctl"; + rev = "061135b2a02797a6b3c2b6c01183517c1bc76a2c"; + sha256 = "1hl9cz9ygr2k4d67qj9q1xj0n64b28qjy5sv7zylgg9h9ag2j2p4"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix new file mode 100644 index 000000000000..6057c288cf69 --- /dev/null +++ b/pkgs/development/tools/gocode/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gocode"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o gocode github.com/nsf/gocode + ''; + + installPhase = '' + ensureDir $out/bin + mv gocode $out/bin + ''; + + meta = with lib; { + description = "An autocompletion daemon for the Go programming language"; + homepage = https://github.com/nsf/gocode; + license = licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix new file mode 100644 index 000000000000..4fd0578496d4 --- /dev/null +++ b/pkgs/development/tools/gocode/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/nsf/gocode"; + src = fetchFromGitHub { + owner = "nsf"; + repo = "gocode"; + rev = "9b760fdb16f18eafbe0cd274527efd2bd89dfa78"; + sha256 = "0d1wl0x8jkaav6lcfzs70cr6gy0p88cbk5n3p19l6d0h9xz464ax"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 8a5bc8eb7c85..a065d7f01eb1 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.1"; - sha256 = "19isyslrxbp430ira7v2d3r5f1j1526rg7v6lzzyl3dsyfpvxjg6"; + version = "1.3.2"; + sha256 = "1vmn7aaljwg3gv6vbj9z5w2mffsls5d6mzs4rg9s3rh8khb14cr0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix index 328cba4145f5..a3f67393eed5 100644 --- a/pkgs/development/tools/misc/ShellCheck/default.nix +++ b/pkgs/development/tools/misc/ShellCheck/default.nix @@ -10,7 +10,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; - license = self.stdenv.lib.licenses.agpl3Plus; + license = "unknown"; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 7e3a3a6d15c9..4236cffadfc9 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/facebook/libphutil.git"; - rev = "0027e97cd6cbafcbdc626b4ac6cf315b9508a14f"; - sha256 = "4781a4e3e1cb72da24e97f89a9b879803be8e1cf6baa2a4517801dfb893eec26"; + rev = "8d1b522333caf4984180ac830be8635437bacedb"; + sha256 = "e83da381cd8845b64a1cd3244d17736fb736aeabce37efd19754447f47cd4fe1"; }; arcanist = fetchgit { url = "git://github.com/facebook/arcanist.git"; - rev = "680ec3670cd9d9195debf3e9b674b1b232156e61"; - sha256 = "a70cde586960676c0d69f4d98e6936633e0d79c37c6f6cc5b0213146a6b18c83"; + rev = "0971c728fea89ac45a67e06cdb89349ad8040c60"; + sha256 = "33e595b81dcbef181d3c71072ecf1c22db3f86f49dbb5276c671caefe83c8594"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20140617"; + version = "20140627"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix new file mode 100644 index 000000000000..4170570e08aa --- /dev/null +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "chrpath-0.16"; + + src = fetchurl { + url = "https://alioth.debian.org/frs/download.php/file/3979/chrpath-0.16.tar.gz"; + sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; + }; + + meta = with stdenv.lib; { + description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries"; + longDescription = '' + chrpath changes, lists or removes the rpath or runpath setting in a + binary. The rpath, or runpath if it is present, is where the runtime + linker should look for the libraries needed for a program. + ''; + homepage = https://alioth.debian.org/projects/chrpath/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index beed6032393f..9e400cc5c62a 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The DejaGNU testing framework"; + description = "Framework for testing other programs"; longDescription = '' DejaGnu is a framework for testing other programs. Its purpose diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 36a57e8fe96e..ea9278c2b3d0 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,43 +1,52 @@ -{ stdenv, fetchurl, libftdi, libusb1 }: +{ stdenv, fetchurl, libftdi, libusb1, pkgconfig }: + +# TODO: Add "hidapi" as dependency to gain access to CMSIS-DAP debuggers. +# Support should be auto-detected, but if not, pass "--enable-cmsis-dap" to +# configure. stdenv.mkDerivation rec { name = "openocd-${version}"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj"; + sha256 = "0byk7hnccgmhw0f84qlkfhps38gp2xp628bfrsc03vq08hr6q1sv"; }; - configureFlags = [ "--enable-ft2232_libftdi" - "--enable-jlink" - "--enable-rlink" - "--enable-ulink" - "--enable-stlink" ]; - - buildInputs = [ libftdi libusb1 ]; + buildInputs = [ libftdi libusb1 pkgconfig ]; + + configureFlags = [ + "--enable-jtag_vpi" + "--enable-usb_blaster_libftdi" + "--enable-amtjtagaccel" + "--enable-gw16012" + "--enable-presto_libftdi" + "--enable-openjtag_ftdi" + "--enable-oocd_trace" + "--enable-buspirate" + "--enable-sysfsgpio" + "--enable-remote-bitbang" + ]; postInstall = '' mkdir -p "$out/etc/udev/rules.d" - ln -s "$out/share/openocd/contrib/openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules" + ln -s "$out/share/openocd/contrib/99-openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules" ''; - meta = { + meta = with stdenv.lib; { + description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"; + longDescription = '' + OpenOCD provides on-chip programming and debugging support with a layered + architecture of JTAG interface and TAP support, debug target support + (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, etc.). Several + network interfaces are available for interactiving with OpenOCD: HTTP, + telnet, TCL, and GDB. The GDB server enables OpenOCD to function as a + "remote target" for source-level debugging of embedded systems using the + GNU GDB program. + ''; homepage = http://openocd.sourceforge.net/; - description = "OpenOCD, an on-chip debugger"; - - longDescription = - '' OpenOCD provides on-chip programming and debugging support with a - layered architecture of JTAG interface and TAP support, debug target - support (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, - etc.). Several network interfaces are available for interactiving - with OpenOCD: HTTP, telnet, TCL, and GDB. The GDB server enables - OpenOCD to function as a "remote target" for source-level debugging - of embedded systems using the GNU GDB program. - ''; - - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [ viric bjornfor ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric bjornfor ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 80c6b20e69d0..09978b5ad650 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { # 'make check' uses boost and tcl buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; + configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache"; + meta = { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix new file mode 100644 index 000000000000..5cea753dd9c3 --- /dev/null +++ b/pkgs/development/tools/packer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "packer-0.6.0"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ gox ]; + + installPhase = '' + export GOPATH=$src + XC_ARCH=$(go env GOARCH) + XC_OS=$(go env GOOS) + + ensureDir $out/bin + + cd $src/src/github.com/mitchellh/packer + gox \ + -os="''${XC_OS}" \ + -arch="''${XC_ARCH}" \ + -output "$out/bin/packer-{{.Dir}}" \ + ./... + mv $out/bin/packer{*packer*,} + ''; + + meta = with stdenv.lib; { + description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; + homepage = "http://www.packer.io"; + license = licenses.mpl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix new file mode 100644 index 000000000000..4c8a376991aa --- /dev/null +++ b/pkgs/development/tools/packer/deps.nix @@ -0,0 +1,307 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/mitchellh/packer"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "packer"; + rev = "12e28f257f66299e3bb13a053bf06ccd236e7efd"; + sha256 = "1r5j864kr7lx137c23kk5s82znk11hsrgq98zfz5r8sbzq1xpbzw"; + }; + } + { + root = "code.google.com/p/go.crypto"; + src = fetchhg { + url = "http://code.google.com/p/go.crypto"; + tag = "199"; + sha256 = "0ibrpc6kknzl6a2g2fkxn03mvrd635lcnvf4a9rk1dfrpjbpcixh"; + }; + } + { + root = "code.google.com/p/goauth2"; + src = fetchhg { + url = "http://code.google.com/p/goauth2"; + tag = "67"; + sha256 = "053vajj8hd9869by7z9qfgzn84h6avpcjvyxcyw5jml8dsln4bah"; + }; + } + { + root = "code.google.com/p/google-api-go-client"; + src = fetchhg { + url = "http://code.google.com/p/google-api-go-client"; + tag = "111"; + sha256 = "1ib8i1c2mb86lkrr5w7bgwb70gkqmp860wa3h1j8080gxdx3yy16"; + }; + } + { + root = "code.google.com/p/gosshold"; + src = fetchhg { + url = "http://code.google.com/p/gosshold"; + tag = "2"; + sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8"; + }; + } + { + root = "github.com/ActiveState/tail"; + src = fetchFromGitHub { + owner = "ActiveState"; + repo = "tail"; + rev = "8dcd1ad3e57aa8ce5614a837cbbdb21945fbb55a"; + sha256 = "1jxj576dd7mawawwg5nzwf6k7sks0r3lp2x8f6kxaps50n3k1wiz"; + }; + } + { + root = "github.com/howeyc/fsnotify"; + src = fetchFromGitHub { + owner = "howeyc"; + repo = "fsnotify"; + rev = "441bbc86b167f3c1f4786afae9931403b99fdacf"; + sha256 = "1v5vrwhmidxjj6sppinyizf85v60zrmn7i6c9xk0pvx6k0kw2mr2"; + }; + } + { + root = "launchpad.net/tomb"; + src = fetchbzr { + url = "https://launchpad.net/tomb"; + revision = "17"; + sha256 = "1cjw0sr9hald1darq6n8akfpkzcgrk3mcq59hga3ibf2lrg35ha0"; + }; + } + { + root = "github.com/going/toolkit"; + src = fetchFromGitHub { + owner = "going"; + repo = "toolkit"; + rev = "6185c1893604d52d36a97dd6bb1247ace93a9b80"; + sha256 = "1kzy5yppalcidsmv5yxmr6lpqplqj07kdqpn77fdp6fbb0y0sg11"; + }; + } + { + root = "code.google.com/p/goprotobuf"; + src = fetchhg { + url = "http://code.google.com/p/goprotobuf"; + tag = "246"; + sha256 = "0k4wcv1dnkwcp0gdrajj6kr25f1lg4lgpbi0h5v9l9n7sdwzplf4"; + }; + } + { + root = "github.com/bmizerany/assert"; + src = fetchFromGitHub { + owner = "bmizerany"; + repo = "assert"; + rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; + sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc"; + }; + } + { + root = "github.com/kr/pretty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pretty"; + rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f"; + sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl"; + }; + } + { + root = "github.com/kr/text"; + src = fetchFromGitHub { + owner = "kr"; + repo = "text"; + rev = "6807e777504f54ad073ecef66747de158294b639"; + sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; + }; + } + { + root = "github.com/kr/pty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pty"; + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + } + { + root = "github.com/xiocode/toolkit"; + src = fetchFromGitHub { + owner = "xiocode"; + repo = "toolkit"; + rev = "352fd7c6700074a81056cdfc9e82b3e8c5681ac5"; + sha256 = "0p33zh57xpxyk2wyp9xahdxyrkq48ysihpr0n9kj713q0dh7x4a3"; + }; + } + { + root = "launchpad.net/gocheck"; + src = fetchbzr { + url = "https://launchpad.net/gocheck"; + revision = "87"; + sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; + }; + } + { + root = "github.com/hashicorp/go-version"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "go-version"; + rev = "bb92dddfa9792e738a631f04ada52858a139bcf7"; + sha256 = "0fl5a6j6nk1xsxwjdpa24a24fxvgnvm3jjlgpyrnmbdn380zil3m"; + }; + } + { + root = "github.com/mitchellh/go-fs"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "go-fs"; + rev = "faaa223588dd7005e49bf66fa2d19e35c8c4d761"; + sha256 = "19jsvy35g14f18ckymzxasy0zfd6n99zlqg6grpj1yqdfxfvqn9b"; + }; + } + { + root = "github.com/mitchellh/go-vnc"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "go-vnc"; + rev = "fc93dd80f5da4ccde0a9d97f0c73e56e04e0cf72"; + sha256 = "03rwsp1frvfx6c7yxr711lq7jdgsr1gcwg14jw26xvbzzxwjvnsf"; + }; + } + { + root = "github.com/mitchellh/goamz"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "goamz"; + rev = "c3ff5f734c89f1ea1f290c6aadbbceeeb19a623c"; + sha256 = "1nyi1p5yh21r161icnwkcgmj2y38b4m1jis47vvjbqinrp45w1gq"; + }; + } + { + root = "github.com/motain/gocheck"; + src = fetchFromGitHub { + owner = "motain"; + repo = "gocheck"; + rev = "9beb271d26e640863a5bf4a3c5ea40ccdd466b84"; + sha256 = "07arpwfdb51b5f7kzqnm5s5ndfmxv5j793hpn30nbdcya46diwjd"; + }; + } + { + root = "github.com/mitchellh/iochan"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } + { + root = "github.com/mitchellh/mapstructure"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "mapstructure"; + rev = "743fcf103ac7cdbc159e540d9d0e3a7889b87d68"; + sha256 = "1qqxsnxabd7c04n0ip1wmpr2g913qchqrbmblq0shrf5p1hnszgn"; + }; + } + { + root = "github.com/mitchellh/multistep"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "multistep"; + rev = "162146fc57112954184d90266f4733e900ed05a5"; + sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3"; + }; + } + { + root = "github.com/mitchellh/osext"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "osext"; + rev = "0dd3f918b21bec95ace9dc86c7e70266cfc5c702"; + sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23"; + }; + } + { + root = "github.com/mitchellh/panicwrap"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "panicwrap"; + rev = "1aedff2aaa8b8ff7f65ab58e94ef9f593e2e3bf4"; + sha256 = "05brbpc7kizzbs1a128fmjddh7rdyg0jzzxgbvrl58cgklh4yzaa"; + }; + } + { + root = "github.com/rackspace/gophercloud"; + src = fetchFromGitHub { + owner = "rackspace"; + repo = "gophercloud"; + rev = "2285a429874c1365ef6c6d3ceb08b1d428e26aca"; + sha256 = "0py3h64r4wkl2r9j7xlh81nazpg2b0r5ba9iblh6d1380yk4fa7f"; + }; + } + { + root = "github.com/racker/perigee"; + src = fetchFromGitHub { + owner = "racker"; + repo = "perigee"; + rev = "01db3191866051f2ec854c2d876ac1a179d3049c"; + sha256 = "05pmlgwjynbr59bw50zhrklzhr5pgnij9ym5hqvijjrpw3qd9ivf"; + }; + } + { + root = "github.com/ugorji/go"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go"; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } + { + root = "github.com/vmihailenco/msgpack"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "msgpack"; + rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205"; + sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0"; + }; + } + { + root = "github.com/ugorji/go-msgpack"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go-msgpack"; + rev = "75092644046c5e38257395b86ed26c702dc95b92"; + sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + }; + } + { + root = "launchpad.net/mgo"; + src = fetchbzr { + url = "https://launchpad.net/mgo"; + revision = "2"; + sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; + }; + } + { + root = "github.com/vmihailenco/bufio"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "bufio"; + rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; + sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 8d68479dd0e6..23141185f68e 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -8,4 +8,17 @@ stdenv.mkDerivation { }; patches = [ ./2.7.7-fixes.patch ]; buildInputs = [jdk python]; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/tools/parsing/antlr/default.nix b/pkgs/development/tools/parsing/antlr/default.nix index deb8040256b5..e866f61f25a3 100644 --- a/pkgs/development/tools/parsing/antlr/default.nix +++ b/pkgs/development/tools/parsing/antlr/default.nix @@ -8,4 +8,17 @@ stdenv.mkDerivation { md5 = "6a7e70ccece8149b735cc3aaa24241cc"; }; inherit jre; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix new file mode 100644 index 000000000000..a0f7922b1aa8 --- /dev/null +++ b/pkgs/development/tools/sqsh/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, freetds, readline }: + +stdenv.mkDerivation rec { + version = "2.5.16.1"; + name = "sqsh-${version}"; + + src = fetchurl { + url = "http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sq/sqsh/sqsh/sqsh-2.5/${name}.tgz"; + sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; + }; + + preConfigure = + '' + export SYBASE=${freetds} + ''; + + buildInputs = [ + freetds + readline + ]; + + meta = { + description = "SQSH is command line tool for querying Sybase/MSSQL databases"; + longDescription = + '' + Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), + it is intended as a replacement for the venerable 'isql' program supplied + by Sybase. + ''; + homepage = "http://www.cs.washington.edu/~rose/sqsh/sqsh.html"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix new file mode 100644 index 000000000000..04d2f2ecb8b0 --- /dev/null +++ b/pkgs/games/openxcom/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boostHeaders +, SDL, SDL_image, SDL_mixer, SDL_gfx }: + +let version = "1.0.0"; in +stdenv.mkDerivation { + name = "openxcom-${version}"; + src = fetchurl { + url = http://openxcom.org/file/1726/; + sha256 = "1rmg10nklvf86ckbbssyvbg5cd4p7in5zq3mas2yyffdjk9i40v6"; + name = "openxcom-${version}.tar.gz"; + }; + + buildInputs = [ cmake mesa zlib openssl libyamlcpp boostHeaders + SDL SDL_image SDL_mixer SDL_gfx ]; + + meta = { + description = "Open source clone of UFO: Enemy Unknown"; + homepage = http://openxcom.org; + repositories.git = https://github.com/SupSuper/OpenXcom.git; + maintainers = [ stdenv.lib.maintainers.page ]; + platforms = stdenv.lib.platforms.linux; + license = "GPLv3"; + }; + +} diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 80be4ec85957..51149d4f2607 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "steam-${version}"; src = fetchurl { - url = "http://repo.steampowered.com/steam/archive/precise/steam-launcher_${version}_all.deb"; + url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam-launcher_${version}_all.deb"; sha256 = "1z1cnlr2qw2ndnqsfwjck9617m2p0f3p9q9409vczj909h2a9wyk"; }; @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { stdenv.mkDerivation { name = "steam-1.0.0.42"; src = fetchurl { - url = http://repo.steampowered.com/steam/archive/precise/steam-launcher_1.0.0.42_all.deb; + url = http://repo.steampowered.com/steam/pool/steam/s/steam/steam-launcher_1.0.0.42_all.deb; sha256 = "1jyvk0h1z78sdpvl4hs1kdvr6z2kwamf09vjgjx1f6j04kgqrfbw"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 020d60fa3fae..c7144b96a3d7 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, unzip, SDL, mesa, openal, curl }: stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.2.009"; + version = "4.2.018"; srcs = [ (fetchurl { - url = "http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip"; - sha256 = "0m423zy6l1z4kxz55knlh1ypnqq58ghh08i8ziv4lm00ygm6mx2i"; + url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full018.zip"; + sha256 = "10710c5b762687a75a7abd3cc56de005ce12dcb7ac14c08f40bcb4e9d96f4e83"; }) (fetchurl { - url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.tar.gz"; - sha256 = "1299j0i94697m2bbcgraxfbb7q1g6nc43l1xqlgqvcsjp799mwwn"; + url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.018.tar.gz"; + sha256 = "c1fb3eb3a1e526247352b1c6abb5432b8a9b8730731ef917e4e5d21a152fb494"; }) ]; buildInputs = [ unzip SDL mesa openal curl ]; - sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.007"; + sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.018"; configurePhase = '' echo "USE_OPENAL = 1" > Makefile.local echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index fdf3aa91e2b0..cb9974580d87 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, expat, x11, freetype}: +{ stdenv, fetchurl, perl, expat, x11, freetype }: # !!! assert freetype == xlibs.freetype @@ -10,8 +10,21 @@ stdenv.mkDerivation { sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; - buildInputs = [perl expat x11 freetype]; + buildInputs = [ perl expat x11 freetype ]; # Zoom doesn't add the right directory in the include path. - CFLAGS = ["-I" (freetype + "/include/freetype2")]; + CFLAGS = [ "-I" (freetype + "/include/freetype2") ]; + + meta = with stdenv.lib; { + description = "Player for Z-Code, TADS and HUGO stories or games, usually text adventures ('interactive fiction')"; + longDescription = '' + Zoom is a player for Z-Code, TADS and HUGO stories or games. These are + usually text adventures ('interactive fiction'), and were first created + by Infocom with the Zork series of games. Throughout the 80's, Infocom + released many interactive fiction stories before their ambitions to enter + the database market finally brought them low. + ''; + license = licenses.gpl3; + platforms = platforms.linux; + }; } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index f47902cd0bf1..3dd3d4bc7311 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -2,13 +2,13 @@ , cabextract, unzip, p7zip, gnused, gnugrep, bash } : stdenv.mkDerivation rec { - rev = "1083"; + rev = "1199"; name = "winetricks-${rev}"; src = fetchsvn { url = "http://winetricks.googlecode.com/svn/trunk"; inherit rev; - sha256 = "0zakwn7g2ni6xw92i1y3pngyaxsr93714s4jy11adf7rxdkj0a32"; + sha256 = "1kji1n6ps09g8xnl9m7vqk3vkl03abzwnc43c52i8p0adnv06khb"; }; buildInputs = [ perl which ]; @@ -28,4 +28,3 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } - diff --git a/pkgs/misc/maven/default.nix b/pkgs/misc/maven/default.nix index ec2b57e222a0..8367e6ea72a1 100644 --- a/pkgs/misc/maven/default.nix +++ b/pkgs/misc/maven/default.nix @@ -1,15 +1,24 @@ -{stdenv, fetchurl, jdk, makeWrapper}: +{ stdenv, fetchurl, jdk, makeWrapper }: assert jdk != null; stdenv.mkDerivation { - name = "apache-maven-3.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz; - sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk"; - }; - - buildInputs = [makeWrapper]; - inherit jdk; + name = "apache-maven-3.0.4"; + + builder = ./builder.sh; + + src = fetchurl { + url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz; + sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk"; + }; + + buildInputs = [ makeWrapper ]; + + inherit jdk; + + meta = with stdenv.lib; { + description = "Build automation tool (used primarily for Java projects)"; + homepage = http://maven.apache.org/; + license = licenses.asl20; + }; } diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 5b822969968c..84d67b96d17f 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }: +{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.0.27"; + name = "alsa-plugins-1.0.28"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2" "http://alsa.cybermirror.org/plugins/${name}.tar.bz2" ]; - sha256 = "0ddbycq4cn9mc8xin0vh1af0zywz2rc2xyrs6qbayyyxq8vhrg8b"; + sha256 = "081is33afhykb4ysll8s6gh0d6nm1cglslj9ck0disbyl3qqlvs2"; }; buildInputs = - [ pkgconfig alsaLib ] + [ pkgconfig alsaLib libogg ] ++ stdenv.lib.optional (pulseaudio != null) pulseaudio ++ stdenv.lib.optional (jackaudio != null) jackaudio; diff --git a/pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch b/pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch new file mode 100644 index 000000000000..5596c0ebcf2e --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch @@ -0,0 +1,17 @@ +Add channel parameter to cfg80211_ibss_joined call + +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -1841,7 +1841,12 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev, + wl_get_assoc_ies(wl); + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL); ++#else ++ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, ++ &wl->conf->channel, GFP_KERNEL); ++#endif + set_bit(WL_STATUS_CONNECTED, &wl->status); + wl->profile->active = true; + } diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 5955543f8e1e..1ed13c2e4501 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { patches = [ ./linux-recent.patch ./license.patch + ./cfg80211_ibss_joined-channel-parameter.patch ]; makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 62a3cfa631e7..87e8fa5b074e 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gradm-${version}"; - version = "3.0-201401291757"; + version = "3.0-201405281853"; src = fetchurl { url = "http://grsecurity.net/stable/${name}.tar.gz"; - sha256 = "19p7kaqbvf41scc63n69b5v5xzpw3mbf5zy691rply8hdm7736cw"; + sha256 = "0yjmbjhm71cik5j8h2prgk40wki3sflwbf2zqmc4pwaqlvis9s2f"; }; buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ]; diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index ac2ba6113868..6ee5345f498c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.41"; + version = "3.10.45"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0rpz2nxay0a4573dnnb8szq3ly3bhjd6wrz5z6iw3kpj19crs0r1"; + sha256 = "0bsmqszc86d33g6qpwgrdckgrd1x37087br3vsc5151s2p22rk1f"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 33bed4213b41..7d5ff606eb98 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.22"; + version = "3.12.23"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0c9rw11iihjimqb6mdmwn4q67ds7jg4qibj5ijj5pdmkdqzj7g54"; + sha256 = "0aa9vnyk4p6hg4fp4rm4a95cn4p16j2dfrhc3cfznpcdkpi5q9m7"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix deleted file mode 100644 index d84cec235cec..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.13.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.13.11"; - extraMeta.branch = "3.13"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1nhi5m0nnrb7v2gqpa3181p32k5hm5jwkf647vs80r14750gxlpw"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 8675c529bde7..f867309529f1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.6"; + version = "3.14.9"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1wk3zdka9n49ixl2s7djavbk0b2nd0772gbmiaxi9mljah9inlhw"; + sha256 = "0rm68hzkxzzh6a1nw6fsxbg43d4b88957ail7b9ga589cagf3p94"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix index 531b85b789aa..68f58f83a2f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.15.1"; + version = "3.15.2"; extraMeta.branch = "3.15"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0bmzag945bb9v20xc2f6i4syx456prai3qj5cxhm8cb76wby4s8b"; + sha256 = "09nq8q84xn6lwzdnn36pzfiqhn1lapi60yxn4hifb7v9ymhc5sv6"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index d5fd820cac0b..80b9ff614d66 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.59"; + version = "3.2.60"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0a62nmn90k3g48m8g3y27q6a0qwa3k2s6synss7378kdi4f938i4"; + sha256 = "10nigsr0i08ykmkbalsjm4v283iy42zxgxxl77h6484xxb52bw7s"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 165baf0a17f4..27efaac44889 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.91"; + version = "3.4.95"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "003l9i14m5ci2232wl68nxbgi0ipkzq00yfgxfp9cmh2sipxy1dk"; + sha256 = "1rv2jsfc2m12nk293v12rvvqnicyh73pwp6bcb28jdqdhm95k6l6"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 541384a8c118..bafac2fc58df 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -2,13 +2,13 @@ import ./generic.nix (args // rec { # Reason to add: RTL8192EE - version = "3.16-rc1"; - modDirVersion = "3.16.0-rc1"; + version = "3.16-rc2"; + modDirVersion = "3.16.0-rc2"; extraMeta.branch = "3.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "1y2ssifw6db40mr4j6k9c0kjwb4ssrrps74pc38krq4d6yzinhmq"; + sha256 = "12bxf62qqsf471ak6rj4gbvvjsybsamgwj9p8bphr98dp14js27w"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c0cca64967c4..5a6a7d15c3c9 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,24 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.2.59"; - revision = "201406042136"; + { kversion = "3.14.9"; + revision = "201406262057"; branch = "stable"; - sha256 = "01frz80n7zl3yyl11d1i517n0rw8ivb46cl0swp3zgjx29adwc8s"; - }; - - grsecurity_vserver = grsecPatch - { kversion = "3.2.59"; - revision = "vs2.3.2.16-201406042138"; - branch = "vserver"; - sha256 = "1vlmcf2fshxvhsparmvwlbn3gpccc8zjc341sjwsmyc3i8csmysr"; + sha256 = "0rrcmlaz69028fwl45xnif1dc9wnl7lnrry1280mdg764wrc6g0n"; }; grsecurity_unstable = grsecPatch - { kversion = "3.14.5"; - revision = "201406021708"; + { kversion = "3.15.2"; + revision = "201406262058"; branch = "test"; - sha256 = "002sbbcmvg6wa41a1q8vgf3zcjakns72dc885b6jml0v396hb5c6"; + sha256 = "02r9xasg1hiw3bynwh50r9cqjzwffmhsyg4gmiyzs58izivl1hvd"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/spl/3_12-compat.patch b/pkgs/os-specific/linux/spl/3_12-compat.patch deleted file mode 100644 index b196098b7df2..000000000000 --- a/pkgs/os-specific/linux/spl/3_12-compat.patch +++ /dev/null @@ -1,429 +0,0 @@ -commit c3d9c0df3ee8d43db22815ebbfbe8b803fa46e46 -Author: Richard Yao <ryao@gentoo.org> -Date: Tue Nov 5 11:35:54 2013 -0500 - - Linux 3.12 compat: New shrinker API - - torvalds/linux@24f7c6 introduced a new shrinker API while - torvalds/linux@a0b021 dropped support for the old shrinker API. - This patch adds support for the new shrinker API by wrapping - the old one with the new one. - - This change also reorganizes the autotools checks on the shrinker - API such that the configure script will fail early if an unknown - API is encountered in the future. - - Support for the set_shrinker() API which was used by Linux 2.6.22 - and older has been dropped. As a general rule compatibility is - only maintained back to Linux 2.6.26. - - Signed-off-by: Richard Yao <ryao@gentoo.org> - Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> - Closes zfsonlinux/zfs#1732 - Closes zfsonlinux/zfs#1822 - Closes #293 - Closes #307 - -diff --git a/config/spl-build.m4 b/config/spl-build.m4 -index b0e3348..7d744db 100644 ---- a/config/spl-build.m4 -+++ b/config/spl-build.m4 -@@ -27,8 +27,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ - SPL_AC_TYPE_ATOMIC64_XCHG - SPL_AC_TYPE_UINTPTR_T - SPL_AC_2ARGS_REGISTER_SYSCTL -- SPL_AC_SET_SHRINKER -- SPL_AC_3ARGS_SHRINKER_CALLBACK -+ SPL_AC_SHRINKER_CALLBACK - SPL_AC_PATH_IN_NAMEIDATA - SPL_AC_TASK_CURR - SPL_AC_CTL_UNNUMBERED -@@ -885,37 +884,18 @@ AC_DEFUN([SPL_AC_2ARGS_REGISTER_SYSCTL], - ]) - ]) - --dnl # --dnl # 2.6.23 API change --dnl # Old set_shrinker API replaced with register_shrinker --dnl # --AC_DEFUN([SPL_AC_SET_SHRINKER], [ -- AC_MSG_CHECKING([whether set_shrinker() available]) -- SPL_LINUX_TRY_COMPILE([ -- #include <linux/mm.h> -- ],[ -- return set_shrinker(DEFAULT_SEEKS, NULL); -- ],[ -- AC_MSG_RESULT([yes]) -- AC_DEFINE(HAVE_SET_SHRINKER, 1, -- [set_shrinker() available]) -- ],[ -- AC_MSG_RESULT([no]) -- ]) --]) -- --dnl # --dnl # 2.6.35 API change, --dnl # Add context to shrinker callback --dnl # --AC_DEFUN([SPL_AC_3ARGS_SHRINKER_CALLBACK], -- [AC_MSG_CHECKING([whether shrinker callback wants 3 args]) -+AC_DEFUN([SPL_AC_SHRINKER_CALLBACK],[ - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="-Werror" -+ dnl # -+ dnl # 2.6.23 to 2.6.34 API change -+ dnl # ->shrink(int nr_to_scan, gfp_t gfp_mask) -+ dnl # -+ AC_MSG_CHECKING([whether old 2-argument shrinker exists]) - SPL_LINUX_TRY_COMPILE([ - #include <linux/mm.h> - -- int shrinker_cb(struct shrinker *, int, unsigned int); -+ int shrinker_cb(int nr_to_scan, gfp_t gfp_mask); - ],[ - struct shrinker cache_shrinker = { - .shrink = shrinker_cb, -@@ -924,10 +904,86 @@ AC_DEFUN([SPL_AC_3ARGS_SHRINKER_CALLBACK], - register_shrinker(&cache_shrinker); - ],[ - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1, -- [shrinker callback wants 3 args]) -+ AC_DEFINE(HAVE_2ARGS_OLD_SHRINKER_CALLBACK, 1, -+ [old shrinker callback wants 2 args]) - ],[ - AC_MSG_RESULT(no) -+ dnl # -+ dnl # 2.6.35 - 2.6.39 API change -+ dnl # ->shrink(struct shrinker *, -+ dnl # int nr_to_scan, gfp_t gfp_mask) -+ dnl # -+ AC_MSG_CHECKING([whether old 3-argument shrinker exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include <linux/mm.h> -+ -+ int shrinker_cb(struct shrinker *, int nr_to_scan, -+ gfp_t gfp_mask); -+ ],[ -+ struct shrinker cache_shrinker = { -+ .shrink = shrinker_cb, -+ .seeks = DEFAULT_SEEKS, -+ }; -+ register_shrinker(&cache_shrinker); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1, -+ [old shrinker callback wants 3 args]) -+ ],[ -+ AC_MSG_RESULT(no) -+ dnl # -+ dnl # 3.0 - 3.11 API change -+ dnl # ->shrink(struct shrinker *, -+ dnl # struct shrink_control *sc) -+ dnl # -+ AC_MSG_CHECKING( -+ [whether new 2-argument shrinker exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include <linux/mm.h> -+ -+ int shrinker_cb(struct shrinker *, -+ struct shrink_control *sc); -+ ],[ -+ struct shrinker cache_shrinker = { -+ .shrink = shrinker_cb, -+ .seeks = DEFAULT_SEEKS, -+ }; -+ register_shrinker(&cache_shrinker); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_2ARGS_NEW_SHRINKER_CALLBACK, 1, -+ [new shrinker callback wants 2 args]) -+ ],[ -+ AC_MSG_RESULT(no) -+ dnl # -+ dnl # 3.12 API change, -+ dnl # ->shrink() is logically split in to -+ dnl # ->count_objects() and ->scan_objects() -+ dnl # -+ AC_MSG_CHECKING( -+ [whether ->count_objects callback exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include <linux/mm.h> -+ -+ unsigned long shrinker_cb( -+ struct shrinker *, -+ struct shrink_control *sc); -+ ],[ -+ struct shrinker cache_shrinker = { -+ .count_objects = shrinker_cb, -+ .scan_objects = shrinker_cb, -+ .seeks = DEFAULT_SEEKS, -+ }; -+ register_shrinker(&cache_shrinker); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_SPLIT_SHRINKER_CALLBACK, -+ 1, [->count_objects exists]) -+ ],[ -+ AC_MSG_ERROR(error) -+ ]) -+ ]) -+ ]) - ]) - EXTRA_KCFLAGS="$tmp_flags" - ]) -diff --git a/include/linux/mm_compat.h b/include/linux/mm_compat.h -index cb1bef9..37c9b08 100644 ---- a/include/linux/mm_compat.h -+++ b/include/linux/mm_compat.h -@@ -148,107 +148,167 @@ extern shrink_icache_memory_t shrink_icache_memory_fn; - #endif /* HAVE_SHRINK_ICACHE_MEMORY */ - - /* -- * Linux 2.6. - 2.6. Shrinker API Compatibility. -+ * Due to frequent changes in the shrinker API the following -+ * compatibility wrappers should be used. They are as follows: -+ * -+ * SPL_SHRINKER_DECLARE is used to declare the shrinker which is -+ * passed to spl_register_shrinker()/spl_unregister_shrinker(). Use -+ * shrinker_name to set the shrinker variable name, shrinker_callback -+ * to set the callback function, and seek_cost to define the cost of -+ * reclaiming an object. -+ * -+ * SPL_SHRINKER_DECLARE(shrinker_name, shrinker_callback, seek_cost); -+ * -+ * SPL_SHRINKER_CALLBACK_FWD_DECLARE is used when a forward declaration -+ * of the shrinker callback function is required. Only the callback -+ * function needs to be passed. -+ * -+ * SPL_SHRINKER_CALLBACK_FWD_DECLARE(shrinker_callback); -+ * -+ * SPL_SHRINKER_CALLBACK_WRAPPER is used to declare the callback function -+ * which is registered with the shrinker. This function will call your -+ * custom shrinker which must use the following prototype. Notice the -+ * leading __'s, these must be appended to the callback_function name. -+ * -+ * int __shrinker_callback(struct shrinker *, struct shrink_control *) -+ * SPL_SHRINKER_CALLBACK_WRAPPER(shrinker_callback);a -+ * -+ * -+ * Example: -+ * -+ * SPL_SHRINKER_CALLBACK_FWD_DECLARE(my_shrinker_fn); -+ * SPL_SHRINKER_DECLARE(my_shrinker, my_shrinker_fn, 1); -+ * -+ * static int -+ * __my_shrinker_fn(struct shrinker *shrink, struct shrink_control *sc) -+ * { -+ * if (sc->nr_to_scan) { -+ * ...scan objects in the cache and reclaim them... -+ * } -+ * -+ * ...calculate number of objects in the cache... -+ * -+ * return (number of objects in the cache); -+ * } -+ * SPL_SHRINKER_CALLBACK_WRAPPER(my_shrinker_fn); - */ --#ifdef HAVE_SET_SHRINKER --typedef struct spl_shrinker { -- struct shrinker *shrinker; -- shrinker_t fn; -- int seeks; --} spl_shrinker_t; -- --static inline void --spl_register_shrinker(spl_shrinker_t *ss) --{ -- ss->shrinker = set_shrinker(ss->seeks, ss->fn); --} - --static inline void --spl_unregister_shrinker(spl_shrinker_t *ss) --{ -- remove_shrinker(ss->shrinker); --} -+#define spl_register_shrinker(x) register_shrinker(x) -+#define spl_unregister_shrinker(x) unregister_shrinker(x) - --# define SPL_SHRINKER_DECLARE(s, x, y) \ -- static spl_shrinker_t s = { \ -- .shrinker = NULL, \ -- .fn = x, \ -- .seeks = y \ -- } -- --# define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -- static int fn(int, unsigned int) --# define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ --static int \ --fn(int nr_to_scan, unsigned int gfp_mask) \ --{ \ -- struct shrink_control sc; \ -- \ -- sc.nr_to_scan = nr_to_scan; \ -- sc.gfp_mask = gfp_mask; \ -- \ -- return __ ## fn(NULL, &sc); \ -+/* -+ * Linux 2.6.23 - 2.6.34 Shrinker API Compatibility. -+ */ -+#if defined(HAVE_2ARGS_OLD_SHRINKER_CALLBACK) -+#define SPL_SHRINKER_DECLARE(s, x, y) \ -+static struct shrinker s = { \ -+ .shrink = x, \ -+ .seeks = y \ - } - --#else -+#define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -+static int fn(int nr_to_scan, unsigned int gfp_mask) - --# define spl_register_shrinker(x) register_shrinker(x) --# define spl_unregister_shrinker(x) unregister_shrinker(x) --# define SPL_SHRINKER_DECLARE(s, x, y) \ -- static struct shrinker s = { \ -- .shrink = x, \ -- .seeks = y \ -- } -+#define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ -+static int \ -+fn(int nr_to_scan, unsigned int gfp_mask) \ -+{ \ -+ struct shrink_control sc; \ -+ \ -+ sc.nr_to_scan = nr_to_scan; \ -+ sc.gfp_mask = gfp_mask; \ -+ \ -+ return (__ ## fn(NULL, &sc)); \ -+} - - /* -- * Linux 2.6. - 2.6. Shrinker API Compatibility. -+ * Linux 2.6.35 to 2.6.39 Shrinker API Compatibility. - */ --# if defined(HAVE_SHRINK_CONTROL_STRUCT) --# define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -- static int fn(struct shrinker *, struct shrink_control *) --# define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ --static int \ --fn(struct shrinker *shrink, struct shrink_control *sc) { \ -- return __ ## fn(shrink, sc); \ -+#elif defined(HAVE_3ARGS_SHRINKER_CALLBACK) -+#define SPL_SHRINKER_DECLARE(s, x, y) \ -+static struct shrinker s = { \ -+ .shrink = x, \ -+ .seeks = y \ -+} -+ -+#define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -+static int fn(struct shrinker *, int, unsigned int) -+ -+#define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ -+static int \ -+fn(struct shrinker *shrink, int nr_to_scan, unsigned int gfp_mask) \ -+{ \ -+ struct shrink_control sc; \ -+ \ -+ sc.nr_to_scan = nr_to_scan; \ -+ sc.gfp_mask = gfp_mask; \ -+ \ -+ return (__ ## fn(shrink, &sc)); \ - } - - /* -- * Linux 2.6. - 2.6. Shrinker API Compatibility. -+ * Linux 3.0 to 3.11 Shrinker API Compatibility. - */ --# elif defined(HAVE_3ARGS_SHRINKER_CALLBACK) --# define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -- static int fn(struct shrinker *, int, unsigned int) --# define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ --static int \ --fn(struct shrinker *shrink, int nr_to_scan, unsigned int gfp_mask) \ --{ \ -- struct shrink_control sc; \ -- \ -- sc.nr_to_scan = nr_to_scan; \ -- sc.gfp_mask = gfp_mask; \ -- \ -- return __ ## fn(shrink, &sc); \ -+#elif defined(HAVE_2ARGS_NEW_SHRINKER_CALLBACK) -+#define SPL_SHRINKER_DECLARE(s, x, y) \ -+static struct shrinker s = { \ -+ .shrink = x, \ -+ .seeks = y \ -+} -+ -+#define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -+static int fn(struct shrinker *, struct shrink_control *) -+ -+#define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ -+static int \ -+fn(struct shrinker *shrink, struct shrink_control *sc) \ -+{ \ -+ return (__ ## fn(shrink, sc)); \ - } - - /* -- * Linux 2.6. - 2.6. Shrinker API Compatibility. -+ * Linux 3.12 and later Shrinker API Compatibility. - */ --# else --# define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -- static int fn(int, unsigned int) --# define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ --static int \ --fn(int nr_to_scan, unsigned int gfp_mask) \ --{ \ -- struct shrink_control sc; \ -- \ -- sc.nr_to_scan = nr_to_scan; \ -- sc.gfp_mask = gfp_mask; \ -- \ -- return __ ## fn(NULL, &sc); \ -+#elif defined(HAVE_SPLIT_SHRINKER_CALLBACK) -+#define SPL_SHRINKER_DECLARE(s, x, y) \ -+static struct shrinker s = { \ -+ .count_objects = x ## _count_objects, \ -+ .scan_objects = x ## _scan_objects, \ -+ .seeks = y \ - } - --# endif --#endif /* HAVE_SET_SHRINKER */ -+#define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -+static unsigned long fn ## _count_objects(struct shrinker *, \ -+ struct shrink_control *); \ -+static unsigned long fn ## _scan_objects(struct shrinker *, \ -+ struct shrink_control *) -+ -+#define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ -+static unsigned long \ -+fn ## _count_objects(struct shrinker *shrink, struct shrink_control *sc)\ -+{ \ -+ int __ret__; \ -+ \ -+ sc->nr_to_scan = 0; \ -+ __ret__ = __ ## fn(NULL, sc); \ -+ \ -+ /* Errors may not be returned and must be converted to zeros */ \ -+ return ((__ret__ < 0) ? 0 : __ret__); \ -+} \ -+ \ -+static unsigned long \ -+fn ## _scan_objects(struct shrinker *shrink, struct shrink_control *sc) \ -+{ \ -+ int __ret__; \ -+ \ -+ __ret__ = __ ## fn(NULL, sc); \ -+ return ((__ret__ < 0) ? SHRINK_STOP : __ret__); \ -+} -+#else -+/* -+ * Linux 2.x to 2.6.22, or a newer shrinker API has been introduced. -+ */ -+#error "Unknown shrinker callback" -+#endif - - #endif /* SPL_MM_COMPAT_H */ diff --git a/pkgs/os-specific/linux/spl/3_13-compat-1.patch b/pkgs/os-specific/linux/spl/3_13-compat-1.patch deleted file mode 100644 index 40946931c802..000000000000 --- a/pkgs/os-specific/linux/spl/3_13-compat-1.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3e96de17d723d6f6c9e2fd04b059b50d4e0bbef0 Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@gentoo.org> -Date: Thu, 8 Aug 2013 04:30:55 -0400 -Subject: [PATCH] Linux 3.13 compat: Remove unused flags variable from - __cv_init() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 4.8.1 complained about an unused flags variable when building -against Linux 2.6.26.8: - -/var/tmp/portage/sys-kernel/spl-9999/work/spl-9999/module/spl/../../module/spl/spl-condvar.c: -In function ‘__cv_init’: -/var/tmp/portage/sys-kernel/spl-9999/work/spl-9999/module/spl/../../module/spl/spl-condvar.c:39:6: -error: variable ‘flags’ set but not used -[-Werror=unused-but-set-variable] - int flags = KM_SLEEP; - ^ - cc1: all warnings being treated as errors - -Additionally, the superfluous code uses a preempt_count variable that is -no longer available on Linux 3.13. Deleting the unnecessary code fixes a -Linux 3.13 compatibility issue. - -Signed-off-by: Richard Yao <ryao@gentoo.org> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #312 ---- - module/spl/spl-condvar.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/module/spl/spl-condvar.c b/module/spl/spl-condvar.c -index 283648a..8236412 100644 ---- a/module/spl/spl-condvar.c -+++ b/module/spl/spl-condvar.c -@@ -36,8 +36,6 @@ - void - __cv_init(kcondvar_t *cvp, char *name, kcv_type_t type, void *arg) - { -- int flags = KM_SLEEP; -- - SENTRY; - ASSERT(cvp); - ASSERT(name == NULL); -@@ -51,12 +49,6 @@ - atomic_set(&cvp->cv_refs, 1); - cvp->cv_mutex = NULL; - -- /* We may be called when there is a non-zero preempt_count or -- * interrupts are disabled is which case we must not sleep. -- */ -- if (current_thread_info()->preempt_count || irqs_disabled()) -- flags = KM_NOSLEEP; -- - SEXIT; - } - EXPORT_SYMBOL(__cv_init); --- -1.8.5.5 - diff --git a/pkgs/os-specific/linux/spl/3_13-compat-2.patch b/pkgs/os-specific/linux/spl/3_13-compat-2.patch deleted file mode 100644 index 1f487f042f81..000000000000 --- a/pkgs/os-specific/linux/spl/3_13-compat-2.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 50a0749eba31e821a7edf286f1e3b149f7d13c59 Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@gentoo.org> -Date: Mon, 25 Nov 2013 11:22:33 -0500 -Subject: [PATCH] Linux 3.13 compat: Pass NULL for new delegated inode argument - -This check was originally added for SLES10, a093c6a, to check for -a 'struct vfsmount *' argument which they added. However, since -SLES10 is based on a 2.6.16 kernel which is no longer supported -this functionality was dropped. The checks were refactored to -support Linux 3.13 without concern for historical versions. - -Signed-off-by: Richard Yao <ryao@gentoo.org> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #312 ---- - config/spl-build.m4 | 52 ++++++++++++++++++++++++++++++++++++++++---------- - module/spl/spl-vnode.c | 22 ++++++++++++--------- - 2 files changed, 55 insertions(+), 19 deletions(-) - -diff --git a/config/spl-build.m4 b/config/spl-build.m4 -index 7d744db..8426780 100644 ---- a/config/spl-build.m4 -+++ b/config/spl-build.m4 -@@ -1842,41 +1842,73 @@ AC_DEFUN([SPL_AC_SET_FS_PWD_WITH_CONST], - EXTRA_KCFLAGS="$tmp_flags" - ]) - --dnl # --dnl # SLES API change, never adopted in mainline, --dnl # Third 'struct vfsmount *' argument removed. --dnl # - AC_DEFUN([SPL_AC_2ARGS_VFS_UNLINK], - [AC_MSG_CHECKING([whether vfs_unlink() wants 2 args]) - SPL_LINUX_TRY_COMPILE([ - #include <linux/fs.h> - ],[ -- vfs_unlink(NULL, NULL); -+ vfs_unlink((struct inode *) NULL, (struct dentry *) NULL); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_2ARGS_VFS_UNLINK, 1, - [vfs_unlink() wants 2 args]) - ],[ - AC_MSG_RESULT(no) -+ dnl # -+ dnl # Linux 3.13 API change -+ dnl # Added delegated inode -+ dnl # -+ AC_MSG_CHECKING([whether vfs_unlink() wants 3 args]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include <linux/fs.h> -+ ],[ -+ vfs_unlink((struct inode *) NULL, -+ (struct dentry *) NULL, -+ (struct inode **) NULL); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_3ARGS_VFS_UNLINK, 1, -+ [vfs_unlink() wants 3 args]) -+ ],[ -+ AC_MSG_ERROR(no) -+ ]) -+ - ]) - ]) - --dnl # --dnl # SLES API change, never adopted in mainline, --dnl # Third and sixth 'struct vfsmount *' argument removed. --dnl # - AC_DEFUN([SPL_AC_4ARGS_VFS_RENAME], - [AC_MSG_CHECKING([whether vfs_rename() wants 4 args]) - SPL_LINUX_TRY_COMPILE([ - #include <linux/fs.h> - ],[ -- vfs_rename(NULL, NULL, NULL, NULL); -+ vfs_rename((struct inode *) NULL, (struct dentry *) NULL, -+ (struct inode *) NULL, (struct dentry *) NULL); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_4ARGS_VFS_RENAME, 1, - [vfs_rename() wants 4 args]) - ],[ - AC_MSG_RESULT(no) -+ dnl # -+ dnl # Linux 3.13 API change -+ dnl # Added delegated inode -+ dnl # -+ AC_MSG_CHECKING([whether vfs_rename() wants 5 args]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include <linux/fs.h> -+ ],[ -+ vfs_rename((struct inode *) NULL, -+ (struct dentry *) NULL, -+ (struct inode *) NULL, -+ (struct dentry *) NULL, -+ (struct inode **) NULL); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_5ARGS_VFS_RENAME, 1, -+ [vfs_rename() wants 5 args]) -+ ],[ -+ AC_MSG_ERROR(no) -+ ]) - ]) - ]) - -diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c -index 0784ff2..5496067 100644 ---- a/module/spl/spl-vnode.c -+++ b/module/spl/spl-vnode.c -@@ -334,7 +334,11 @@ - if (inode) - ihold(inode); - -+#ifdef HAVE_2ARGS_VFS_UNLINK - rc = vfs_unlink(parent.dentry->d_inode, dentry); -+#else -+ rc = vfs_unlink(parent.dentry->d_inode, dentry, NULL); -+#endif /* HAVE_2ARGS_VFS_UNLINK */ - exit1: - dput(dentry); - } else { -@@ -412,10 +416,10 @@ - - #ifdef HAVE_4ARGS_VFS_RENAME - rc = vfs_rename(old_dir->d_inode, old_dentry, -- new_dir->d_inode, new_dentry); -+ new_dir->d_inode, new_dentry); - #else -- rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt, -- new_dir->d_inode, new_dentry, newnd.nd_mnt); -+ rc = vfs_rename(old_dir->d_inode, old_dentry, -+ new_dir->d_inode, new_dentry, NULL); - #endif /* HAVE_4ARGS_VFS_RENAME */ - exit4: - unlock_rename(new_dir, old_dir); -@@ -478,9 +482,9 @@ - if (inode) - atomic_inc(&inode->i_count); - #ifdef HAVE_2ARGS_VFS_UNLINK -- rc = vfs_unlink(nd.nd_dentry->d_inode, dentry); -+ rc = vfs_unlink(nd.nd_dentry->d_inode, dentry); - #else -- rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, nd.nd_mnt); -+ rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, NULL); - #endif /* HAVE_2ARGS_VFS_UNLINK */ - exit2: - dput(dentry); -@@ -571,11 +575,11 @@ - SGOTO(exit5, rc); - - #ifdef HAVE_4ARGS_VFS_RENAME -- rc = vfs_rename(old_dir->d_inode, old_dentry, -- new_dir->d_inode, new_dentry); -+ rc = vfs_rename(old_dir->d_inode, old_dentry, -+ new_dir->d_inode, new_dentry); - #else -- rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt, -- new_dir->d_inode, new_dentry, newnd.nd_mnt); -+ rc = vfs_rename(old_dir->d_inode, old_dentry, -+ new_dir->d_inode, new_dentry, NULL); - #endif /* HAVE_4ARGS_VFS_RENAME */ - exit5: - dput(new_dentry); --- -1.8.5.5 - diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index e74d0f0ef752..944fb6ff554c 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.2-${kernel.version}"; + name = "spl-0.6.3-${kernel.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz; - sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.3.tar.gz; + sha256 = "1qqzyj2if5wai4jiwml4i8s6v8k7hbi7jmiph800lhkk5j8s72l9"; }; - patches = [ ./install_prefix.patch ./3_12-compat.patch ./3_13-compat-1.patch ./3_13-compat-2.patch ./const.patch ]; + patches = [ ./install_prefix.patch ./const.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index ba7ccc7348ee..d3ed285ccfef 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.3pre-${kernel.version}"; + name = "spl-0.6.3-${kernel.version}"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "89aa97059d7ddad668a5118aef7914743162a5e8"; - sha256 = "1x4pba26zbyly8xd9q8s4av9v88ck0n9szxx72wzcn0s25rsyanx"; + rev = "31cb5383bff0fddc5058973e32a6f2c446d45e59"; + sha256 = "0mcivbddms8kbapbs9x6achqyvh5i6h1rd2b3jm8g5yjn0flc5gl"; }; - patches = [ ./install_prefix.patch ]; + patches = [ ./install_prefix.patch ./const.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/zfs/3.13-compat.patch b/pkgs/os-specific/linux/zfs/3.13-compat.patch deleted file mode 100644 index f89d38f72acc..000000000000 --- a/pkgs/os-specific/linux/zfs/3.13-compat.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 729210564a5325e190fc4fba22bf17bacf957ace Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@gentoo.org> -Date: Mon, 25 Nov 2013 12:21:21 -0500 -Subject: [PATCH] Properly ignore bdi_setup_and_register return value - -This broke compilation against Linux 3.13 and GCC 4.7.3. - -Signed-off-by: Richard Yao <ryao@gentoo.org> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1906 ---- - config/kernel-bdi-setup-and-register.m4 | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/config/kernel-bdi-setup-and-register.m4 b/config/kernel-bdi-setup-and-register.m4 -index 4196091..cb8ed67 100644 ---- a/config/kernel-bdi-setup-and-register.m4 -+++ b/config/kernel-bdi-setup-and-register.m4 -@@ -1,12 +1,14 @@ - dnl # - dnl # 2.6.34 API change --dnl # The bdi_setup_and_register() helper function is avilable and -+dnl # The bdi_setup_and_register() helper function is available and - dnl # exported by the kernel. This is a trivial helper function but - dnl # using it significantly simplifies the code surrounding setting - dnl # up and tearing down the bdi structure. - dnl # - AC_DEFUN([ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER], - [AC_MSG_CHECKING([whether bdi_setup_and_register() is available]) -+ tmp_flags="$EXTRA_KCFLAGS" -+ EXTRA_KCFLAGS="-Wno-unused-result" - ZFS_LINUX_TRY_COMPILE_SYMBOL([ - #include <linux/backing-dev.h> - ], [ -@@ -18,4 +20,5 @@ AC_DEFUN([ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER], - ], [ - AC_MSG_RESULT(no) - ]) -+ EXTRA_KCFLAGS="$tmp_flags" - ]) --- -1.8.5.5 - diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index f8f3c9ed3165..aec95832d16c 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.2-${kernel.version}"; + name = "zfs-0.6.3-${kernel.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz; - sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.3.tar.gz; + sha256 = "06rrip9fxn13x6qnyp6br68r9pcygb95lld25hnnj88m2vagvg19"; }; - patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./libblkid-1db7b9b.patch ./gcc-4.8.patch ./3.13-compat.patch ]; + patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ]; @@ -28,9 +28,12 @@ stdenv.mkDerivation { ''; configureFlags = '' + --disable-systemd --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build --with-spl=${spl}/libexec/spl + --with-dracutdir=$$out/lib/dracut + --with-udevdir=$$out/lib/udev ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/zfs/gcc-4.8.patch b/pkgs/os-specific/linux/zfs/gcc-4.8.patch deleted file mode 100644 index 341360163761..000000000000 --- a/pkgs/os-specific/linux/zfs/gcc-4.8.patch +++ /dev/null @@ -1,114 +0,0 @@ -commit 0f62f3f9abc4bfa0bcafee9bfa3d55e91dcb371d -Author: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Tue Jan 14 09:39:13 2014 -0800 - - Disable GCCs aggressive loop optimization - - GCC >+ 4.8's aggressive loop optimization breaks some of the iterators - over the dn_blkptr[] pseudo-array in dnode_phys. Since dn_blkptr[] is - defined as a single-element array, GCC believes an iterator can only - access index 0 and will unroll the loop into a single iteration. - - One way to resolve the issue would be to cast the array to a pointer - and fix all the iterators that might break. The only loop where it - is known to cause a problem is this loop in dmu_objset_write_ready(): - - for (i = 0; i < dnp->dn_nblkptr; i++) - bp->blk_fill += dnp->dn_blkptr[i].blk_fill; - - In the common case where dn_nblkptr is 3, the loop is only executed a - single time and "i" is equal to 1 following the loop. - - The specific breakage caused by this problem is that the blk_fill of - root block pointers wouldn't be set properly when more than one blkptr - is in use (when no indrect blocks are needed). - - The simple reproducing sequence is: - - zpool create tank /tank.img - zdb -ddddd tank 0 - - Notice that "fill=31", however, there are two L0 indirect blocks with - "F=31" and "F=5". The fill count should be 36 rather than 31. This - problem causes an assert to be hit in a simple "zdb tank" when built - with --enable-debug. - - However, this approach was not taken because we need to be absolutely - sure we catch all instances of this unwanted optimization. Therefore, - the build system has been updated to detect if GCC supports the - aggressive loop optimization. If it does the optimization will be - explicitly disabled using the -fno-aggressive-loop-optimization option. - - Original-fix-by: Tim Chase <tim@chase2k.com> - Signed-off-by: Tim Chase <tim@chase2k.com> - Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> - Closes #2010 - Closes #2051 - -diff --git a/config/Rules.am b/config/Rules.am -index e3fa5b5..24f9426 100644 ---- a/config/Rules.am -+++ b/config/Rules.am -@@ -1,8 +1,10 @@ - DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h - - AM_LIBTOOLFLAGS = --silent --AM_CFLAGS = -Wall -Wstrict-prototypes --AM_CFLAGS += -fno-strict-aliasing ${NO_UNUSED_BUT_SET_VARIABLE} ${DEBUG_CFLAGS} -+AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes -+AM_CFLAGS += ${NO_UNUSED_BUT_SET_VARIABLE} -+AM_CFLAGS += ${NO_AGGRESSIVE_LOOP_OPTIMIZATIONS} -+AM_CFLAGS += -fno-strict-aliasing - AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT - AM_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 - AM_CPPFLAGS += -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -diff --git a/config/always-no-aggressive-loop-optimizations.m4 b/config/always-no-aggressive-loop-optimizations.m4 -new file mode 100644 -index 0000000..8f2115a ---- /dev/null -+++ b/config/always-no-aggressive-loop-optimizations.m4 -@@ -0,0 +1,20 @@ -+dnl # -+dnl # Check if gcc supports -fno-aggressive-loop-optimizations -+dnl # -+AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_NO_AGGRESSIVE_LOOP_OPTIMIZATIONS], [ -+ AC_MSG_CHECKING([for -fno-aggressive-loop-optimizations support]) -+ -+ saved_flags="$CFLAGS" -+ CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations" -+ -+ AC_RUN_IFELSE([AC_LANG_PROGRAM([], [])], [ -+ NO_AGGRESSIVE_LOOP_OPTIMIZATIONS=-fno-aggressive-loop-optimizations -+ AC_MSG_RESULT([yes]) -+ ], [ -+ NO_AGGRESSIVE_LOOP_OPTIMIZATIONS= -+ AC_MSG_RESULT([no]) -+ ]) -+ -+ CFLAGS="$saved_flags" -+ AC_SUBST([NO_AGGRESSIVE_LOOP_OPTIMIZATIONS]) -+]) -diff --git a/config/kernel.m4 b/config/kernel.m4 -index cbf0ca3..62a9b42 100644 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -104,6 +104,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ - dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other - dnl # compiler options are added by the kernel build system. - KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE" -+ KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_AGGRESSIVE_LOOP_OPTIMIZATIONS" - KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL" - KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\"" - -diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 -index 005185b..477b916 100644 ---- a/config/zfs-build.m4 -+++ b/config/zfs-build.m4 -@@ -62,6 +62,7 @@ AC_DEFUN([ZFS_AC_DEBUG_DMU_TX], [ - - AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [ - ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE -+ ZFS_AC_CONFIG_ALWAYS_NO_AGGRESSIVE_LOOP_OPTIMIZATIONS - ]) - - AC_DEFUN([ZFS_AC_CONFIG], [ diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index cc75011c7da9..ebbbc994d020 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, kernel, spl_git, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.3pre-${kernel.version}"; + name = "zfs-0.6.3-${kernel.version}"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "de39ec11b885f97e6256324ee89eaf75af9852f6"; - sha256 = "02hrhka9hg0vn4z20x7xzwrkr340pv9qwvwj8phjdm5ln321jh33"; + rev = "07dabd234dd51a1e5adc5bd21cddf5b5fdc70732"; + sha256 = "1yqsfdhyzh33aisfvwqd692n5kfgnlz7yjixd2gqn8vx9bv0dz0b"; }; patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; @@ -33,6 +33,8 @@ stdenv.mkDerivation { --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build --with-spl=${spl_git}/libexec/spl + --with-dracutdir=$$out/lib/dracut + --with-udevdir=$$out/lib/udev ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch b/pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch deleted file mode 100644 index 894bf395ce85..000000000000 --- a/pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch +++ /dev/null @@ -1,118 +0,0 @@ -commit 1db7b9be75a225cedb3b7a60028ca5695e5b8346 -Author: Richard Yao <ryao@gentoo.org> -Date: Wed Aug 28 16:17:47 2013 -0400 - - Fix libblkid support - - libblkid support is dormant because the autotools check is broken and - liblkid identifies ZFS vdevs as "zfs_member", not "zfs". We fix that - with a few changes: - - First, we fix the libblkid autotools check to do a few things: - - 1. Make a 64MB file, which is the minimum size ZFS permits. - 2. Make 4 fake uberblock entries to make libblkid's check succeed. - 3. Return 0 upon success to make autotools use the success case. - 4. Include stdlib.h to avoid implicit declration of free(). - 5. Check for "zfs_member", not "zfs" - 6. Make --with-blkid disable autotools check (avoids Gentoo sandbox violation) - 7. Pass '-lblkid' correctly using LIBS not LDFLAGS. - - Second, we change the libblkid support to scan for "zfs_member", not - "zfs". - - This makes --with-blkid work on Gentoo. - - Signed-off-by: Richard Yao <ryao@gentoo.org> - Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> - Issue #1751 - -diff --git a/config/user-libblkid.m4 b/config/user-libblkid.m4 -index 276587f..2dd2623 100644 ---- a/config/user-libblkid.m4 -+++ b/config/user-libblkid.m4 -@@ -22,26 +22,45 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [ - [with_blkid=check]) - - LIBBLKID= -- AS_IF([test "x$with_blkid" != xno], -+ AS_IF([test "x$with_blkid" = xyes], -+ [ -+ AC_SUBST([LIBBLKID], ["-lblkid"]) -+ AC_DEFINE([HAVE_LIBBLKID], 1, -+ [Define if you have libblkid]) -+ ]) -+ -+ AS_IF([test "x$with_blkid" = xcheck], - [ - AC_CHECK_LIB([blkid], [blkid_get_cache], - [ - AC_MSG_CHECKING([for blkid zfs support]) - - ZFS_DEV=`mktemp` -- dd if=/dev/zero of=$ZFS_DEV bs=1024k count=8 \ -+ truncate -s 64M $ZFS_DEV -+ echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ -+ dd of=$ZFS_DEV bs=1k count=8 \ -+ seek=128 conv=notrunc &>/dev/null \ - >/dev/null 2>/dev/null - echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ - dd of=$ZFS_DEV bs=1k count=8 \ - seek=132 conv=notrunc &>/dev/null \ - >/dev/null 2>/dev/null -+ echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ -+ dd of=$ZFS_DEV bs=1k count=8 \ -+ seek=136 conv=notrunc &>/dev/null \ -+ >/dev/null 2>/dev/null -+ echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ -+ dd of=$ZFS_DEV bs=1k count=8 \ -+ seek=140 conv=notrunc &>/dev/null \ -+ >/dev/null 2>/dev/null - -- saved_LDFLAGS="$LDFLAGS" -- LDFLAGS="-lblkid" -+ saved_LIBS="$LIBS" -+ LIBS="-lblkid" - - AC_RUN_IFELSE([AC_LANG_PROGRAM( - [ - #include <stdio.h> -+ #include <stdlib.h> - #include <blkid/blkid.h> - ], - [ -@@ -58,10 +77,10 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [ - return 2; - } - -- if (strcmp(value, "zfs")) { -+ if (strcmp(value, "zfs_member")) { - free(value); - blkid_put_cache(cache); -- return 3; -+ return 0; - } - - free(value); -@@ -82,7 +101,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [ - [--with-blkid given but unavailable])]) - ]) - -- LDFLAGS="$saved_LDFLAGS" -+ LIBS="$saved_LIBS" - ], - [ - AS_IF([test "x$with_blkid" != xcheck], -diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c -index 53609f2..d1fa98e 100644 ---- a/lib/libzfs/libzfs_import.c -+++ b/lib/libzfs/libzfs_import.c -@@ -965,7 +965,7 @@ zpool_find_import_blkid(libzfs_handle_t *hdl, pool_list_t *pools) - goto err_blkid2; - } - -- err = blkid_dev_set_search(iter, "TYPE", "zfs"); -+ err = blkid_dev_set_search(iter, "TYPE", "zfs_member"); - if (err != 0) { - (void) zfs_error_fmt(hdl, EZFS_BADCACHE, - dgettext(TEXT_DOMAIN, "blkid_dev_set_search() %d"), err); diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix new file mode 100644 index 000000000000..1fb21f2b8ab6 --- /dev/null +++ b/pkgs/servers/etcd/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.4.3"; + name = "etcd-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o etcd github.com/coreos/etcd + ''; + + installPhase = '' + ensureDir $out/bin + mv etcd $out/bin/etcd + ''; + + meta = with stdenv.lib; { + description = "A highly-available key value store for shared configuration and service discovery"; + homepage = http://coreos.com/using-coreos/etcd/; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix new file mode 100644 index 000000000000..e9fd4a50d3e0 --- /dev/null +++ b/pkgs/servers/etcd/deps.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/coreos/etcd"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "etcd"; + rev = "9970141f76241c909977af7bafe7b6f2c4923de8"; + sha256 = "1bva46gfy4rkfw8k8pb3lsfzfg16csds01f0nvfrkh99pr7sp0sy"; + }; + } + { + root = "github.com/stathat/go"; + src = fetchFromGitHub { + owner = "stathat"; + repo = "go"; + rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; + sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; + }; + } + { + root = "github.com/stretchr/objx"; + src = fetchFromGitHub { + owner = "stretchr"; + repo = "objx"; + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; + }; + } + { + root = "github.com/stretchr/testify"; + src = fetchFromGitHub { + owner = "stretchr"; + repo = "testify"; + rev = "3e03dde72495487a4deb74152ac205d0619fbc8d"; + sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix new file mode 100644 index 000000000000..627c1ff0cf90 --- /dev/null +++ b/pkgs/servers/fleet/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.5.0"; + name = "fleet-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o fleet github.com/coreos/fleet + ''; + + installPhase = '' + ensureDir $out/bin + mv fleet $out/bin + ''; + + meta = with stdenv.lib; { + description = "A distributed init system"; + homepage = http://coreos.com/using-coreos/clustering/; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/fleet/deps.nix b/pkgs/servers/fleet/deps.nix new file mode 100644 index 000000000000..d0529db37a2f --- /dev/null +++ b/pkgs/servers/fleet/deps.nix @@ -0,0 +1,81 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "code.google.com/p/gogoprotobuf"; + src = fetchgit { + url = "https://code.google.com/p/gogoprotobuf"; + rev = "7fd1620f09261338b6b1ca1289ace83aee0ec946"; + sha256 = "0f13y29zpxkv7b7kwnszygvg04fd5m9r8vpkl1wa3gxnc6az54i9"; + }; + } + { + root = "github.com/coreos/etcd"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "etcd"; + rev = "1359d29fa451b059bb76b51260610d92853e7316"; + sha256 = "0iz3vmf3nfp1i5r8al207wm0jvj68i47a814w90b1jl8g4f2amp7"; + }; + } + { + root = "github.com/coreos/fleet"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "fleet"; + rev = "da0a02ed3b07d83b0b542dcdee56e08d2457ab9c"; + sha256 = "0b8aq4ppyv1fjvf3f2qjq80mvjvf9r104bf4048wgsrs0pccs6s8"; + }; + } + { + root = "github.com/coreos/raft"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "raft"; + rev = "67dca7288f1665b59860421673d46314f4348e45"; + sha256 = "1l27kjkwcxgx89d2m537plagbp1wh6qlzxirza6lliblrgxry6mw"; + }; + } + { + root = "github.com/stathat/go"; + src = fetchFromGitHub { + owner = "stathat"; + repo = "go"; + rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; + sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; + }; + } + { + root = "github.com/stretchr/objx"; + src = fetchFromGitHub { + owner = "stretchr"; + repo = "objx"; + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; + }; + } + { + root = "github.com/stretchr/testify"; + src = fetchFromGitHub { + owner = "stretchr"; + repo = "testify"; + rev = "3e03dde72495487a4deb74152ac205d0619fbc8d"; + sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} + diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 4bf3d59685b0..cf64ba2d3c69 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation { buildInputs = [ unzip apacheAnt jdk ]; builder = ./builder.sh; + + meta = { + description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; + }; } diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index dba063bb1069..5af759db1c9d 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchurl, perl, gdSupport ? false -, gd ? null, libpng ? null, zlib ? null -}: +{ stdenv, fetchurl, perl, php, gd, libpng, zlib }: stdenv.mkDerivation { - name = "nagios-2.10"; + name = "nagios-4.0.7"; src = fetchurl { - url = mirror://sourceforge/nagios/nagios-2.10.tar.gz; - md5 = "8c3a29e138f2ff8c8abbd3dd8a40c4b6"; + url = mirror://sourceforge/nagios/nagios-4.x/nagios-4.0.7/nagios-4.0.7.tar.gz; + sha256 = "1687qnbsag84r57y9745g2klypacfixd6gkzaj42lmzn0v8y27gg"; }; - patches = [./nagios.patch]; - buildInputs = [perl] ++ (if gdSupport then [gd libpng zlib] else []); + patches = [ ./nagios.patch ]; + buildInputs = [ php perl gd libpng zlib ]; + + configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = "all"; + + # Do not create /var directories + preInstall = '' + substituteInPlace Makefile --replace '$(MAKE) install-basic' "" + ''; installTargets = "install install-config"; meta = { description = "A host, service and network monitoring program"; - homepage = http://www.nagios.org/; - license = "GPL"; + homepage = http://www.nagios.org/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; }; } diff --git a/pkgs/servers/monitoring/nagios/nagios.patch b/pkgs/servers/monitoring/nagios/nagios.patch index 6fc271536171..cec4c4942b53 100644 --- a/pkgs/servers/monitoring/nagios/nagios.patch +++ b/pkgs/servers/monitoring/nagios/nagios.patch @@ -1,7 +1,7 @@ -diff -ruN nagios-2.6/configure nagios-2.6.new/configure ---- nagios-2.6/configure 2006-11-28 03:29:04.000000000 +0100 -+++ nagios-2.6.new/configure 2006-12-28 01:22:56.000000000 +0100 -@@ -4810,7 +4810,8 @@ +diff -ruN nagios-4.0.7.orig/configure nagios-4.0.7/configure +--- nagios-4.0.7.orig/configure 2014-06-03 10:41:42.000000000 -0400 ++++ nagios-4.0.7/configure 2014-06-12 00:30:17.516468583 -0400 +@@ -6014,7 +6014,8 @@ #define DEFAULT_NAGIOS_GROUP "$nagios_grp" _ACEOF @@ -11,3 +11,13 @@ diff -ruN nagios-2.6/configure nagios-2.6.new/configure +@@ -6035,7 +6036,8 @@ + + + +-COMMAND_OPTS="-o $command_user -g $command_grp" ++#COMMAND_OPTS="-o $command_user -g $command_grp" ++COMMAND_OPTS="" + + + MAIL_PROG=no diff --git a/pkgs/servers/monitoring/nagios/plugins/official/default.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix index c466813b23b0..3420003c641c 100644 --- a/pkgs/servers/monitoring/nagios/plugins/official/default.nix +++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl, openssh}: +{ stdenv, fetchurl, openssh }: -stdenv.mkDerivation { - name = "nagios-plugins-1.4.10"; +stdenv.mkDerivation rec { + name = "nagios-plugins-${version}"; + version = "2.0"; src = fetchurl { - url = https://www.monitoring-plugins.org/download/nagios-plugins-1.4.10.tar.gz; - sha256 = "0vm7sjiygxbfc5vbsi1g0dakpvynfzi86fhqx4yxd61brn0g8ghr"; + url = "http://nagios-plugins.org/download/${name}.tar.gz"; + sha256 = "113nv9jqpbqpdjqilqbj1iyshxyvcmq8w94bq5ajz4dxi9j8045s"; }; # !!! Awful hack. Grrr... this of course only works on NixOS. @@ -22,11 +23,14 @@ stdenv.mkDerivation { postInstall = "ln -s libexec $out/bin"; - buildInputs = [openssh]; # !!! make openssh a runtime dependency only + # !!! make openssh a runtime dependency only + buildInputs = [ openssh ]; meta = { - description = "Plugins for Nagios"; - homepage = http://www.monitoring-plugins.org; - license = "GPL"; + description = "Official plugins for Nagios"; + homepage = http://www.nagios.org/download/plugins; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; }; } diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix new file mode 100644 index 000000000000..b1570d96c7b6 --- /dev/null +++ b/pkgs/servers/nsq/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.2.28"; + name = "nsq-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + apps=(nsq_pubsub nsq_stat nsq_tail nsq_to_file nsq_to_http nsq_to_nsq nsqd nsqlookupd) + + mkdir build + + go build -v -o build/nsqadmin github.com/bitly/nsq/nsqadmin + for app in "''${apps[@]}"; do + go build -v -o build/$app github.com/bitly/nsq/apps/$app + done + ''; + + installPhase = '' + ensureDir $out/bin + mv build/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "A realtime distributed messaging platform"; + homepage = http://nsq.io/; + license = licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/nsq/deps.nix b/pkgs/servers/nsq/deps.nix new file mode 100644 index 000000000000..8518ceed9169 --- /dev/null +++ b/pkgs/servers/nsq/deps.nix @@ -0,0 +1,134 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "code.google.com/p/snappy-go"; + src = fetchhg { + url = "http://code.google.com/p/snappy-go"; + tag = "14"; + sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7"; + }; + } + { + root = "github.com/BurntSushi/toml"; + src = fetchFromGitHub { + owner = "BurntSushi"; + repo = "toml"; + rev = "f87ce853111478914f0bcffa34d43a93643e6eda"; + sha256 = "0g8203y9ycf34j2q3ymxb8nh4habgwdrjn9vdgrginllx73yq565"; + }; + } + { + root = "github.com/bitly/go-hostpool"; + src = fetchFromGitHub { + owner = "bitly"; + repo = "go-hostpool"; + rev = "fed86fae5cacdc77e7399937e2f8836563620a2e"; + sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44"; + }; + } + { + root = "github.com/bitly/go-nsq"; + src = fetchFromGitHub { + owner = "bitly"; + repo = "go-nsq"; + rev = "c79a282f05364e340eadc2ce2f862a3d44eea9c0"; + sha256 = "19jlwj5419p5xwjzfnzlddjnbh5g7ifnqhd00i5p0b6ww1gk011p"; + }; + } + { + root = "github.com/bitly/go-simplejson"; + src = fetchFromGitHub { + owner = "bitly"; + repo = "go-simplejson"; + rev = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5"; + sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi"; + }; + } + { + root = "github.com/bitly/nsq"; + src = fetchFromGitHub { + owner = "bitly"; + repo = "nsq"; + rev = "048691a8242c9ec224fc46bf7d05f321026b69f8"; + sha256 = "0drmf1j5w3q4l6f7xjy3y7d7cl50gcx0qwci6mahxsyaaclx60yx"; + }; + } + { + root = "github.com/bmizerany/assert"; + src = fetchFromGitHub { + owner = "bmizerany"; + repo = "assert"; + rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; + sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc"; + }; + } + { + root = "github.com/bmizerany/perks"; + src = fetchFromGitHub { + owner = "bmizerany"; + repo = "perks"; + rev = "aac9e2eab5a334037057336897fd10b0289a5ae8"; + sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k"; + }; + } + { + root = "github.com/kr/pretty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pretty"; + rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f"; + sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl"; + }; + } + { + root = "github.com/kr/pty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pty"; + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + } + { + root = "github.com/kr/text"; + src = fetchFromGitHub { + owner = "kr"; + repo = "text"; + rev = "6807e777504f54ad073ecef66747de158294b639"; + sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; + }; + } + { + root = "github.com/mreiferson/go-options"; + src = fetchFromGitHub { + owner = "mreiferson"; + repo = "go-options"; + rev = "896a539cd709f4f39d787562d1583c016ce7517e"; + sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17"; + }; + } + { + root = "github.com/mreiferson/go-snappystream"; + src = fetchFromGitHub { + owner = "mreiferson"; + repo = "go-snappystream"; + rev = "97c96e6648e99c2ce4fe7d169aa3f7368204e04d"; + sha256 = "08ylvx9r6b1fi76v6cqjvny4yqsvcqjfsg93jdrgs7hi4mxvxynn"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index ade79e2c99cd..08f12d975062 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -18,11 +18,11 @@ assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { - name = "samba-3.6.22"; + name = "samba-3.6.24"; src = fetchurl { - url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "1sny3irf1p4fjli5qa29swr3l217grg90cva35rmay48fw7g5g9h"; + url = "http://samba.org/samba/ftp/stable/${name}.tar.gz"; + sha256 = "19rln8m1k359bz6dhmlv39kzyjg7p296dz4y4mq1jwrlnw2bvl0i"; }; buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix index 274fc89f94d0..40b41c8f9d39 100644 --- a/pkgs/servers/serfdom/default.nix +++ b/pkgs/servers/serfdom/default.nix @@ -1,126 +1,30 @@ -{ stdenv, fetchurl, fetchgit, fetchhg, go, lib }: +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: -let - goDeps = [ - { - dir = "github.com/hashicorp"; - name = "serf"; - rev = "c5b41a9d1d261135117a8d501d3293efade3cc74"; - sha256 = "a314d3c13fb370842a8f7c6650abfa907b51172a09c64f9184a240fab05b43df"; - fetcher = git; - } - { - dir = "github.com/armon"; - name = "go-metrics"; - rev = "e12c3591b520e819e8234bd585d592774f2b2ad5"; - sha256 = "79476efefb68876fcad7e71e76d95f4a7eece2cfcdc5a9c10f998af3178230ba"; - fetcher = git; - } - { - dir = "github.com/hashicorp"; - name = "logutils"; - rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; - sha256 = "184lnn7x1v3xvj6zz1rg9s0252wkkd59kij2iyrrm7y80bym2jys"; - fetcher = git; - } - { - dir = "github.com/hashicorp"; - name = "memberlist"; - rev = "d5be01d1f4d75b086eba4ae808f2767c08cbbf73"; - sha256 = "4ab2b610d439e96c169d9caf9ac0e009d71d3ef9a2fd2c812870b71eb6b27dfc"; - fetcher = git; - } - { - dir = "github.com/ugorji"; - name = "go"; - rev = "71c2886f5a673a35f909803f38ece5810165097b"; - sha256 = "128853bcc5f114c300772cbce316b55e84206fa56705c5b9cc94c1693b11ee94"; - fetcher = git; - } - { - dir = "github.com/mitchellh"; - name = "cli"; - rev = "69f0b65ce53b27f729b1b807b88dc88007f41dd3"; - sha256 = "0hnnqd8vg5ca2hglkrj141ba2akdh7crl2lsrgz8d6ipw6asszx3"; - fetcher = git; - } - { - dir = "github.com/armon"; - name = "mdns"; - rev = "8be7e3ac4e941555169a99d01abcabd3c982d87a"; - sha256 = "87cd3a0ada3b094ee8fc4c4742158e0d051cde893da1ea320158a47d6254f69d"; - fetcher = git; - } - { - dir = "github.com/miekg"; - name = "dns"; - rev = "7ebb4c59b39d5984952a355086606dd91f6cfe86"; - sha256 = "8418ad2d27e607cef1dc0003471416294443e467f2de9df135e3a2ab411e2512"; - fetcher = git; - } - { - dir = "github.com/mitchellh"; - name = "mapstructure"; - rev = "57bb2fa7a7e00b26c80e4c4b0d4f15a210d94039"; - sha256 = "13lvd5vw8y6h5zl3samkrb7237kk778cky7k7ys1cm46mfd957zy"; - fetcher = git; - } - { - dir = "github.com/ryanuber"; - name = "columnize"; - rev = "d066e113d6e13232f45bda646a915dffeee7f1a4"; - sha256 = "2aaec396a223fc4b45117a595e74c0a874bd5cd9604c742b8c4747436b4721e9"; - fetcher = git; - } - { - dir = "code.google.com/p"; - name = "go.net"; - rev = "89dbba2db2d4"; - sha256 = "0168inai10nkdrz4g0rjlj8b5v34mv135v8bhyvh501vnqql50jn"; - fetcher = hg; - } - ]; - git = desc: fetchgit { url = "https://${desc.dir}/${desc.name}"; - inherit (desc) rev sha256; }; - hg = desc: fetchhg { url = "https://${desc.dir}/${desc.name}"; - tag = desc.rev; - inherit (desc) sha256; }; - createGoPathCmds = - lib.concatStrings - (map (desc: - let fetched = desc.fetcher desc; in '' - mkdir -p $GOPATH/src/${desc.dir} - ln -s ${fetched} $GOPATH/src/${desc.dir}/${desc.name} - '') goDeps); -in - stdenv.mkDerivation rec { - version = "0.5.0"; - name = "serfdom-${version}"; +stdenv.mkDerivation rec { + version = "0.6.2"; + name = "serfdom-${version}"; - src = fetchurl { - url = "https://github.com/hashicorp/serf/archive/v${version}.tar.gz"; - sha256 = "1p2cpkdx0gck1ypxc98im7gsv3275avpkizhsif3nxvl1xd8g1qp"; - }; + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; - buildInputs = [ go ]; + buildInputs = [ go ]; - buildPhase = '' - mkdir $TMPDIR/go - export GOPATH=$TMPDIR/go - ${createGoPathCmds} - go build -v -o bin/serf - ''; + buildPhase = '' + export GOPATH=$src + go build -v -o serf github.com/hashicorp/serf + ''; - installPhase = '' - ensureDir $out/bin - cp bin/serf $out/bin - ''; + installPhase = '' + ensureDir $out/bin + mv serf $out/bin/serf + ''; - meta = with stdenv.lib; { - description = "Serf is a service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; - homepage = http://www.serfdom.io/; - license = licenses.mpl20; - maintainers = [ maintainers.msackman ]; - platforms = platforms.linux; - }; - } + meta = with stdenv.lib; { + description = "Serf is a service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; + homepage = http://www.serfdom.io/; + license = licenses.mpl20; + maintainers = with maintainers; [ msackman cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/serfdom/deps.nix b/pkgs/servers/serfdom/deps.nix new file mode 100644 index 000000000000..d4da74b54767 --- /dev/null +++ b/pkgs/servers/serfdom/deps.nix @@ -0,0 +1,185 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "code.google.com/p/go.net"; + src = fetchhg { + url = "http://code.google.com/p/go.net"; + tag = "134"; + sha256 = "1jycpgrfwgkfac60zjbx6babcz7sgyn9xgy6cr3l811j6k8r2pbv"; + }; + } + { + root = "code.google.com/p/go.text"; + src = fetchhg { + url = "http://code.google.com/p/go.text"; + tag = "85"; + sha256 = "1x8h6vq9g5gbi7iiwla6dkaaqqf7wmkdm4szj7wvzlsijf2x8dwr"; + }; + } + { + root = "github.com/armon/circbuf"; + src = fetchFromGitHub { + owner = "armon"; + repo = "circbuf"; + rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; + sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; + }; + } + { + root = "github.com/armon/go-metrics"; + src = fetchFromGitHub { + owner = "armon"; + repo = "go-metrics"; + rev = "02567bbc4f518a43853d262b651a3c8257c3f141"; + sha256 = "08fk3zmw0ywmdfp2qhrpv0vrk1y97hzqczrgr3y2yip3x8sr37ar"; + }; + } + { + root = "github.com/armon/mdns"; + src = fetchFromGitHub { + owner = "armon"; + repo = "mdns"; + rev = "70462deb060d44247356ee238ebafd7699ddcffe"; + sha256 = "0xkm3d0hsixdm1yrkx9c39723kfjkb3wvrzrmx3np9ylcwn6h5p5"; + }; + } + { + root = "github.com/hashicorp/go-syslog"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "go-syslog"; + rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c"; + sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81"; + }; + } + { + root = "github.com/hashicorp/logutils"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "logutils"; + rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; + sha256 = "033rbkc066g657r0dnzysigjz2bs4biiz0kmiypd139d34jvslwz"; + }; + } + { + root = "github.com/hashicorp/memberlist"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "memberlist"; + rev = "17d39b695094be943bfb98442a80b082e6b9ac47"; + sha256 = "0nvgjnwmfqhv2wvr77d2q5mq1bfw4xbpil6wgyj4fyrmhsfzrv3g"; + }; + } + { + root = "github.com/hashicorp/serf"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "serf"; + rev = "4232a3f7b52f755084caf6b2cc2789efa2948555"; + sha256 = "1hxxqrjz08882d205ylakhvvwciahiqdzkwi2a7zwrmx6sxna7sr"; + }; + } + { + root = "github.com/miekg/dns"; + src = fetchFromGitHub { + owner = "miekg"; + repo = "dns"; + rev = "fc67c4b981930a377f8a26a5a1f2c0ccd5dd1514"; + sha256 = "1csjmkx0gl34r4hmkhdbdxb0693f1p10yrjaj8f2jwli9p9sl4mg"; + }; + } + { + root = "github.com/mitchellh/cli"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "cli"; + rev = "8262fe3f76f0da53b5674eb35c8c6436430794c3"; + sha256 = "0pqkxh1q49kkxihggrfjs8174d927g4c5qqx00ggw8sqqsgrw6vn"; + }; + } + { + root = "github.com/mitchellh/mapstructure"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "mapstructure"; + rev = "6fb2c832bcac61d01212ab1d172f7a14a8585b07"; + sha256 = "0mx855lwhv0rk461wmbnbzbpkhmq5p2ipmrm5bhzimagrr1w17hw"; + }; + } + { + root = "github.com/ryanuber/columnize"; + src = fetchFromGitHub { + owner = "ryanuber"; + repo = "columnize"; + rev = "785d943a7b6886e0bb2f139a60487b823dd8d9de"; + sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f"; + }; + } + { + root = "github.com/ugorji/go"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go"; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } + { + root = "github.com/ugorji/go-msgpack"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go-msgpack"; + rev = "75092644046c5e38257395b86ed26c702dc95b92"; + sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + }; + } + { + root = "github.com/vmihailenco/bufio"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "bufio"; + rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; + sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983"; + }; + } + { + root = "github.com/vmihailenco/msgpack"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "msgpack"; + rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205"; + sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0"; + }; + } + { + root = "launchpad.net/gocheck"; + src = fetchbzr { + url = "https://launchpad.net/gocheck"; + revision = "87"; + sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; + }; + } + { + root = "launchpad.net/mgo"; + src = fetchbzr { + url = "https://launchpad.net/mgo"; + revision = "2"; + sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d0f7f5ef3e52..1df9f6a440fd 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "10.0.11"; src = fetchurl { - url = "https://fossies.org/linux/misc/${name}.tar.gz"; + url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; sha256 = "1p8h06kns30rlbnzw9ddmihs7r3jhp8xlrl4r6h5d107wkcw86v3"; }; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7fca58f54461..1834dfd6a963 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1869,6 +1869,16 @@ let buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; + xkbprint = (stdenv.mkDerivation ((if overrides ? xkbprint then overrides.xkbprint else x: x) { + name = "xkbprint-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2; + sha256 = "1h4jb3gjrbjp79h5gcgkjvdxykcy2bmq03smpls820c8wnw6v17s"; + }; + buildInputs = [pkgconfig libX11 libxkbfile ]; + })) // {inherit libX11 libxkbfile ;}; + xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) { name = "xkbutils-1.0.4"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 512bbbb9eff1..e7b3a6f4ad60 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -185,3 +185,4 @@ mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2 +mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2 diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 37ffb09288e0..704527d28c7b 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -58,8 +58,15 @@ EOF # XXX: patch zsh to take zwc if newer _or equal_ meta = { - description = "the Z shell"; - longDescription = "Zsh is a UNIX command interpreter (shell) usable as an interactive login shell and as a shell script command processor. Of the standard shells, zsh most closely resembles ksh but includes many enhancements. Zsh has command line editing, builtin spelling correction, programmable command completion, shell functions (with autoloading), a history mechanism, and a host of other features."; + description = "The Z shell"; + longDescription = '' + Zsh is a UNIX command interpreter (shell) usable as an interactive login + shell and as a shell script command processor. Of the standard shells, + zsh most closely resembles ksh but includes many enhancements. Zsh has + command line editing, builtin spelling correction, programmable command + completion, shell functions (with autoloading), a history mechanism, and + a host of other features. + ''; license = "MIT-like"; homePage = "http://www.zsh.org/"; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 0ceee4572761..e6b2f78332d7 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -4,12 +4,12 @@ , ffmpeg, x264, libvpx, pil, libwebp }: buildPythonPackage rec { - name = "xpra-0.12.5"; + name = "xpra-0.11.6"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.bz2"; - sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw"; + sha256 = "0n3lr8nrfmrll83lgi1nzalng902wv0dcmcyx4awnman848dxij0"; }; buildInputs = [ diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index c3a82b2e4a27..14822d8b6e96 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -2,7 +2,7 @@ , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala -, pygobject3, enableGTK3 ? false }: +, pygobject3, libogg, enableGTK3 ? false }: stdenv.mkDerivation rec { name = "gtk-vnc-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ python gnutls cairo libtool pkgconfig glib libffi libgcrypt intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV - gobjectIntrospection + gobjectIntrospection libogg ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]); NIX_CFLAGS_COMPILE = "-fstack-protector-all"; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 6c485173f858..92d8a22fa476 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { buildInputs = if enableNLS then [ libnatspec ] else []; meta = { + description = "Compressor/archiver for creating and modifying zipfiles"; homepage = http://www.info-zip.org; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5a09ec2a80b9..1c843a666360 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,25 +1,36 @@ -{stdenv, fetchurl, fuse, bison, flex, openssl, python, ncurses, readline}: +{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline, + autoconf, automake, libtool, pkgconfig, zlib, libaio}: let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.4.3"; + version="3.5.0"; name="${baseName}-${version}"; - hash="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.3/glusterfs-3.4.3.tar.gz"; - sha256="0j1yvpdb1bydsh3pqlyr23mfvra5bap9rxba910s9cn61mpy99bj"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz"; + sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir"; }; buildInputs = [ - fuse bison flex openssl python ncurses readline + fuse bison flex_2_5_35 openssl python ncurses readline + autoconf automake libtool pkgconfig zlib libaio ]; in stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; + preConfigure = '' + ./autogen.sh + ''; configureFlags = [ ''--with-mountutildir="$out/sbin"'' ]; + preInstall = '' + substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out + substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out + substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out + substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out + substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out + ''; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 12f307ca9def..6272bdae7803 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "povray-3.6"; src = fetchurl { - url = http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.tar.bz2; - sha256 = "0wvsfgkybx28mj2p76nnsq9rdq50192g5qb7d0xk81s8skn7z2jf"; + url = http://www.povray.org/ftp/pub/povray/Old-Versions/Official-3.62/Unix/povray-3.6.tar.bz2; + sha256 = "4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73"; }; # the installPhase wants to put files into $HOME. I let it put the files diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 83c9b1577935..51dcc2a9c808 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -34,7 +34,14 @@ rec { configureFlags = ["--disable-video"]; meta = { - description = "Bar code toolset"; + description = "Bar code reader"; + longDescription = '' + ZBar is an open source software suite for reading bar codes from various + sources, such as video streams, image files and raw intensity sensors. It + supports many popular symbologies (types of bar codes) including + EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR + Code. + ''; maintainers = with a.lib.maintainers; [ raskin diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 6d1ce21f318d..7db7ebf96d6d 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; meta = with stdenv.lib; { + description = "Converts filenames from one encoding to another"; platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin; maintainers = [ maintainers.urkud ]; }; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 01820aaf7780..a7d03d1335f0 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,14 +1,22 @@ { stdenv , fetchurl +, zlib ? null +, szip ? null }: -stdenv.mkDerivation { - name = "hdf5-1.8.10-patch1"; +stdenv.mkDerivation rec { + version = "1.8.13"; + name = "hdf5-${version}-patch1"; src = fetchurl { - url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz; - sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz"; + url = "http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"; + sha256 = "1h9qdl321gzm3ihdhlijbl9sh9qcdrw94j7izg64yfqhxj7b7xl2"; }; - buildInputs = [] ; + + buildInputs = [] + ++ stdenv.lib.optional (zlib != null) zlib + ++ stdenv.lib.optional (szip != null) szip; + + configureFlags = if szip != null then "--with-szlib=${szip}" else ""; patches = [./bin-mv.patch]; diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 6ee427bc5066..a613dad3ec9f 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,11 +1,11 @@ { fetchurl }: -let version = "1.2.1"; in +let version = "1.3.3"; in fetchurl { - url = "https://logstash.objects.dreamhost.com/release/logstash-${version}-flatjar.jar"; + url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}-flatjar.jar"; - name = "logstash-${version}.jar"; + name = "logstash-${version}-flatjar.jar"; - sha256 = "08zfhq6klhkqapqnyzbdikgryd8bj2fp0wdb5d6dawdan5psbf6h"; + sha256 = "a83503bd2aa32e1554b98f812d0b411fbc5f7b6b21cebb48b7d344474f2dfc6d"; } diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 7a369744525c..51ab3478ac93 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, xz }: +{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }: stdenv.mkDerivation rec { - name = "lftp-4.4.16"; + name = "lftp-4.5.2"; src = fetchurl { url = "http://lftp.yar.ru/ftp/${name}.tar.gz"; - sha256 = "1wivcynm4pc18vj4x6r2saczk34ds3slagmz3y3b04rzklplf7s4"; + sha256 = "106llhq9lgvdxlf4r1p94r66fcy5ywfdfvins4dfn9irg0k5gzyv"; }; patches = [ ./no-gets.patch ]; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 352a908c1d7e..850981c5d338 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -2,7 +2,7 @@ , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, networkmanager_openvpn, networkmanager_vpnc -, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme }: +, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme, dconf }: let pn = "network-manager-applet"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/nm-applet" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ --prefix PATH ":" "${gnome3.gconf}/bin" diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index d7210b2f616b..84439136d49e 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs }: +{ stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused }: stdenv.mkDerivation { name = "nix-prefetch-scripts"; @@ -11,9 +11,13 @@ stdenv.mkDerivation { function copyScript { local name=nix-prefetch-$1; local src=$2; - local exe=$3/bin; + local wrapArgs="" cp $src $out/bin/$name; - wrapProgram $out/bin/$name --suffix PATH : "$exe" + for dep in ''${@:3}; do + wrapArgs="$wrapArgs --prefix PATH : $dep/bin" + done + wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin" + wrapProgram $out/bin/$name $wrapArgs } copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial} @@ -21,6 +25,7 @@ stdenv.mkDerivation { copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion} copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs} + copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl} ''; meta = with stdenv.lib; { @@ -30,4 +35,4 @@ stdenv.mkDerivation { # Quicker to build than to download, I hope hydraPlatforms = []; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index f242c3f323ae..9b8d33b6b696 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -13,11 +13,11 @@ assert useUsb -> (libusb != null); assert useCurl -> (curl != null); stdenv.mkDerivation rec { - name = "gnupg-2.0.22"; + name = "gnupg-2.0.24"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0lg210acj2rxq291q4cwamg9gx6gh2prb1xa93y5jhw5b6r0lza3"; + sha256 = "0ch2hbindk832cy7ca00a7whw84ndm0nhqrl24a5fw4ldkca2x6r"; }; buildInputs diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index 362ec3a25bbd..a25ae35b6cc9 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.16"; + name = "gnupg-1.4.17"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0bsa1yqa3ybhvmc4ys73amdpcmckrlq1fsxjl2980cxada778fvv"; + sha256 = "0nvv1bd8v13gh2m1429azws7ks0ix9y1yv87ak9k9i1dsqcrvpg6"; }; buildInputs = [ readline bzip2 ]; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 6ed94da10ba0..ab46af5a1cd9 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,54 +1,53 @@ -{ stdenv, fetchurl, coreutils, pam, groff, keepVisudo ? false }: +{ stdenv, fetchurl, coreutils, pam, groff }: stdenv.mkDerivation rec { - name = "sudo-1.8.9p4"; + name = "sudo-1.8.10p3"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "19y75bsh4z2kid5jk2r84z7rvmnh90n8cb9fbn9l4rcw83lzjhqr"; + sha256 = "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"; }; - postConfigure = '' - cat >> pathnames.h <<EOF - #undef _PATH_SUDO_LOGFILE - #define _PATH_SUDO_LOGFILE "/var/log/sudo.log" - #undef _PATH_SUDO_TIMEDIR - #define _PATH_SUDO_TIMEDIR "/run/sudo" - #undef _PATH_VI - #define _PATH_VI "/run/current-system/sw/bin/nano" - #undef _PATH_MV - #define _PATH_MV "${coreutils}/bin/mv" + configureFlags = [ + "--with-env-editor" + "--with-editor=/run/current-system/sw/bin/nano" + "--with-rundir=/var/run" + "--with-vardir=/var/db/sudo" + "--with-logpath=/var/log/sudo.log" + ]; + + postConfigure = + '' + cat >> pathnames.h <<'EOF' + #undef _PATH_MV + #define _PATH_MV "${coreutils}/bin/mv" EOF - makeFlags="install_uid=$(id -u) install_gid=$(id -g)" - installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc timedir=$TMPDIR/dummy" - ''; + installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy" + ''; buildInputs = [ coreutils pam groff ]; enableParallelBuilding = true; - postInstall = '' - # ‘visudo’ does not make sense on NixOS - except for checking sudoers - # file syntax - rm ${if keepVisudo then "" else "$out/sbin/visudo"} \ - $out/share/man/man8/visudo.8 - - rm $out/share/doc/sudo/ChangeLog - ''; + postInstall = + '' + rm -f $out/share/doc/sudo/ChangeLog + ''; meta = { description = "A command to run commands as root"; - longDescription = '' + longDescription = + '' Sudo (su "do") allows a system administrator to delegate authority to give certain users (or groups of users) the ability to run some (or all) commands as root or another user while providing an audit trail of the commands and their arguments. - ''; + ''; homepage = http://www.sudo.ws/; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index cbffd8648d47..9102482d3d63 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python }: +{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }: stdenv.mkDerivation { name = "syslog-ng-3.5.4.1"; @@ -8,8 +8,13 @@ stdenv.mkDerivation { sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj"; }; - buildInputs = [ eventlog pkgconfig glib python ]; - configureFlags = "--enable-dynamic-linking"; + buildInputs = [ eventlog pkgconfig glib python systemd perl ]; + + configureFlags = [ + "--enable-dynamic-linking" + "--enable-systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ]; meta = { homepage = "http://www.balabit.com/network-security/syslog-ng/"; diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 5880de7a735c..e056af26877c 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-wordview"; meta = with stdenv.lib; { + description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; license = "GPL2"; maintainers = [ maintainers.urkud ]; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 06e15d07ff09..34221d803661 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,13 +1,23 @@ -{stdenv, fetchurl, perl /*, xmlto */}: +{ stdenv, fetchurl, perl /*, xmlto */}: stdenv.mkDerivation { - name = "colordiff-1.0.9"; + name = "colordiff-1.0.13"; + src = fetchurl { - url = http://colordiff.sourceforge.net/colordiff-1.0.9.tar.gz; - sha256 = "b2c25d81c10f22380798f146cc5b54ffc5aeb6e5ca1208be2b9508fec1d8e4a6"; + url = http://www.colordiff.org/colordiff-1.0.13.tar.gz; + sha256 = "0akcz1p3klsjnhwcqdfq4grs6paljc5c0jzr3mqla5f862hhaa6f"; }; buildInputs = [ perl /* xmlto */ ]; + dontBuild = 1; # do not build doc yet. + installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install''; + + meta = with stdenv.lib; { + description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; + homepage = http://www.colordiff.org/; + license = licenses.gpl3; + platforms = platforms.linux; + }; } diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index 6bbf1a9a8c7f..e70dfaedddf5 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,17 +1,23 @@ -{fetchurl, stdenv}: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "diffstat-1.58"; src = fetchurl { - url = "ftp://invisible-island.net/diffstat/"+ name +".tgz"; + url = "ftp://invisible-island.net/diffstat/${name}.tgz"; sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs"; }; - meta = { + meta = with stdenv.lib; { + description = "Read output of diff and display a histogram of the changes"; + longDescription = '' + diffstat reads the output of diff and displays a histogram of the + insertions, deletions, and modifications per-file. It is useful for + reviewing large, complex patch files. + ''; homepage = http://invisible-island.net/diffstat/; - longDescription = "diffstat reads the output of diff and displays a -istogram of the insertions, deletions, and modifications per-file. It -s useful for reviewing large, complex patch files."; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 8a5eb6ad759e..fd7551e234e1 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/etc/vim"; meta = with stdenv.lib; { - description = "Text-based document generation system"; + description = "Text-based document generation system ${stdenv.lib.optionalString enableStandardFeatures "(full version)"}"; longDescription = '' AsciiDoc is a text document format for writing notes, documentation, articles, books, ebooks, slideshows, web pages, man pages and blogs. diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix new file mode 100644 index 000000000000..c7729ac676f8 --- /dev/null +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, pkgconfig, djvulibre, ghostscript }: + +stdenv.mkDerivation rec { + version = "0.9.2"; + name = "djvu2pdf-${version}"; + + src = fetchurl { + url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz"; + sha256 = "0v2ax30m7j1yi4m02nzn9rc4sn4vzqh5vywdh96r64j4pwvn5s5g"; + }; + + buildInputs = [ pkgconfig ]; + propagatedUserEnvPkgs = [ djvulibre ghostscript ]; + + installPhase = '' + ensureDir $out/bin + cp -p djvu2pdf $out/bin + ensureDir $out/man/man1 + cp -p djvu2pdf.1.gz $out/man/man1 + ''; + + meta = { + description = "Creates djvu files from PDF files"; + homepage = http://0x2a.at/s/projects/djvu2pdf; + license = stdenv.lib.licenses.gpl2; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index faa197327964..aa80997db8ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -329,6 +329,8 @@ let fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); + packer = callPackage ../development/tools/packer { }; + fetchpatch = callPackage ../build-support/fetchpatch { }; fetchsvn = import ../build-support/fetchsvn { @@ -661,7 +663,7 @@ let enableStandardFeatures = false; }; - asciidocFull = appendToName "full" (asciidoc.override { + asciidoc-full = appendToName "full" (asciidoc.override { inherit (pythonPackages) pygments; enableStandardFeatures = true; }); @@ -821,10 +823,16 @@ let cron = callPackage ../tools/system/cron { }; - cudatoolkit = callPackage ../development/compilers/cudatoolkit { + cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix { + python = python26; + }; + + cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix { python = python26; }; + cudatoolkit = cudatoolkit5; + curl = callPackage ../tools/networking/curl rec { fetchurl = fetchurlBoot; zlibSupport = true; @@ -1248,7 +1256,9 @@ let hddtemp = callPackage ../tools/misc/hddtemp { }; - hdf5 = callPackage ../tools/misc/hdf5 { }; + hdf5 = callPackage ../tools/misc/hdf5 { + szip = null; + }; heimdall = callPackage ../tools/misc/heimdall { }; @@ -1595,7 +1605,7 @@ let networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; - networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; + networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; }; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; @@ -2082,8 +2092,6 @@ let sudo = callPackage ../tools/security/sudo { }; - sudoWithVisudo = sudo.override { keepVisudo = true; }; - suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; super = callPackage ../tools/security/super { }; @@ -2970,7 +2978,11 @@ let go_1_2 = callPackage ../development/compilers/go/1.2.nix { }; - go = go_1_2; + go_1_3 = callPackage ../development/compilers/go/1.3.nix { }; + + go = go_1_3; + + gox = callPackage ../development/compilers/go/gox.nix { }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -3013,7 +3025,7 @@ let jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjdk else pkgs.oraclejdk; - jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" + jre = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjre else pkgs.oraclejre; @@ -3279,8 +3291,8 @@ let rust = callPackage ../development/compilers/rust {}; - sbcl = builderDefsPackage (import ../development/compilers/sbcl) { - inherit makeWrapper; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; + sbcl = callPackage ../development/compilers/sbcl { clisp = clisp_2_44_1; }; @@ -3291,6 +3303,7 @@ let sdcc = callPackage ../development/compilers/sdcc { }; + smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage_i686 ../development/compilers/smlnj { }; stalin = callPackage ../development/compilers/stalin { }; @@ -3484,6 +3497,8 @@ let fetchurl = fetchurlBoot; }; + perl520 = callPackage ../development/interpreters/perl/5.20 { }; + perl = if system != "i686-cygwin" then perl516 else sysPerl; php = php54; @@ -3527,7 +3542,7 @@ let python = python27; python3 = python3Packages.python; - pypy = callPackage ../development/interpreters/pypy/2.2 { }; + pypy = callPackage ../development/interpreters/pypy/2.3 { }; pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { @@ -3786,6 +3801,8 @@ let chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; + chrpath = callPackage ../development/tools/misc/chrpath { }; + "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; complexity = callPackage ../development/tools/misc/complexity { }; @@ -4157,7 +4174,7 @@ let aalib = callPackage ../development/libraries/aalib { }; - accountservice = callPackage ../development/libraries/accountservice { }; + accountsservice = callPackage ../development/libraries/accountsservice { }; acl = callPackage ../development/libraries/acl { }; @@ -4758,7 +4775,12 @@ let pangox_compat = callPackage ../development/libraries/pangox-compat { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { + # workaround signal 10 in gdk_pixbuf tests + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; @@ -6625,12 +6647,16 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; + etcd = callPackage ../servers/etcd { }; + ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlangR16; }; elasticmq = callPackage ../servers/elasticmq { }; + etcdctl = callPackage ../development/tools/etcdctl { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; felix = callPackage ../servers/felix { }; @@ -6642,6 +6668,8 @@ let firebird = callPackage ../servers/firebird { icu = null; }; firebirdSuper = callPackage ../servers/firebird { superServer = true; }; + fleet = callPackage ../servers/fleet { }; + freepops = callPackage ../servers/mail/freepops { }; freeswitch = callPackage ../servers/sip/freeswitch { }; @@ -6704,6 +6732,8 @@ let nsd = callPackage ../servers/dns/nsd { }; + nsq = callPackage ../servers/nsq { }; + opensmtpd = callPackage ../servers/mail/opensmtpd { }; petidomo = callPackage ../servers/mail/petidomo { }; @@ -6752,13 +6782,11 @@ let mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; - nagios = callPackage ../servers/monitoring/nagios { - gdSupport = true; - }; + nagios = callPackage ../servers/monitoring/nagios { }; munin = callPackage ../servers/monitoring/munin { }; - nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official { }; + nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { }; net_snmp = callPackage ../servers/monitoring/net-snmp { }; @@ -7211,15 +7239,6 @@ let ]; }; - linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) { - inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7276,10 +7295,6 @@ let linux_grsec_stable_server = grKernel grFlavors.linux_grsec_stable_server; linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen; - # Stable+vserver kernels - server versions only - #linux_grsec_vserver_server = grKernel grFlavors.linux_grsec_vserver_server; - #linux_grsec_vserver_server_xen = grKernel grFlavors.linux_grsec_vserver_server_xen; - # Testing kernels linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; linux_grsec_testing_server = grKernel grFlavors.linux_grsec_testing_server; @@ -7388,7 +7403,6 @@ let linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); - linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); @@ -7399,10 +7413,6 @@ let linuxPackages_grsec_stable_server = grPackage grFlavors.linux_grsec_stable_server; linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen; - # Stable+vserver kernels - server versions only - #linuxPackages_grsec_vserver_server = grPackage grFlavors.linux_grsec_vserver_server; - #linuxPackages_grsec_vserver_server_xen = grPackage grFlavors.linux_grsec_vserver_server_xen; - # Testing kernels linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop; linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server; @@ -7485,6 +7495,8 @@ let numactl = callPackage ../os-specific/linux/numactl { }; + gocode = callPackage ../development/tools/gocode { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; @@ -7782,6 +7794,8 @@ let arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { }; + aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; + bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; cacert = callPackage ../data/misc/cacert { }; @@ -8067,6 +8081,8 @@ let calibre = callPackage ../applications/misc/calibre { }; + camlistore = callPackage ../applications/misc/camlistore { }; + carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python @@ -8190,6 +8206,8 @@ let djvulibre = callPackage ../applications/misc/djvulibre { }; + djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; + djview = callPackage ../applications/graphics/djview { }; djview4 = pkgs.djview; @@ -8359,6 +8377,8 @@ let maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; + metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; + notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; @@ -8375,12 +8395,19 @@ let prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; - proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral { + proofgeneral_4_2 = callPackage ../applications/editors/emacs-modes/proofgeneral/4.2.nix { + texinfo = texinfo4 ; + texLive = pkgs.texLiveAggregationFun { + paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; + }; + }; + proofgeneral_4_3_pre = callPackage ../applications/editors/emacs-modes/proofgeneral/4.3pre.nix { texinfo = texinfo4 ; texLive = pkgs.texLiveAggregationFun { paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; }; }; + proofgeneral = self.proofgeneral_4_2; quack = callPackage ../applications/editors/emacs-modes/quack { }; @@ -8600,6 +8627,8 @@ let python = python27; }; + gitolite = callPackage ../applications/version-management/gitolite { }; + inherit (gnome3) gitg; giv = callPackage ../applications/graphics/giv { @@ -9410,9 +9439,7 @@ let siproxd = callPackage ../applications/networking/siproxd { }; - skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - usePulseAudio = config.pulseaudio or true; - }; + skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; @@ -10136,6 +10163,8 @@ let opentyrian = callPackage ../games/opentyrian { }; + openxcom = callPackage ../games/openxcom { }; + pingus = callPackage ../games/pingus {}; pioneers = callPackage ../games/pioneers { }; @@ -10415,6 +10444,8 @@ let kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; + kdeconnect = callPackage ../applications/misc/kdeconnect { }; + kdenlive = callPackage ../applications/video/kdenlive { }; kdesvn = callPackage ../applications/version-management/kdesvn { }; @@ -10703,6 +10734,12 @@ let tptp = callPackage ../applications/science/logic/tptp {}; + twelf = callPackage ../applications/science/logic/twelf { + smlnj = if stdenv.isDarwin + then smlnjBootstrap + else smlnj; + }; + verifast = callPackage ../applications/science/logic/verifast {}; why3 = callPackage ../applications/science/logic/why3 {}; @@ -11041,6 +11078,8 @@ let streamripper = callPackage ../applications/audio/streamripper { }; + sqsh = callPackage ../development/tools/sqsh { }; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tex4ht = callPackage ../tools/typesetting/tex/tex4ht { }; @@ -11227,6 +11266,7 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; + asciidocFull = asciidoc-full; # added 2014-06-22 }; in self; in pkgs diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index beeee5663dc0..a770cbdda8f7 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -44,6 +44,10 @@ haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; + rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_1; }; + distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; + networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; + distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 vty_5_1_0 = super.vty_5_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f2334b9e6a8a..166e81c46dd9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -636,6 +636,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; + + distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; distributive = callPackage ../development/libraries/haskell/distributive {}; @@ -797,12 +799,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in foldl = callPackage ../development/libraries/haskell/foldl {}; + folds = callPackage ../development/libraries/haskell/folds {}; + forceLayout = callPackage ../development/libraries/haskell/force-layout {}; free = callPackage ../development/libraries/haskell/free {}; - freeOperational = callPackage ../development/libraries/haskell/free-operational {}; - freeGame_1_0_5 = callPackage ../development/libraries/haskell/free-game/1.0.5.nix { boundingboxes = self.boundingboxes_0_1_1; }; @@ -1066,6 +1068,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HaXml = callPackage ../development/libraries/haskell/HaXml {}; + hdaemonize = callPackage ../development/libraries/haskell/hdaemonize {}; + HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {}; HDBCOdbc = callPackage ../development/libraries/haskell/HDBC/HDBC-odbc.nix { @@ -1104,7 +1108,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; - hmatrix-special = callPackage ../development/libraries/haskell/hmatrix-special {}; + hmatrixSpecial = callPackage ../development/libraries/haskell/hmatrix-special {}; hoauth = callPackage ../development/libraries/haskell/hoauth {}; @@ -1208,6 +1212,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HUnit_1_2_5_2 = callPackage ../development/libraries/haskell/HUnit/1.2.5.2.nix {}; HUnit = self.HUnit_1_2_5_2; + hweblib = callPackage ../development/libraries/haskell/hweblib/default.nix {}; + hxt = callPackage ../development/libraries/haskell/hxt {}; hxtCharproperties = callPackage ../development/libraries/haskell/hxt-charproperties {}; @@ -1278,6 +1284,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in preprocessorTools = self.preprocessorTools_0_1_3; }; + ixset = callPackage ../development/libraries/haskell/ixset {}; + ixShapable = callPackage ../development/libraries/haskell/ix-shapable {}; jack = callPackage ../development/libraries/haskell/jack {}; @@ -1464,6 +1472,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in monadloc = callPackage ../development/libraries/haskell/monadloc {}; + monadlocPp = callPackage ../development/libraries/haskell/monadloc-pp {}; + monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; @@ -1958,6 +1968,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setlocale = callPackage ../development/libraries/haskell/setlocale {}; + shellmate = callPackage ../development/libraries/haskell/shellmate {}; + shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; shelly = self.shelly_1_5_3_1; @@ -1966,6 +1978,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; + simpleSqlParser = callPackage ../development/libraries/haskell/simple-sql-parser {}; + silently = callPackage ../development/libraries/haskell/silently {}; sizedTypes = callPackage ../development/libraries/haskell/sized-types {}; @@ -2156,6 +2170,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {}; + tables = callPackage ../development/libraries/haskell/tables {}; + tabular = callPackage ../development/libraries/haskell/tabular {}; tagged = callPackage ../development/libraries/haskell/tagged {}; @@ -2186,6 +2202,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in TCache = callPackage ../development/libraries/haskell/TCache {}; + tcacheAWS = callPackage ../development/libraries/haskell/tcache-AWS {}; + templateDefault = callPackage ../development/libraries/haskell/template-default {}; temporary = callPackage ../development/libraries/haskell/temporary {}; @@ -2456,12 +2474,15 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in wcwidth = callPackage ../development/libraries/haskell/wcwidth {}; + webdriver = callPackage ../development/libraries/haskell/webdriver {}; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; websockets = callPackage ../development/libraries/haskell/websockets { testFrameworkQuickcheck2 = self.testFrameworkQuickcheck2.override { QuickCheck = self.QuickCheck_2_6; }; + QuickCheck = self.QuickCheck_2_6; }; websocketsSnap = callPackage ../development/libraries/haskell/websockets-snap {}; @@ -2601,16 +2622,18 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {}; - Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix {}; - Agda = self.Agda_2_3_2_2; + Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix { + binary = self.binary_0_7_2_1; + }; + Agda = self.Agda_2_4_0_1; AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { Agda = self.Agda_2_3_2_2; }; - AgdaStdlib_2_4_0 = callPackage ../development/compilers/agda/stdlib-2.4.0.nix { + AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix { Agda = self.Agda_2_4_0_1; }; - AgdaStdlib = self.AgdaStdlib_0_7; + AgdaStdlib = self.AgdaStdlib_0_8; uhc = callPackage ../development/compilers/uhc {}; @@ -2716,6 +2739,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in darcs = callPackage ../applications/version-management/darcs {}; idris_plain = callPackage ../development/compilers/idris { + parsers = self.parsers_0_10_3; + trifecta = self.trifecta.override { + parsers = self.parsers_0_10_3; + }; llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 8a01151bd77f..39ea219cf645 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -48,4 +48,18 @@ let self = with self; { sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y"; }; }; + + zmq = buildPecl rec { + name = "zmq-1.1.2"; + src = pkgs.fetchurl { + url = "http://pecl.php.net/get/${name}.tgz"; + sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69"; + }; + + configureFlags = [ + "--with-zmq=${pkgs.zeromq2}" + ]; + + buildInputs = [ pkgs.pkgconfig ]; + }; }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb7fabe7daa4..f21bf4f4df93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -146,6 +146,12 @@ rec { inherit python; }; + tables = import ../development/python-modules/tables { + inherit (pkgs) stdenv fetchurl bzip2 lzo; + inherit python buildPythonPackage cython numpy numexpr; + hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; + }; + # packages defined here aafigure = buildPythonPackage rec { @@ -873,6 +879,7 @@ rec { # A patched version of buildout, useful for buildout based development on Nix zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; + zc_recipe_egg = zc_recipe_egg_buildout171; zc_buildout = zc_buildout171; zc_buildout2 = zc_buildout221; zc_buildout221 = buildPythonPackage rec { @@ -927,6 +934,29 @@ rec { }; }; + zc_recipe_egg_fun = { buildout, version, md5 }: buildPythonPackage rec { + inherit version; + name = "zc.recipe.egg-${version}"; + + buildInputs = [ buildout ]; + doCheck = false; + + src = fetchurl { + inherit md5; + url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-${version}.tar.gz"; + }; + }; + zc_recipe_egg_buildout171 = zc_recipe_egg_fun { + buildout = zc_buildout171; + version = "1.3.2"; + md5 = "1cb6af73f527490dde461d3614a36475"; + }; + zc_recipe_egg_buildout2 = zc_recipe_egg_fun { + buildout = zc_buildout2; + version = "2.0.1"; + md5 = "5e81e9d4cc6200f5b1abcf7c653dd9e3"; + }; + bunch = buildPythonPackage (rec { name = "bunch-1.0.1"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; @@ -3385,17 +3415,16 @@ rec { gyp = buildPythonPackage rec { - rev = "1738"; + rev = "1944"; name = "gyp-r${rev}"; src = fetchsvn { url = "http://gyp.googlecode.com/svn/trunk"; inherit rev; - sha256 = "155k7v6453j2kg02xqfqbkzkbaqc8aynxs2k462jmrp638vxia9s"; + sha256 = "15k3ivk3jyhx4rwdf1mn6qpyrwixvy01jpkir8d14c4g9hax1dx1"; }; patches = optionals pkgs.stdenv.isDarwin [ - ../development/python-modules/gyp/no-xcode.patch ../development/python-modules/gyp/no-darwin-cflags.patch ]; @@ -4465,12 +4494,12 @@ rec { }); nose = buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.3"; name = "nose-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz"; - sha256 = "1fmn5b7v183ym793ghrbh76b27aww9qv0lhl7dz31f9xmf3kn9w5"; + sha256 = "09h3a74hzw1cfx4ic19ibxq8kg6sl1n64px2mmb57f5yd3r2y35l"; }; buildInputs = [ coverage ]; @@ -4602,6 +4631,43 @@ rec { }; }; + numexpr = buildPythonPackage rec { + version = "2.4"; + name = "numexpr-${version}"; + + src = fetchgit { + url = https://github.com/pydata/numexpr.git; + rev = "606cc9a110711e947d35ac2770749c00dab184c8"; + sha256 = "1gxgkg7ncgjhnifn444iha5nrjhyr8sr6w5yp204186a1ysz858g"; + }; + + propagatedBuildInputs = with pkgs; [ numpy ]; + + # Run the test suite. + # It requires the build path to be in the python search path. + checkPhase = '' + ${python}/bin/${python.executable} <<EOF + import sysconfig + import sys + import os + f = "lib.{platform}-{version[0]}.{version[1]}" + lib = f.format(platform=sysconfig.get_platform(), + version=sys.version_info) + build = os.path.join(os.getcwd(), 'build', lib) + sys.path.insert(0, build) + import numexpr + r = numexpr.test() + if not r.wasSuccessful(): + sys.exit(1) + EOF + ''; + + meta = { + description = "Fast numerical array expression evaluator for NumPy"; + homepage = "https://github.com/pydata/numexpr"; + }; + }; + numpy = buildPythonPackage ( rec { name = "numpy-1.7.1"; @@ -4836,11 +4902,11 @@ rec { }); pandas = buildPythonPackage rec { - name = "pandas-0.12.0"; + name = "pandas-0.14.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; - sha256 = "0vf865wh1kcq33189ykqgngb25nxhxxch6skfdl3c6w024v4r6xy"; + sha256 = "f7997debca756c4dd5ccdf5a010dfe3d1c7dac98ee706b715d994cf7c9d35528"; }; buildInputs = [ nose ]; @@ -5927,11 +5993,11 @@ rec { }; pyrax = buildPythonPackage rec { - name = "pyrax-1.7.3"; + name = "pyrax-1.8.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyrax/${name}.tar.gz"; - sha256 = "1br2kspw0sn7xgkk7z93h72s2v3qm88jvi4213zgz90jhzjj42bv"; + sha256 = "0hvim60bhgfj91m7pp8jfmb49f087xqlgkqa505zw28r7yl0hcfp"; }; meta = { diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 61d1ad7ad681..ea7ca4d501f7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -29,1404 +29,7 @@ let } // (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; }; - 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; }; - 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; }; - 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; }; - boost149 = { 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; }; - cdrdao = { 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - gcl = { 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; + offlineimap = { 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; }; @@ -1461,520 +64,6 @@ let 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; }; - 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; }; - 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; }; - R = { 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; }; - s3cmd_git = { 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; - 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; }; }); in jobs |