From 2c32576a912af1d7d7311d6837f21d4aa8b2d8c7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 13 Jul 2013 14:09:24 +0000 Subject: [PATCH 01/80] add emacs-modes/{apel, flim, semi, wanderlust} --- .../editors/emacs-modes/apel/default.nix | 25 ++++++++++++++ .../editors/emacs-modes/flim/default.nix | 30 +++++++++++++++++ .../editors/emacs-modes/semi/default.nix | 33 +++++++++++++++++++ .../emacs-modes/wanderlust/default.nix | 31 +++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++++ 5 files changed, 127 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/apel/default.nix create mode 100644 pkgs/applications/editors/emacs-modes/flim/default.nix create mode 100644 pkgs/applications/editors/emacs-modes/semi/default.nix create mode 100644 pkgs/applications/editors/emacs-modes/wanderlust/default.nix diff --git a/pkgs/applications/editors/emacs-modes/apel/default.nix b/pkgs/applications/editors/emacs-modes/apel/default.nix new file mode 100644 index 00000000000..7036dc3bcc5 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/apel/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchgit, emacs}: + +stdenv.mkDerivation rec { + name = "apel-git"; + + src = fetchgit { + url = "http://github.com/wanderlust/apel"; + rev = "beca6c4fc58fdc0f8923b320265ec5a304850f50"; + }; + + buildInputs = [emacs]; + + preConfigure = '' + cat << EOF > APEL-CFG + (setq APEL_DIR "$out/share/emacs/site-lisp/apel") + (setq EMU_DIR "$out/share/emacs/site-lisp/emu") + EOF + ''; + + meta = { + description = "APEL"; + homepage = http://nya.org/; + license = "GPL"; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/flim/default.nix b/pkgs/applications/editors/emacs-modes/flim/default.nix new file mode 100644 index 00000000000..1da221a4b1b --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/flim/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchgit, emacs, apel}: + +stdenv.mkDerivation rec { + name = "flim-git"; + + src = fetchgit { + url = "http://github.com/wanderlust/flim"; + rev = "d435c3626d2e07cc62f084930b6d5eca66f6768c"; + }; + + buildInputs = [emacs apel]; + + preConfigure = '' + cat << EOF > FLIM-CFG + (add-to-list 'load-path "${apel}/share/emacs/site-lisp/apel") + (add-to-list 'load-path "${apel}/share/emacs/site-lisp/emu") + (require 'install) + (setq PREFIX "$out/share") + (setq LISPDIR "$out/share/emacs/site-lisp") + (setq FLIM_DIR "$out/share/emacs/site-lisp/flim") + EOF + cat FLIM-CFG + ''; + + meta = { + description = "FLIM"; + homepage = http://nya.org/; + license = "GPL"; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/semi/default.nix b/pkgs/applications/editors/emacs-modes/semi/default.nix new file mode 100644 index 00000000000..43e184608d9 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/semi/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchgit, emacs, apel, flim}: + +stdenv.mkDerivation rec { + name = "semi-git"; + + src = fetchgit { + url = "http://github.com/wanderlust/semi"; + rev = "e81b1ec56a5d2c8ae352df1cd6a7eaa2532097f0"; + }; + + buildInputs = [emacs apel flim]; + + preConfigure = '' + cat << EOF > SEMI-CFG + (add-to-list 'load-path "${apel}/share/emacs/site-lisp/apel") + (add-to-list 'load-path "${apel}/share/emacs/site-lisp/emu") + (add-to-list 'load-path "${flim}/share/emacs/site-lisp/flim") + (require 'install) + (setq PREFIX "$out") + (setq METHOD_DIR "$out/share/semi") + (setq LISPDIR "$out/share/emacs/site-lisp") + (setq SEMI_KERNEL_DIR "$out/share/emacs/site-lisp/semi") + (setq SETUP_FILE_DIR "$out/share/emacs/site-lisp/semi") + EOF + cat SEMI-CFG + ''; + + meta = { + description = "SEMI"; + homepage = http://nya.org/; + license = "GPL"; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/wanderlust/default.nix b/pkgs/applications/editors/emacs-modes/wanderlust/default.nix new file mode 100644 index 00000000000..0ee49bef161 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/wanderlust/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchgit, emacs, apel, flim, semi}: + +stdenv.mkDerivation rec { + name = "wanderlust-git"; + + src = fetchgit { + url = "http://github.com/wanderlust/wanderlust"; + rev = "5e1ccbda73e29657fc05dc05aa9717eff02fdf71"; + }; + + buildInputs = [emacs apel flim semi]; + + preConfigure = '' + cat << EOF > WL-CFG + (add-to-list 'load-path "${apel}/share/emacs/site-lisp/apel") + (add-to-list 'load-path "${apel}/share/emacs/site-lisp/emu") + (add-to-list 'load-path "${flim}/share/emacs/site-lisp/flim") + (add-to-list 'load-path "${semi}/share/emacs/site-lisp/semi") + (require 'install) + (setq LISPDIR "$out/share/emacs/site-lisp") + (setq PIXMAPDIR (concat "$out/share/emacs/" emacs-version "/etc/wl/icons")) + EOF + cat WL-CFG + ''; + + meta = { + description = "wanderlust"; + homepage = http://nya.org/; + license = "GPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fba5857cfb4..690ff3851e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10018,6 +10018,8 @@ let autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; + apel = callPackage ../applications/editors/emacs-modes/apel { }; + bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {}; @@ -10056,6 +10058,8 @@ let ess = callPackage ../applications/editors/emacs-modes/ess { }; + flim = callPackage ../applications/editors/emacs-modes/flim { }; + flycheck = callPackage ../applications/editors/emacs-modes/flycheck { }; flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; @@ -10147,6 +10151,8 @@ let sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { }; + semi = callPackage ../applications/editors/emacs-modes/semi { }; + scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; @@ -10161,6 +10167,8 @@ let tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; + wanderlust = callPackage ../applications/editors/emacs-modes/wanderlust { }; + writeGood = callPackage ../applications/editors/emacs-modes/writegood { }; xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; From a444eff3f29c292ffb62700572cbd4c9cdb3718b Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 2 Mar 2015 23:37:43 +0000 Subject: [PATCH 02/80] reorganize emacs related files --- .../{melpa/default.nix => emacs/melpa.nix} | 0 .../{melpa => emacs}/melpa2nix.el | 0 .../{melpa => emacs}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 22 +++++++++++-------- ...-melpa-packages.nix => emacs-packages.nix} | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) rename pkgs/build-support/{melpa/default.nix => emacs/melpa.nix} (100%) rename pkgs/build-support/{melpa => emacs}/melpa2nix.el (100%) rename pkgs/build-support/{melpa => emacs}/setup-hook.sh (100%) rename pkgs/top-level/{emacs-melpa-packages.nix => emacs-packages.nix} (99%) diff --git a/pkgs/build-support/melpa/default.nix b/pkgs/build-support/emacs/melpa.nix similarity index 100% rename from pkgs/build-support/melpa/default.nix rename to pkgs/build-support/emacs/melpa.nix diff --git a/pkgs/build-support/melpa/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el similarity index 100% rename from pkgs/build-support/melpa/melpa2nix.el rename to pkgs/build-support/emacs/melpa2nix.el diff --git a/pkgs/build-support/melpa/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh similarity index 100% rename from pkgs/build-support/melpa/setup-hook.sh rename to pkgs/build-support/emacs/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 690ff3851e1..b5eed339f46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9984,6 +9984,8 @@ let elvis = callPackage ../applications/editors/elvis { }; emacs = emacs24; + emacsPackages = emacs24Packages; + emacsMelpa = emacs24Melpa; emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features @@ -10006,14 +10008,7 @@ let }); emacs24Macport = self.emacs24Macport_24_4; - emacsMelpa = import ./emacs-melpa-packages.nix { - inherit stdenv pkgs fetchurl fetchgit fetchFromGitHub emacs texinfo; - external = { - inherit (haskellngPackages) ghc-mod structured-haskell-mode; - }; - }; - - emacsPackages = emacs: self: let callPackage = newScope self; in rec { + emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; @@ -10176,7 +10171,16 @@ let cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); + emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); + + emacsMelpaGen = emacs: import ./emacs-packages.nix { + inherit stdenv pkgs fetchurl fetchgit fetchFromGitHub emacs texinfo; + external = { + inherit (haskellngPackages) ghc-mod structured-haskell-mode; + }; + }; + + emacs24Melpa = emacsMelpaGen emacs24; inherit (gnome3) empathy; diff --git a/pkgs/top-level/emacs-melpa-packages.nix b/pkgs/top-level/emacs-packages.nix similarity index 99% rename from pkgs/top-level/emacs-melpa-packages.nix rename to pkgs/top-level/emacs-packages.nix index e8f965a784a..0be7a3adf47 100644 --- a/pkgs/top-level/emacs-melpa-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -16,7 +16,7 @@ with stdenv.lib.licences; let - melpaBuild = import ../build-support/melpa { + melpaBuild = import ../build-support/emacs/melpa.nix { inherit stdenv fetchurl emacs texinfo; }; in From f431f73964b4ccd8fdcb979b69f0b0cedd155527 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 2 Mar 2015 23:22:15 +0100 Subject: [PATCH 03/80] Update: Enlightenment + EFL EFL: 1.12.3 -> 1.13.1 Enlightenment: 1.19.3 -> 1.19.4 --- pkgs/desktops/e19/econnman.nix | 4 ++-- pkgs/desktops/e19/efl.nix | 9 +++++---- pkgs/desktops/e19/elementary.nix | 4 ++-- pkgs/desktops/e19/emotion.nix | 4 ++-- pkgs/desktops/e19/enlightenment.nix | 6 +++--- pkgs/desktops/e19/evas.nix | 4 ++-- pkgs/desktops/e19/terminology.nix | 1 + pkgs/top-level/python-packages.nix | 10 +++++----- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index c29a57af54a..8eaebaf0af3 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_12 python27Packages.dbus e19.elementary ]; + propagatedBuildInputs = [ python27Packages.pythonefl_1_13 python27Packages.dbus e19.elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_12}/lib/python2.7/site-packages + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_13}/lib/python2.7/site-packages ''; meta = { diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index ad0ab6fe6c1..ac7577d91fd 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.12.3"; + version = "1.13.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "1xvcym11j4vs8djx7v70alzyhir1gw2zsm1nl5kv1pfz1kgqc8fv"; + sha256 = "0wjy2n2ggjd9mzv9y0ra21wfjdbw927hdh6pz537p820bnghcivy"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 - harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm ]; + harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm + libinput ]; # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 39197cce167..06166dd0978 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.12.3"; + version = "1.13.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "0ajljrr72rdz9hniqvsigw7p6dmpqnf0nijrxd2x91gx2cfrwksm"; + sha256 = "0jfbw48krpzcj944rvyy1rmq7cykad6cwhjh54fhp52lh7c5savk"; }; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index 96c791d1b93..bffc2e70f59 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "1nm0qbdkhrpgvmj5qn7l4jj5l1g4zz77bda0ddy67fqkn5h3qarg"; + sha256 = "0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3"; }; buildInputs = [ pkgconfig e19.efl vlc ]; preConfigure = '' diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index fc910b081c4..2cccf3a0dfd 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.3"; + version = "0.19.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "1myv463agfzgva7fv0y74lk5sxfpf6mxykkc37cb7dyn3cxchdan"; + sha256 = "0r3bad700cfx5sq8y61dbz3hxdx9n3nf5hzx40ryqld75yxzwxz7"; }; buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/elocation-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export USER_SESSION_DIR=$prefix/lib/systemd/user substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index bc678c6aab8..abc63e14f2a 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "0viph73wv83xw9g6rgjhhiav9n896m0ixnz2m27cnmmn8llchcf5"; + sha256 = "16yzjk58bxsd0rlnpzrr8as9fxjjiq01swzhpadsgkmq33abgg63"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix index 1fe39c13321..96028311f1e 100644 --- a/pkgs/desktops/e19/terminology.nix +++ b/pkgs/desktops/e19/terminology.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/elocation-1 $NIX_CFLAGS_COMPILE" ''; meta = { description = "The best terminal emulator written with the EFL"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f2d646c217..4cd58995526 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13394,12 +13394,12 @@ let }; }; - pythonefl_1_12 = buildPythonPackage rec { + pythonefl_1_13 = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.12.0"; + version = "1.13.0"; src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; - sha256 = "0rxv5nrqg5c2l93ns2k6gjil1y7qq6amfh5slkarm3kv8fzk17xv"; + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.bz2"; + sha256 = "0yy4v0f04dgdz21wd2c09x9w6lzsbq6g12s8895laln44l5aqd82"; }; preConfigure = '' export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" @@ -13408,7 +13408,7 @@ let meta = { description = "Python bindings for EFL and Elementary."; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; }; From e4a4e109ba49f3868f63a61e514c4846a1cd0b9a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 20 Jan 2014 23:57:04 +0000 Subject: [PATCH 04/80] refactor Emacs packages'/modes' builders This simplifies melpa builder by merging with it my old emacs modes builder, adds better instructions and support for overrides in emacs-packages.nix, and renames some emacs-related stuff in all-packages.nix for sanity reasons. I declare this backwards compatible since direct uses of emacsPackages in configuration.nix are very unlikely. --- pkgs/build-support/emacs/generic.nix | 41 ++++++++++++++++++ pkgs/build-support/emacs/melpa.nix | 63 ++++++---------------------- pkgs/build-support/emacs/trivial.nix | 34 +++++++++++++++ pkgs/top-level/all-packages.nix | 20 +++++++-- pkgs/top-level/emacs-packages.nix | 53 +++++++++++++---------- 5 files changed, 136 insertions(+), 75 deletions(-) create mode 100644 pkgs/build-support/emacs/generic.nix create mode 100644 pkgs/build-support/emacs/trivial.nix diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix new file mode 100644 index 00000000000..be81e93e32a --- /dev/null +++ b/pkgs/build-support/emacs/generic.nix @@ -0,0 +1,41 @@ +# generic builder for Emacs packages + +{ lib, stdenv, emacs, texinfo }: + +with lib; + +{ pname +, version ? null + +, buildInputs ? [] +, packageRequires ? [] + +, meta ? {} + +, ... +}@args: + +let + defaultMeta = { + broken = false; + platforms = emacs.meta.platforms; + }; +in + +stdenv.mkDerivation ({ + name = "emacs-${pname}${optionalString (version != null) "-${version}"}"; + + buildInputs = [emacs texinfo] ++ packageRequires ++ buildInputs; + propagatedBuildInputs = packageRequires; + propagatedUserEnvPkgs = packageRequires; + + setupHook = ./setup-hook.sh; + + doCheck = false; + + meta = defaultMeta // meta; +} + +// removeAttrs args [ "buildInputs" "packageRequires" + "meta" + ]) diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 11cb14f93db..607a1b4a5ef 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,14 +1,12 @@ -# generic builder for Emacs packages +# builder for Emacs packages built for packages.el +# using MELPA package-build.el -{ stdenv, fetchurl, emacs, texinfo -, extension ? (self : super : {}) -}: +{ lib, stdenv, fetchurl, emacs, texinfo }: + +with lib; { pname , version -, src -, packageRequires ? [] -, extraBuildInputs ? [] , files ? null , fileSpecs ? [ "*.el" "*.el.in" "dir" @@ -18,19 +16,12 @@ , meta ? {} -, preUnpack ? "", postUnpack ? "" -, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" -, configureFlags ? [], preConfigure ? "", postConfigure ? "" -, buildPhase ? "", preBuild ? "", postBuild ? "" -, preInstall ? "", postInstall ? "" -, doCheck ? false, checkPhase ? "", preCheck ? "", postCheck ? "" -, preFixup ? "", postFixup ? "" -}: +, ... +}@args: let - inherit (stdenv.lib) concatStringsSep optionalAttrs; - packageBuild = fetchurl { + packageBuild = fetchurl { url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el; sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk"; }; @@ -40,23 +31,13 @@ let targets = concatStringsSep " " (if files == null then fileSpecs else files); defaultMeta = { - broken = false; homepage = "http://melpa.org/#/${pname}"; - platforms = emacs.meta.platforms; }; in -stdenv.mkDerivation ({ - name = "emacs-${fname}"; - - inherit src packageBuild; - - buildInputs = [emacs texinfo] ++ packageRequires ++ extraBuildInputs; - propagatedBuildInputs = packageRequires; - propagatedUserEnvPkgs = packageRequires; - - setupHook = ./setup-hook.sh; +import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ + inherit packageBuild; buildPhase = '' runHook preBuild @@ -81,24 +62,6 @@ stdenv.mkDerivation ({ meta = defaultMeta // meta; } -// optionalAttrs (preUnpack != "") { inherit preUnpack; } -// optionalAttrs (postUnpack != "") { inherit postUnpack; } -// optionalAttrs (configureFlags != []) { inherit configureFlags; } -// optionalAttrs (patches != []) { inherit patches; } -// optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (prePatch != "") { inherit prePatch; } -// optionalAttrs (postPatch != "") { inherit postPatch; } -// optionalAttrs (preConfigure != "") { inherit preConfigure; } -// optionalAttrs (postConfigure != "") { inherit postConfigure; } -// optionalAttrs (buildPhase != "") { inherit buildPhase; } -// optionalAttrs (preBuild != "") { inherit preBuild; } -// optionalAttrs (postBuild != "") { inherit postBuild; } -// optionalAttrs (doCheck) { inherit doCheck; } -// optionalAttrs (checkPhase != "") { inherit checkPhase; } -// optionalAttrs (preCheck != "") { inherit preCheck; } -// optionalAttrs (postCheck != "") { inherit postCheck; } -// optionalAttrs (preInstall != "") { inherit preInstall; } -// optionalAttrs (postInstall != "") { inherit postInstall; } -// optionalAttrs (preFixup != "") { inherit preFixup; } -// optionalAttrs (postFixup != "") { inherit postFixup; } -) +// removeAttrs args [ "files" "fileSpecs" + "meta" + ]) diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix new file mode 100644 index 00000000000..9c97e8bf951 --- /dev/null +++ b/pkgs/build-support/emacs/trivial.nix @@ -0,0 +1,34 @@ +# trivial builder for Emacs packages + +{ lib, ... }@envargs: + +with lib; + +args: + +import ./generic.nix envargs ({ + #preConfigure = '' + # export LISPDIR=$out/share/emacs/site-lisp + # export VERSION_SPECIFIC_LISPDIR=$out/share/emacs/site-lisp + #''; + + buildPhase = '' + eval "$preBuild" + + emacs -L . --batch -f batch-byte-compile *.el + + eval "$postBuild" + ''; + + installPhase = '' + eval "$preInstall" + + LISPDIR=$out/share/emacs/site-lisp + install -d $LISPDIR + install *.el *.elc $LISPDIR + + eval "$postInstall" + ''; +} + +// args) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5eed339f46..78c9b3195c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9985,7 +9985,8 @@ let emacs = emacs24; emacsPackages = emacs24Packages; - emacsMelpa = emacs24Melpa; + emacsPackagesNg = emacs24PackagesNg; + emacsMelpa = emacs24PackagesNg; # for backward compatibility emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features @@ -10173,14 +10174,25 @@ let emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); - emacsMelpaGen = emacs: import ./emacs-packages.nix { - inherit stdenv pkgs fetchurl fetchgit fetchFromGitHub emacs texinfo; + emacsPackagesNgGen = emacs: import ./emacs-packages.nix { + overrides = (config.emacsPackageOverrides or (p: {})) pkgs; + + inherit lib stdenv fetchurl fetchgit fetchFromGitHub emacs; + + trivialBuild = import ../build-support/emacs/trivial.nix { + inherit lib stdenv emacs texinfo; + }; + + melpaBuild = import ../build-support/emacs/melpa.nix { + inherit lib stdenv fetchurl emacs texinfo; + }; + external = { inherit (haskellngPackages) ghc-mod structured-haskell-mode; }; }; - emacs24Melpa = emacsMelpaGen emacs24; + emacs24PackagesNg = emacsPackagesNgGen emacs24; inherit (gnome3) empathy; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 0be7a3adf47..9f7c9675cb0 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -1,27 +1,37 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, fetchgit -, emacs, texinfo - -# non-emacs packages -, external -}: - # package.el-based emacs packages - -## init.el +# +## add this at the start your init.el: # (require 'package) -# (setq package-archives nil -# package-user-dir "~/.nix-profile/share/emacs/site-lisp/elpa") +# +# ;; optional. makes unpure packages archives unavailable +# (setq package-archives nil) +# +# (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa") +# +# ;; optional. use this if you install emacs packages to user profiles (with nix-env) +# (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa") +# # (package-initialize) -with stdenv.lib.licences; +{ overrides -let - melpaBuild = import ../build-support/emacs/melpa.nix { - inherit stdenv fetchurl emacs texinfo; - }; -in +, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub + +, emacs +, trivialBuild +, melpaBuild + +, external +}@args: + +with lib.licences; + +let self = _self // overrides; + callPackage = lib.callPackageWith (self // removeAttrs args ["overrides" "external"]); + _self = with self; { + + ## START HERE -rec { ac-haskell-process = melpaBuild rec { pname = "ac-haskell-process"; version = "0.5"; @@ -100,7 +110,7 @@ rec { description = "Auto-complete extension for Emacs"; homepage = http://cx4a.org/software/auto-complete/; license = gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; }; @@ -709,7 +719,7 @@ rec { rev = "4cb2ced1eda5167ce774e04657d2cd077b63c706"; sha256 = "003sihp7irm0qqba778dx0gf8xhkxd1xk7ig5kgkryvl2jyirk28"; }; - postPatch = stdenv.lib.optionalString (!stdenv.isLinux) '' + postPatch = lib.optionalString (!stdenv.isLinux) '' rm weechat-sauron.el weechat-secrets.el ''; packageRequires = [ s ]; @@ -727,4 +737,5 @@ rec { }; meta = { licence = gpl3Plus; }; }; -} + +}; in self From e3f6e475b7c2a443b3baadbe58f0f2bcf33a0e74 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 21 Jan 2014 00:22:32 +0000 Subject: [PATCH 05/80] add agda emacs package wrapper --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/emacs-packages.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c9b3195c6..deb0d0483c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10188,7 +10188,7 @@ let }; external = { - inherit (haskellngPackages) ghc-mod structured-haskell-mode; + inherit (haskellngPackages) ghc-mod structured-haskell-mode Agda; }; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 9f7c9675cb0..04e1dac6857 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -70,6 +70,29 @@ let self = _self // overrides; meta = { licence = gpl3Plus; }; }; + agda2-mode = with external; trivialBuild { + pname = "agda-mode"; + version = Agda.version; + + phases = [ "buildPhase" "installPhase" ]; + + # already byte-compiled by Agda builder + buildPhase = '' + agda=`${Agda}/bin/agda-mode locate` + cp `dirname $agda`/*.el* . + ''; + + meta = { + description = "Agda2-mode for Emacs extracted from Agda package"; + longDescription = '' + Wrapper packages that liberates init.el from `agda-mode locate` magic. + Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el. + ''; + homepage = Agda.meta.homepage; + license = Agda.meta.license; + }; + }; + async = melpaBuild rec { pname = "async"; version = "1.2"; From de6e14f3315de5ef4eb80ba409dfe2a00132dfc6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 21 Jan 2014 00:05:57 +0000 Subject: [PATCH 06/80] add anzu emacs package --- pkgs/top-level/emacs-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 04e1dac6857..458978932bf 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -93,6 +93,27 @@ let self = _self // overrides; }; }; + anzu = melpaBuild rec { + pname = "anzu"; + version = "0.52"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-anzu"; + rev = "f41db6225d8fb983324765aa42c94d3ee379a49f"; + sha256 = "1mn20swasrl8kr557r1850vr1q0gcnwlxxafnc6lq5g01kjfcdxd"; + }; + meta = { + description = "Show number of matches in Emacs mode-line while searching"; + longDescription = '' + anzu.el is an Emacs port of anzu.vim. anzu.el provides a minor + mode which displays current match and total matches information + in the mode-line in various search mode. + ''; + homepage = https://github.com/syohex/emacs-anzu/; + license = gpl3Plus; + }; + }; + async = melpaBuild rec { pname = "async"; version = "1.2"; From e7061857c11374bd4ecab86f352141ae137f353a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 21 Jan 2014 00:04:12 +0000 Subject: [PATCH 07/80] add browse-kill-ring emacs package --- pkgs/top-level/emacs-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 458978932bf..f33033d12d2 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -171,6 +171,22 @@ let self = _self // overrides; meta = { licence = gpl3Plus; }; }; + browse-kill-ring = melpaBuild rec { + pname = "browse-kill-ring"; + version = "20140104"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "f81ca5f14479fa9e938f89bf8f6baa3c4bdfb755"; + sha256 = "149g4qs5dqy6yzdj5smb39id5f72bz64qfv5bjf3ssvhwl2rfba8"; + }; + meta = { + description = "Interactively insert items from Emacs kill-ring"; + homepage = https://github.com/browse-kill-ring/browse-kill-ring/; + license = gpl2Plus; + }; + }; + change-inner = melpaBuild rec { pname = "change-inner"; version = "20130208"; From 34e69a2572c7a09fb53fb4033cbfe2d7ef47ee66 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 21 Jan 2014 00:05:16 +0000 Subject: [PATCH 08/80] add ido-ubiquitous emacs package --- pkgs/top-level/emacs-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index f33033d12d2..2b96e0bb14a 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -512,6 +512,22 @@ let self = _self // overrides; meta = { licence = gpl3Plus; }; }; + ido-ubiquitous = melpaBuild rec { + pname = "ido-ubiquitous"; + version = "2.17"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = pname; + rev = "323e4cddc05d5a4546c1b64132b2b1e9f8896452"; + sha256 = "0wdjz3cqzrxhrk68g5gyvc9j2rb6f4yw00xbjgw9ldwlhmkwy5ja"; + }; + meta = { + description = "Does what you expected ido-everywhere to do in Emacs"; + homepage = https://github.com/DarwinAwardWinner/ido-ubiquitous/; + license = gpl3Plus; + }; + }; + idris-mode = melpaBuild rec { pname = "idris-mode"; version = "0.9.15"; From 59ebcccc59eea028494334e9a8c04de62ac80c13 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 21 Jan 2014 00:12:55 +0000 Subject: [PATCH 09/80] add nyan-mode emacs package --- .../editors/emacs-modes/nyan-mode/default.nix | 31 +++++++++++++++++++ .../emacs-modes/nyan-mode/directory.patch | 13 ++++++++ pkgs/top-level/emacs-packages.nix | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/nyan-mode/default.nix create mode 100644 pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix new file mode 100644 index 00000000000..ab94dbae950 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix @@ -0,0 +1,31 @@ +{trivialBuild, fetchFromGitHub}: + +trivialBuild rec { + pname = "nyan-mode"; + version = "20150128"; + + src = fetchFromGitHub { + owner = "TeMPOraL"; + repo = pname; + rev = "41faa2c809da7b2cb3e6f8fadefae3f338ced3f2"; + sha256 = "1idaac7sjc8hhbf5zif61ncg1pvg28c0qfihavdx61albww0ll7f"; + }; + + patches = [ ./directory.patch ]; + + preBuild = '' + substituteInPlace nyan-mode.el \ + --replace "@OUT@" "$out/" + ''; + + postInstall = '' + cp -r img $out + cp -r mus $out + ''; + + meta = { + description = "An analog indicator of the position in the buffer"; + homepage = https://github.com/TeMPOraL/nyan-mode/; + license = "GPLv3+"; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch b/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch new file mode 100644 index 00000000000..b471531ec34 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch @@ -0,0 +1,13 @@ +diff --git a/nyan-mode.el b/nyan-mode.el +index 939a25a..3d0b983 100644 +--- a/nyan-mode.el ++++ b/nyan-mode.el +@@ -106,7 +106,7 @@ This can be t or nil." + :group 'nyan) + + +-(defconst +nyan-directory+ (file-name-directory (or load-file-name buffer-file-name))) ++(defconst +nyan-directory+ "@OUT@") + + (defconst +nyan-cat-size+ 3) + diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 2b96e0bb14a..781a6b10bf6 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -593,6 +593,8 @@ let self = _self // overrides; meta = { licence = gpl3Plus; }; }; + nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {}; + org-plus-contrib = melpaBuild rec { pname = "org-plus-contrib"; version = "20141020"; From 8dd923a2e4f5911b8cc60bd8ce7b60a67e44c037 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 21 Jan 2014 00:11:57 +0000 Subject: [PATCH 10/80] add smex emacs package --- pkgs/top-level/emacs-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 781a6b10bf6..8dac3fa52df 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -710,6 +710,22 @@ let self = _self // overrides; meta = { licence = gpl3Plus; }; }; + smex = melpaBuild rec { + pname = "smex"; + version = "20141210"; + src = fetchFromGitHub { + owner = "nonsequitur"; + repo = pname; + rev = "aff8d4485139ac28f1c7e62912c0d0d480995831"; + sha256 = "0017f1ji7rxad2n49dhn5g0pmw6lmw80cqk6dynszizj46xpbqfp"; + }; + meta = { + description = "M-x enhancement for Emacs build on top of Ido"; + homepage = https://github.com/nonsequitur/smex/; + license = emacs.meta.license; # should be "same as Emacs" + }; + }; + structured-haskell-mode = melpaBuild rec { pname = "shm"; version = external.structured-haskell-mode.version; From 380389bc0bc04afcba3ef17bb4ffde147a845ddb Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 9 Jan 2015 23:02:02 +0000 Subject: [PATCH 11/80] update and convert {apel, flim, semi, wanderlust} to emacs packages --- .../editors/emacs-modes/apel/default.nix | 25 ------ .../editors/emacs-modes/flim/default.nix | 30 -------- .../editors/emacs-modes/semi/default.nix | 33 -------- .../emacs-modes/wanderlust/default.nix | 31 -------- pkgs/top-level/all-packages.nix | 8 -- pkgs/top-level/emacs-packages.nix | 76 +++++++++++++++++++ 6 files changed, 76 insertions(+), 127 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/apel/default.nix delete mode 100644 pkgs/applications/editors/emacs-modes/flim/default.nix delete mode 100644 pkgs/applications/editors/emacs-modes/semi/default.nix delete mode 100644 pkgs/applications/editors/emacs-modes/wanderlust/default.nix diff --git a/pkgs/applications/editors/emacs-modes/apel/default.nix b/pkgs/applications/editors/emacs-modes/apel/default.nix deleted file mode 100644 index 7036dc3bcc5..00000000000 --- a/pkgs/applications/editors/emacs-modes/apel/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchgit, emacs}: - -stdenv.mkDerivation rec { - name = "apel-git"; - - src = fetchgit { - url = "http://github.com/wanderlust/apel"; - rev = "beca6c4fc58fdc0f8923b320265ec5a304850f50"; - }; - - buildInputs = [emacs]; - - preConfigure = '' - cat << EOF > APEL-CFG - (setq APEL_DIR "$out/share/emacs/site-lisp/apel") - (setq EMU_DIR "$out/share/emacs/site-lisp/emu") - EOF - ''; - - meta = { - description = "APEL"; - homepage = http://nya.org/; - license = "GPL"; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/flim/default.nix b/pkgs/applications/editors/emacs-modes/flim/default.nix deleted file mode 100644 index 1da221a4b1b..00000000000 --- a/pkgs/applications/editors/emacs-modes/flim/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchgit, emacs, apel}: - -stdenv.mkDerivation rec { - name = "flim-git"; - - src = fetchgit { - url = "http://github.com/wanderlust/flim"; - rev = "d435c3626d2e07cc62f084930b6d5eca66f6768c"; - }; - - buildInputs = [emacs apel]; - - preConfigure = '' - cat << EOF > FLIM-CFG - (add-to-list 'load-path "${apel}/share/emacs/site-lisp/apel") - (add-to-list 'load-path "${apel}/share/emacs/site-lisp/emu") - (require 'install) - (setq PREFIX "$out/share") - (setq LISPDIR "$out/share/emacs/site-lisp") - (setq FLIM_DIR "$out/share/emacs/site-lisp/flim") - EOF - cat FLIM-CFG - ''; - - meta = { - description = "FLIM"; - homepage = http://nya.org/; - license = "GPL"; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/semi/default.nix b/pkgs/applications/editors/emacs-modes/semi/default.nix deleted file mode 100644 index 43e184608d9..00000000000 --- a/pkgs/applications/editors/emacs-modes/semi/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchgit, emacs, apel, flim}: - -stdenv.mkDerivation rec { - name = "semi-git"; - - src = fetchgit { - url = "http://github.com/wanderlust/semi"; - rev = "e81b1ec56a5d2c8ae352df1cd6a7eaa2532097f0"; - }; - - buildInputs = [emacs apel flim]; - - preConfigure = '' - cat << EOF > SEMI-CFG - (add-to-list 'load-path "${apel}/share/emacs/site-lisp/apel") - (add-to-list 'load-path "${apel}/share/emacs/site-lisp/emu") - (add-to-list 'load-path "${flim}/share/emacs/site-lisp/flim") - (require 'install) - (setq PREFIX "$out") - (setq METHOD_DIR "$out/share/semi") - (setq LISPDIR "$out/share/emacs/site-lisp") - (setq SEMI_KERNEL_DIR "$out/share/emacs/site-lisp/semi") - (setq SETUP_FILE_DIR "$out/share/emacs/site-lisp/semi") - EOF - cat SEMI-CFG - ''; - - meta = { - description = "SEMI"; - homepage = http://nya.org/; - license = "GPL"; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/wanderlust/default.nix b/pkgs/applications/editors/emacs-modes/wanderlust/default.nix deleted file mode 100644 index 0ee49bef161..00000000000 --- a/pkgs/applications/editors/emacs-modes/wanderlust/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchgit, emacs, apel, flim, semi}: - -stdenv.mkDerivation rec { - name = "wanderlust-git"; - - src = fetchgit { - url = "http://github.com/wanderlust/wanderlust"; - rev = "5e1ccbda73e29657fc05dc05aa9717eff02fdf71"; - }; - - buildInputs = [emacs apel flim semi]; - - preConfigure = '' - cat << EOF > WL-CFG - (add-to-list 'load-path "${apel}/share/emacs/site-lisp/apel") - (add-to-list 'load-path "${apel}/share/emacs/site-lisp/emu") - (add-to-list 'load-path "${flim}/share/emacs/site-lisp/flim") - (add-to-list 'load-path "${semi}/share/emacs/site-lisp/semi") - (require 'install) - (setq LISPDIR "$out/share/emacs/site-lisp") - (setq PIXMAPDIR (concat "$out/share/emacs/" emacs-version "/etc/wl/icons")) - EOF - cat WL-CFG - ''; - - meta = { - description = "wanderlust"; - homepage = http://nya.org/; - license = "GPL"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index deb0d0483c4..c0acbf53e8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10014,8 +10014,6 @@ let autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; - apel = callPackage ../applications/editors/emacs-modes/apel { }; - bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {}; @@ -10054,8 +10052,6 @@ let ess = callPackage ../applications/editors/emacs-modes/ess { }; - flim = callPackage ../applications/editors/emacs-modes/flim { }; - flycheck = callPackage ../applications/editors/emacs-modes/flycheck { }; flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; @@ -10147,8 +10143,6 @@ let sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { }; - semi = callPackage ../applications/editors/emacs-modes/semi { }; - scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; @@ -10163,8 +10157,6 @@ let tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; - wanderlust = callPackage ../applications/editors/emacs-modes/wanderlust { }; - writeGood = callPackage ../applications/editors/emacs-modes/writegood { }; xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 8dac3fa52df..86ae2157864 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -114,6 +114,29 @@ let self = _self // overrides; }; }; + apel = melpaBuild rec { + pname = "apel"; + version = "10.8"; + src = fetchFromGitHub { + owner = "wanderlust"; + repo = pname; + rev = "8402e59eadb580f59969114557b331b4d9364f95"; + sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m"; + }; + files = [ + "alist.el" "apel-ver.el" "broken.el" "calist.el" + "emu.el" "filename.el" "install.el" "inv-23.el" "invisible.el" + "mcharset.el" "mcs-20.el" "mcs-e20.el" "mule-caesar.el" + "path-util.el" "pccl-20.el" "pccl.el" "pces-20.el" "pces-e20.el" + "pces.el" "pcustom.el" "poe.el" "poem-e20.el" "poem-e20_3.el" + "poem.el" "product.el" "pym.el" "richtext.el" "static.el" + ]; + meta = { + description = "A Portable Emacs Library"; + license = gpl3Plus; # probably + }; + }; + async = melpaBuild rec { pname = "async"; version = "1.2"; @@ -324,6 +347,22 @@ let self = _self // overrides; meta = { licence = gpl3Plus; }; }; + flim = melpaBuild rec { + pname = "flim"; + version = "1.14.9"; # 20141216 + src = fetchFromGitHub { + owner = "wanderlust"; + repo = pname; + rev = "488a4d70fb4ae57bdd30dc75c2d75579894e28a2"; + sha256 = "178fhpbyffksr4v3m8jmx4rx2vqyz23qhbyvic5afabxi6lahjfs"; + }; + packageRequires = [ apel ]; + meta = { + description = "Email message encoding library for Emacs"; + license = gpl3Plus; # probably + }; + }; + flycheck-pos-tip = melpaBuild rec { pname = "flycheck-pos-tip"; version = "20140813"; @@ -671,6 +710,22 @@ let self = _self // overrides; meta = { licence = gpl3Plus; }; }; + semi = melpaBuild rec { + pname = "semi"; + version = "1.14.7"; # 20150203 + src = fetchFromGitHub { + owner = "wanderlust"; + repo = pname; + rev = "9976269556c5bcc021e4edf1b0e1accd39929528"; + sha256 = "1g1xg57pz4msd3f998af5gq28qhmvi410faygzspra6y6ygaka68"; + }; + packageRequires = [ apel flim ]; + meta = { + description = "MIME library for Emacs"; + license = gpl3Plus; # probably + }; + }; + shorten = melpaBuild rec { pname = "shorten"; version = "1.5"; @@ -804,6 +859,27 @@ let self = _self // overrides; meta = { licence = gpl3Plus; }; }; + wanderlust = melpaBuild rec { + pname = "wanderlust"; + version = "2.15.9"; # 20150301 + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "13fb4f6519490d4ac7138f3bcf76707654348071"; + sha256 = "1l48xfcwkm205prspa1rns6lqfizik5gpdwmlfgyb5mabm9x53zn"; + }; + packageRequires = [ apel flim semi ]; + fileSpecs = [ + "doc/wl.texi" "doc/wl-ja.texi" + "elmo/*.el" "wl/*.el" + "etc/icons" + ]; + meta = { + description = "E-Mail client for Emacs"; + license = gpl3Plus; # probably + }; + }; + weechat = melpaBuild rec { pname = "weechat.el"; version = "20141016"; From 6e59fa4941f9067bdaaf7aa63658aefb56b7f575 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 3 Mar 2015 03:09:36 +0000 Subject: [PATCH 12/80] add meta descriptions to a bunch of emacs packages --- pkgs/top-level/emacs-packages.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 86ae2157864..680ec72ed5c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -54,7 +54,10 @@ let self = _self // overrides; rev = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac"; sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6"; }; - meta = { licence = gpl3Plus; }; + meta = { + description = "Advanced cursor movements mode for Emacs"; + licence = gpl3Plus; + }; }; ag = melpaBuild rec { @@ -172,7 +175,6 @@ let self = _self // overrides; sha256 = "050lb8qjq7ra35mqp6j6qkwbvq5zj3yhz73aym5kf1vjd42rmjcw"; }; packageRequires = [ popup ]; - meta = { description = "Auto-complete extension for Emacs"; homepage = http://cx4a.org/software/auto-complete/; @@ -308,7 +310,10 @@ let self = _self // overrides; sha256 = "0wrmlmgr4mwxlmmh8blplddri2lpk4g8k3l1vpb5c6a975420qvn"; }; packageRequires = [ evil ]; - meta = { licence = gpl3Plus; }; + meta = { + description = "surround.vim emulation for Emacs evil mode"; + licence = gpl3Plus; + }; }; evil = melpaBuild { @@ -320,7 +325,10 @@ let self = _self // overrides; sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; }; packageRequires = [ goto-chg undo-tree ]; - meta = { licence = gpl3Plus; }; + meta = { + description = "Extensible vi layer for Emacs"; + licence = gpl3Plus; + }; }; exec-path-from-shell = melpaBuild rec { @@ -344,7 +352,10 @@ let self = _self // overrides; rev = "fa413e07c97997d950c92d6012f5442b5c3cee78"; sha256 = "04k0518wfy72wpzsswmncnhd372fxa0r8nbfhmbyfmns8n7sr045"; }; - meta = { licence = gpl3Plus; }; + meta = { + description = "Increases the selected region by semantic units in Emacs"; + licence = gpl3Plus; + }; }; flim = melpaBuild rec { From 23506c28886a1f685e0764fb7401155df646a66a Mon Sep 17 00:00:00 2001 From: Aistis Raulinaitis Date: Mon, 2 Mar 2015 21:15:54 -0800 Subject: [PATCH 13/80] Updating Opera 12.12 to 12.16 --- .../applications/networking/browsers/opera/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index bcd86a2fb30..ced16da5f7e 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -13,18 +13,18 @@ let in stdenv.mkDerivation rec { - name = "opera-12.12-1707"; + name = "opera-12.16-1860"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "${mirror}/linux/1212/${name}.i386.linux.tar.xz"; - sha256 = "1jkrhxjxa5kz4bhyma0zlnsszdn84sq4pks3x8bfcayn12m6yxkz"; + url = "${mirror}/linux/1216/${name}.i386.linux.tar.xz"; + sha256 = "df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${mirror}/linux/1212/${name}.x86_64.linux.tar.xz"; - sha256 = "0acizxgyqblcvl91dwmvi937fi1kw6whz5qgxyl1fkygbayji90v"; + url = "${mirror}/linux/1216/${name}.x86_64.linux.tar.xz"; + sha256 = "b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; From c9afdef66d4ada39c434d2b6e5821a74dcb2f1b6 Mon Sep 17 00:00:00 2001 From: Markus Kohlhase Date: Wed, 4 Mar 2015 19:18:13 +0000 Subject: [PATCH 14/80] pkgs: zdfmediathk 8 -> 9 --- pkgs/applications/video/zdfmediathk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix index 105bbbfbacd..74a203dc919 100644 --- a/pkgs/applications/video/zdfmediathk/default.nix +++ b/pkgs/applications/video/zdfmediathk/default.nix @@ -4,11 +4,11 @@ with stdenv; mkDerivation rec { - version = "8"; + version = "9"; name = "zdfmediathk"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/zdfmediathk/Mediathek/Mediathek%208/MediathekView_${version}.zip"; - sha256 = "1sglzk8zh6cyijyw82k49yqzjv0ywglp03w09s7wr4mzk48mfjj9"; + url = "http://downloads.sourceforge.net/project/zdfmediathk/Mediathek/Mediathek%209/MediathekView_${version}.zip"; + sha256 = "1wff0igr33z9p1mjw7yvb6658smdwnp22dv8klz0y8qg116wx7a4"; }; buildInputs = [ unzip ]; From 43505edb9c6362bd91385f0d2054a2353cc15217 Mon Sep 17 00:00:00 2001 From: koral Date: Thu, 5 Mar 2015 01:55:45 +0100 Subject: [PATCH 15/80] fish: 2.1.1 -> 2.1.2 --- pkgs/shells/fish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 823867abc0f..d7d69c00c5f 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924"; + sha256 = "1pgnz5lapm4qk48a13k9698jaswybzlbz2nyc621d852ldf0vhn6"; }; buildInputs = [ ncurses libiconv ]; From 1c7fc46ee574aa4d173cc321d81887a95fd5b5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 20 Feb 2015 13:39:35 +0000 Subject: [PATCH 16/80] Adding the raspberrypi2 platform. --- pkgs/top-level/platforms.nix | 87 ++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 20cc39692c0..e032a383e46 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -212,6 +212,93 @@ rec { }; }; + raspberrypi2 = { + name = "raspberrypi2"; + kernelMajor = "3.14"; + kernelHeadersBaseConfig = "kirkwood_defconfig"; + kernelBaseConfig = "bcm2709_defconfig"; + kernelArch = "arm"; + kernelDTB = true; + kernelAutoModules = false; + kernelExtraConfig = + '' + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + BTRFS_FS y + XFS_FS m + JFS_FS y + EXT4_FS y + + IP_PNP y + IP_PNP_DHCP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NETFILTER y + IP_NF_IPTABLES y + IP_NF_FILTER y + IP_NF_MATCH_ADDRTYPE y + IP_NF_TARGET_LOG y + IP_NF_MANGLE y + IPV6 m + VLAN_8021Q m + + CIFS y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + CIFS_ACL y + + ZRAM m + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # nixos mounts some cgroup + CGROUPS y + + # Latencytop + LATENCYTOP y + + # Disable the common config Xen, it doesn't build on ARM + XEN? n + ''; + kernelTarget = "zImage"; + uboot = null; + gcc = { + cpu = "cortex-a7"; + fpu = "neon-vfpv4"; + float = "hard"; + }; + }; + guruplug = sheevaplug // { # Define `CONFIG_MACH_GURUPLUG' (see # ) From 56989d9f2034d175c206e7fb166e4c5f07997d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 20 Feb 2015 13:40:23 +0000 Subject: [PATCH 17/80] Updating the raspberry pi kernel sources to recent, for pi2 --- .../linux/kernel/{linux-rpi-3.6.nix => linux-rpi.nix} | 8 +++++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) rename pkgs/os-specific/linux/kernel/{linux-rpi-3.6.nix => linux-rpi.nix} (61%) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix similarity index 61% rename from pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix rename to pkgs/os-specific/linux/kernel/linux-rpi.nix index 6d28c376078..67a51dc767d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,15 +2,17 @@ let - rev = "7849605f5a"; + rev = "fe4a83540ec73dfc298f16f027277355470ea9a0"; in import ./generic.nix (args // rec { - version = "3.6.y-${rev}"; + version = "3.18.y-${rev}"; + + modDirVersion = "3.18.7-v7"; src = fetchurl { url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}"; name = "linux-raspberrypi-${version}.tar.gz"; - sha256 = "1diwc5p6az6ipcldwmkq7hb5f15nvdgwzmypixc2vmzmc4ylarxl"; + sha256 = "05gq40f038hxjqd3sdb1914g2bzw533dyxy59sgdpybs8801x2vb"; }; features.iwlwifi = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68e59d038fa..8d1d94890eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8758,7 +8758,7 @@ let ]; }; - linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { + linux_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ]; }; @@ -8978,7 +8978,7 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); - linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi; + linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi; 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); From 3e92c4e0ffd26949ea73dafb02eddbf245f80e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 20 Feb 2015 13:40:58 +0000 Subject: [PATCH 18/80] Trying to make DTBs if set in platform. --- pkgs/os-specific/linux/kernel/manual-config.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 6d9baed7f2d..cfbd9b9774f 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -120,7 +120,12 @@ let postInstall = optionalString installsFirmware '' mkdir -p $out/lib/firmware - '' + (if isModular then '' + '' + (if (platform ? kernelDTB && platform.kernelDTB) then '' + set -x + make dtbs + cp arch/$arch/boot/dts/*dtb $out + '' else "") + (if isModular then '' + set -x make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" unlink $out/lib/modules/${modDirVersion}/build From 42c6115872c6d1ec471605006e258daaca1ceee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 20 Feb 2015 21:54:05 +0000 Subject: [PATCH 19/80] kernel: I forgot $makeFlags in make dtbs --- pkgs/os-specific/linux/kernel/manual-config.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index cfbd9b9774f..7bc1de8ed0b 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -118,14 +118,12 @@ let # Some image types need special install targets (e.g. uImage is installed with make uinstall) installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else "install") ]; - postInstall = optionalString installsFirmware '' + postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware - '' + (if (platform ? kernelDTB && platform.kernelDTB) then '' - set -x - make dtbs + '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' + make "$makeFlags" dtbs cp arch/$arch/boot/dts/*dtb $out '' else "") + (if isModular then '' - set -x make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" unlink $out/lib/modules/${modDirVersion}/build From 31cccd88ed6fcaca86eb19dcee6d263909cbe829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 20 Feb 2015 22:26:11 +0000 Subject: [PATCH 20/80] kernel: Trying to fix makeflags of 'make dtbs' --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 7bc1de8ed0b..dd619993ff0 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -121,7 +121,7 @@ let postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' - make "$makeFlags" dtbs + make $makeFlags "''${makeFlagsArray[@]}" dtbs cp arch/$arch/boot/dts/*dtb $out '' else "") + (if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ From cfd9b77e82c6a4224b74215c7c0504014d83aa39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 21 Feb 2015 19:01:17 +0000 Subject: [PATCH 21/80] kernel: I hope to fix the dtbs thing I thought $arch was defined. Now I'm using karch, that should serve for cross building as well. --- pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index dd619993ff0..ea29c7f9e0c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -122,7 +122,7 @@ let mkdir -p $out/lib/firmware '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' make $makeFlags "''${makeFlagsArray[@]}" dtbs - cp arch/$arch/boot/dts/*dtb $out + cp $buildRoot/arch/$karch/boot/dts/*dtb $out '' else "") + (if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" @@ -225,6 +225,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe "ARCH=${stdenv.platform.kernelArch}" ]; + karch = stdenv.platform.kernelArch; + crossAttrs = let cp = stdenv.cross.platform; in (drvAttrs crossConfig cp (kernelPatches ++ crossKernelPatches) crossConfigfile) // { makeFlags = commonMakeFlags ++ [ @@ -232,6 +234,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe "CROSS_COMPILE=$(crossConfig)-" ]; + karch = cp.kernelArch; + # !!! uboot has messed up cross-compiling, nativeDrv builds arm tools on x86, # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot # can just go into buildInputs (but not nativeBuildInputs since cp.uboot From c1b803ba0ea9402ef8f4264896691d04c8167ec7 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 21 Feb 2015 22:29:40 +0000 Subject: [PATCH 22/80] Cut down on the gcc flags for raspberrypi2. --- pkgs/top-level/platforms.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index e032a383e46..ae9b702b442 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -293,8 +293,8 @@ rec { kernelTarget = "zImage"; uboot = null; gcc = { - cpu = "cortex-a7"; - fpu = "neon-vfpv4"; + arch = "armv7-a"; + fpu = "vfpv3-d16"; float = "hard"; }; }; From 9d8c26efaef7900f2658ba5695cee15334f6f649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 5 Mar 2015 10:00:21 +0000 Subject: [PATCH 23/80] Add comment explaining the rpi2 gcc flags. --- pkgs/top-level/platforms.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index ae9b702b442..8bdc4f77302 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -293,6 +293,11 @@ rec { kernelTarget = "zImage"; uboot = null; gcc = { + # For gcc 4.8, the best for rpi2 would be: + # cpu = "cortex-a7"; + # fpu = "neon-vfpv4"; + # But we prefer compatibility with the beaglebone, so both + # can run the same built store paths. arch = "armv7-a"; fpu = "vfpv3-d16"; float = "hard"; From 9bb586943a4665e9dc0af78e2556a7d428f96553 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Mar 2015 12:46:50 +0100 Subject: [PATCH 24/80] Deal with virtualisation.xen.stored in a more standard way --- nixos/modules/virtualisation/xen-dom0.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 1128c5e005e..ea9f61aad6a 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -59,12 +59,11 @@ in virtualisation.xen.stored = mkOption { - default = null; + type = types.path; description = '' Xen Store daemon to use. Defaults to oxenstored of the xen package. ''; - apply = x: if x == null then "${xen}/bin/oxenstored" else x; }; virtualisation.xen.trace = @@ -89,6 +88,8 @@ in message = "Xen currently does not support EFI boot"; } ]; + virtualisation.xen.stored = mkDefault "${xen}/bin/oxenstored"; + environment.systemPackages = [ xen ]; # Make sure Domain 0 gets the required configuration From 31955c869f169a774d3ef084a79866e54bb6f8c4 Mon Sep 17 00:00:00 2001 From: Petar Bogdanovic Date: Thu, 5 Mar 2015 14:53:41 +0100 Subject: [PATCH 25/80] Update gnupg1orig package to gpg-1.4.19 A test build pulled too many packages (including perl) for my VM so while it's a simple bump, it's also untested. --- pkgs/tools/security/gnupg/1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 3675c8bc390..c5d2ca1349c 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.18"; + name = "gnupg-1.4.19"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1233bppjvdpbbl425ii6l7xvgy0879ghhnmwrph5b6c4g3dgvddp"; + sha256 = "7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86"; }; buildInputs = [ readline bzip2 ]; From 17bc5f9b3813e0191d8bffe79c9698bceb6cc89d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Mar 2015 17:25:56 +0100 Subject: [PATCH 26/80] dhcpcd: Update to 6.6.7 --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index c84a140d4bc..8c5896561fc 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.6.6"; + name = "dhcpcd-6.6.7"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "0893gixhz68ngqa1vcshmvkwy58kmlj3f1qvd877sgrir06bpg96"; + sha256 = "1aydp26xsn9y6acg5zmcz6pp6parywnmhcvp9ipf54vbac53mya3"; }; patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; From 0ac77f4690a7e402eb2311598b5d2f2f6cd1b698 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 17:40:17 +0100 Subject: [PATCH 27/80] nss_wrapper: the unquoted meta.homepage url breaks evaluation --- pkgs/development/libraries/nss_wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 6b4a24d71e5..198d9aec6c0 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a wrapper for the user, group and hosts NSS API"; - homepage = https://git.samba.org/?p=nss_wrapper.git;a=summary; + homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; From 455fc68fbbe40863a6f09bfe2c22ad6b87146315 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 17:40:55 +0100 Subject: [PATCH 28/80] socket_wrapper: the unquoted meta.homepage url breaks evaluation --- pkgs/development/libraries/socket_wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 391b3c574eb..1344ad18d09 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a library passing all socket communications through unix sockets"; - homepage = https://git.samba.org/?p=socket_wrapper.git;a=summary; + homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; From 58795b953bd83faa9715694eca09188ad7771ef7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 17:41:36 +0100 Subject: [PATCH 29/80] uid_wrapper: the unquoted meta.homepage url breaks evaluation --- pkgs/development/libraries/uid_wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index fa8e29e4098..b19d404bee2 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a wrapper for the user, group and hosts NSS API"; - homepage = https://git.samba.org/?p=uid_wrapper.git;a=summary; + homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; From c6ab53e9dbdf47ba8f6950e74ef6d65f7ca3379b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 1 Mar 2015 14:37:28 +0100 Subject: [PATCH 30/80] Add package: scim --- pkgs/applications/misc/scim/default.nix | 42 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/misc/scim/default.nix diff --git a/pkgs/applications/misc/scim/default.nix b/pkgs/applications/misc/scim/default.nix new file mode 100644 index 00000000000..ef1bb0bed1d --- /dev/null +++ b/pkgs/applications/misc/scim/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, yacc, ncurses, libxml2 }: + +let + version = "0.1.8"; +in +stdenv.mkDerivation rec { + + name = "scim-${version}"; + + src = fetchurl { + url = "https://github.com/andmarti1424/scim/archive/v${version}.tar.gz"; + sha256 = "0qjixb1hzbdrypbmzwb2iaw5wp57kn7fmm1zpjp4gzjyanrhazs2"; + }; + + buildInputs = [ yacc ncurses libxml2 ]; + + buildPhase = '' + cd src + + sed "s,prefix=/usr,prefix=$out," Makefile + sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile + + make + export DESTDIR=$out + ''; + + installPhase = '' + make install prefix= + ''; + + meta = { + homepage = "https://github.com/andmarti1424/scim"; + description = "SCIM - Spreadsheet Calculator Improvised - SC fork"; + license = { + fullName = "SCIM License"; + url = "https://github.com/andmarti1424/scim/raw/master/LICENSE"; + }; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; # Cannot test others + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68e59d038fa..1e1506b3338 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11363,6 +11363,8 @@ let boost = boost155; }; + scim = callPackage ../applications/misc/scim { }; + scite = callPackage ../applications/editors/scite { }; scribus = callPackage ../applications/office/scribus { From 4f3f301807cb433850df74041a1c43de0acf9c26 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Thu, 5 Mar 2015 18:04:21 +0100 Subject: [PATCH 31/80] openjdk8: update to jdk8u40-b25 --- .../compilers/openjdk/nonreparenting-wm.patch | 39 ------------------- .../compilers/openjdk/openjdk8.nix | 25 ++++++------ 2 files changed, 12 insertions(+), 52 deletions(-) delete mode 100644 pkgs/development/compilers/openjdk/nonreparenting-wm.patch diff --git a/pkgs/development/compilers/openjdk/nonreparenting-wm.patch b/pkgs/development/compilers/openjdk/nonreparenting-wm.patch deleted file mode 100644 index 49db6fb1ea6..00000000000 --- a/pkgs/development/compilers/openjdk/nonreparenting-wm.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:41:39.018530981 -0400 -+++ b/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:46:43.098540372 -0400 -@@ -104,7 +104,8 @@ - COMPIZ_WM = 12, - LG3D_WM = 13, - CWM_WM = 14, -- MUTTER_WM = 15; -+ MUTTER_WM = 15, -+ OTHER_NONREPARENTING_WM = 16; - public String toString() { - switch (WMID) { - case NO_WM: -@@ -596,7 +597,7 @@ - } - - static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); - } - - /* -@@ -786,6 +787,9 @@ - } else if (doIsIceWM && isIceWM()) { - awt_wmgr = XWM.ICE_WM; - } -+ else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } - /* - * We don't check for legacy WM when we already know that WM - * supports WIN or _NET wm spec. -@@ -1332,6 +1336,7 @@ - res = new Insets(28, 6, 6, 6); - break; - case NO_WM: -+ case OTHER_NONREPARENTING_WM: - case LG3D_WM: - res = zeroInsets; - break; \ No newline at end of file diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 7ef238e03bc..55b7ff36f8f 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -1,41 +1,41 @@ { stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl } : let - update = "31"; - build = "13"; - baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; + update = "40"; + build = "25"; + baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u40"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "824b28c554ce32edbdaa77cc4f21f8ed57542c74c8748b89cd06be43a1537b34"; + sha256 = "05s5j0rq45n8piymv9c1n0hxr4bk3j8lz6fw2wbp0m8kam6zzpza"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "3e09a644d2fb38970acf78c72bc201c031d43574b5a3f7e00bec1b11bffec9c4"; + sha256 = "0p1z38szm63cf5f83697awbqwpf7b8q1ymrqc0v6r9hb5yf0p22r"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "485b1a88b4b44b468e96211de238a5eed80f7472f91977fc27e2f443a8ab8ed3"; + sha256 = "0sl0ima3zlbd1ai7qrg4msy5ibg64qpwdrv7z4l8cpalwby26y6p"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "47b07945d3f534e6b87dc273676b8bcb493292e8769667493bb5febfb5c9f347"; + sha256 = "1ahvhap8av519813yf20v3hbvg82j9bq3gnqlayng1qggfivsb5s"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "b3801935199973cc02df02ac2f2587ff0f1989f98af5bf6fe46520a8108c8d6a"; + sha256 = "0n86fcy1z4z22jcgfnn9agzfi949709hn2x6s8wyhwwa055rjd1a"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "04bb35fd8b071f65014fa1d3b9816886b88e06548eeda27181993b80efb6a0bf"; + sha256 = "0hp19hq0dw3j8zz4mxd6bjk9zqlyr56fhwzgjwmm56b6pwkcmsn7"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "74bb7a376fa706e4283e235caebbcf9736974a6a4cf97b8c8335d389581965e2"; + sha256 = "037za0hjiwvzvbzsckfxnrrbak1vbd52pmrnd855vxkik08jxp8c"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "2fbdcb016506de4e86db5813c78b28382df5b601f0e73ffd5465c12519b75fd3"; + sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2"; }; in stdenv.mkDerivation { @@ -47,7 +47,7 @@ stdenv.mkDerivation { xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir cups freetype alsaLib openjdk perl ]; setSourceRoot = '' - sourceRoot="jdk8u-jdk8u${update}-b${build}"; + sourceRoot="jdk8u${update}-jdk8u${update}-b${build}"; ''; prePatch = '' # despite --with-override-jdk the build still searchs here @@ -58,7 +58,6 @@ stdenv.mkDerivation { ./fix-java-home.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch - ./nonreparenting-wm.patch ]; preConfigure = '' chmod +x configure From 4e6310ed17a6d69066b8e159ad8d31ec63fbcd1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 17:44:04 +0100 Subject: [PATCH 32/80] hackage-packages: re-generate from Hackage 2015-03-05T17:55:09+0100 --- .../haskell-modules/hackage-packages.nix | 414 +++++++++++------- 1 file changed, 245 insertions(+), 169 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bda9ddf5f28..429b0350209 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8667,8 +8667,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.2"; - sha256 = "145d47gh7i73blibbw5ka7ii0hahrdksyj8hr4lgkv7f92rmhf8z"; + version = "3.2.3"; + sha256 = "0nfq6c1kgmw1jj20686bp4rf52vpb8qc3whmz3jh0pwk489b2lwm"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -17731,8 +17731,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "0.3.1"; - sha256 = "01mxaqm1l3cmwsj9k61hh8wj5q9nja7j12dxpkns9ar7pbcllb3q"; + version = "0.3.2"; + sha256 = "1vyy8gsj31zxjnphzw1y3ylxdzxsgxx034a0s6i1g8vpqpf59n8a"; buildDepends = [ amazonka-core base bytestring conduit conduit-extra cryptohash cryptohash-conduit exceptions http-conduit lens mmorph @@ -17749,8 +17749,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.3.1"; - sha256 = "0aqid2aardna2qngr2knf5dpkylchrxkl5v8y6rdf2a3kzmsivfp"; + version = "0.3.2"; + sha256 = "11rx798qdqqk67djrfaknw3z7z5gf2m0ahi0nh4icgfljv8hzcda"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -17762,8 +17762,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.3.1"; - sha256 = "0gq65pyv1hsczlqc6i9l03rhgb2f086fqs2cfrr0aj8g5la6085r"; + version = "0.3.2"; + sha256 = "0bbymf4cmlfp812nyk9y648hg8d2j57kf31g46w2a0rg4157rwqh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -17775,8 +17775,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.3.1"; - sha256 = "0qsn88saidf2j0qmnndy0hcrp439354ys208sxfrrjn0xr5af8bh"; + version = "0.3.2"; + sha256 = "1lcl16j4wk19gf3i4jhh85jx4gx3lhacfd4yzrp54ycsgy689y7p"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -17788,8 +17788,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.3.1"; - sha256 = "1vsrkk58fwbhnr9ksjld4i53yrnq8fsxsfkh7y6j6i4gbz003a7n"; + version = "0.3.2"; + sha256 = "0ss8raa4dvzz55x23kb7lrfgjkr0hrp7k6khbjpwp7ff2kk9yvwb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -17801,8 +17801,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.3.1"; - sha256 = "1kzcqn4fy6fhsg2afjv0sjim6g5n2zdm3q26rlmmwd3y4zmmb0zy"; + version = "0.3.2"; + sha256 = "06as3a91061wy6wxd5ci37aisgghfm1w4k40id8b65yh8i0xwjd9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -17814,8 +17814,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.3.1"; - sha256 = "0c9glmfivx7hg77zn435ic5s07barpxb58rnypzni3q0y6skmnxl"; + version = "0.3.2"; + sha256 = "1zyf8w88r5827i2l1x29kanqhmq8glgx01739g7hlya5hd30lv4y"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -17827,8 +17827,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.3.1"; - sha256 = "0zfd7qld2wqsh7c5vkw613rq0x86nq84lvh1gk4grgkca636as5y"; + version = "0.3.2"; + sha256 = "1a3zj57nik0ffayq99y0pn8aqsvhdsi3fc4ynfkn9x0yxhgxx0kz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -17840,8 +17840,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.3.1"; - sha256 = "1nmxviql0h7n6mj38p2ldgxk2dpns1lhmrr45gmndblg3mmlnmp4"; + version = "0.3.2"; + sha256 = "1l6rz3zvnsfym54bs2s1njrpf9rj1s7rdhli5d2yacj7kabb1hlz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -17852,8 +17852,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.3.1"; - sha256 = "0ria2ayskcwjav3x2yk1kqpk16jn31hikf39vm3rb4p79mawkbjd"; + version = "0.3.2"; + sha256 = "1yr0xp1camsw7qapnp5w9jlrg8zy275n3izhl5i8z1wc5wln229d"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -17865,8 +17865,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.3.1"; - sha256 = "0sswcgycxrfmpv6pv0jrrrjx9fkahm1nl35dkxvlr3h4q519nmhf"; + version = "0.3.2"; + sha256 = "038n7290q9a1hsk0k832q3a782x053jfmh1j6ydk8c245q807544"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -17878,8 +17878,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.3.1"; - sha256 = "0gqlsh9j00gjdrrp53ijpvc9q2zwd6p5813yqjllhhcxckk7nzmn"; + version = "0.3.2"; + sha256 = "094j0m4kjijz6ihr7q4jklnb8gmyrqgk1bxw1z94xqb3s60fwy9c"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -17891,8 +17891,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.3.1"; - sha256 = "1mx2fn6w724hmy0yiwvgbyijx12ggiwqqhpikv9hfr6p520cxi9b"; + version = "0.3.2"; + sha256 = "1z9p672zwiihaj83wv1wpvqj70m9795pay44qps4as1xcb1skwc4"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -17904,8 +17904,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.3.1"; - sha256 = "1jnnwy7i1m5z0kbw4gzw1k7ma4mgfj3x924h55iq2q7vqipkqx5y"; + version = "0.3.2"; + sha256 = "0ha6adx6m27dmh6dxyha7kk344190hd151rp1lcihchhsnr283hk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -17924,8 +17924,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "0.3.1"; - sha256 = "07s1ifpxbng05par9v2cyakzn1mdsspmf3r75rsscqkk2cflzrn3"; + version = "0.3.2"; + sha256 = "0byp43084jinc8pabplcmjr1spkx5gy666rwpl7xxmzcqlacdjzi"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra @@ -17934,7 +17934,7 @@ self: { transformers unordered-containers vector xml-conduit ]; testDepends = [ - aeson base tasty tasty-hunit template-haskell text time + aeson base tasty tasty-hunit template-haskell text ]; jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; @@ -17946,8 +17946,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.3.1"; - sha256 = "03i8l4sa9mxfs3k0h6bg1zrqygza2wmh4pricxln3s78w46grx7m"; + version = "0.3.2"; + sha256 = "0hxgzdbv8fc0rl00afny3j1ka2fib98bamjphfdrjkb6ic37a2mx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -17959,8 +17959,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.3.1"; - sha256 = "1n2pqbg8sxci8b2ljfbjj02n04x2rgclp15ybb5f7h70fggs1f6m"; + version = "0.3.2"; + sha256 = "1nby1qs901k8xc3ykpvi1097b92bcd5c9l3d0sx7dci6i4hnbqlf"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -17972,8 +17972,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.3.1"; - sha256 = "1bp13d55qs4db3vpzvik033373gd02l5vcgppw51fzvh2l6kslfg"; + version = "0.3.2"; + sha256 = "08034a5nwcja147rkc0bsgmcj33xv1w6cvz7fpyi4jwip1ffngr9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -17985,8 +17985,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.1"; - sha256 = "0p4gb3yaviyyppv641gz550ml5bvcwbpxv0fqkqqad0fp7k95zdh"; + version = "0.3.2"; + sha256 = "1x5xqlk0gh9ac2721j444nzz98q749mvkwhdgb476hi6lmc7g9gn"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -17998,8 +17998,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ecs"; - version = "0.3.1"; - sha256 = "0ls2vhx7isj210n7m5584xzmv78a2gnxwhpzdc7c7nxbfmkgj0b9"; + version = "0.3.2"; + sha256 = "02w1zxcs7sz5xgdpr3iq5yd1d3w15rkjnkcqyxhkbgwcv6w4c2zc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; @@ -18010,8 +18010,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.3.1"; - sha256 = "0q64qkrb5dpr0h8kagnpd4ir1k5s15r2x6s2kpj4v6kx616nw1ib"; + version = "0.3.2"; + sha256 = "1a743l0hr7mb337xw3ql7mg4256w0w5c2vss12al9kzpnrgi2lh3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -18023,8 +18023,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.3.1"; - sha256 = "0zcpj0kj54bdcximds5rx0i7y7zbd7a433fiw19cfx7gsh4gfrzc"; + version = "0.3.2"; + sha256 = "16g5v9y3y9wdxiw5cw3z8i4b67y1acvz74d1qdk7by1s2smb4dkf"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -18036,8 +18036,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.3.1"; - sha256 = "1apzbahxv1b1hsmbhhwi2bhz0j89av3jqc8ad6q2smcj5jr4cj9m"; + version = "0.3.2"; + sha256 = "1mymjy2dq4dz1r7yllgxdpbyddg7x7pvaarl395dffrapgqkh0n2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -18049,8 +18049,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.3.1"; - sha256 = "0p4pjrmkzn2n6r1idvyy34b2563zxnnwcrlnq8q766n7d403csjd"; + version = "0.3.2"; + sha256 = "0jxa9c8y9i1rffxfb2wrpb1fv6niplj2mwwc591k74c99ynjwj6i"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -18062,8 +18062,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.3.1"; - sha256 = "0q6mz9811jya3qsvkc5m24r7b56ck127dwsskk3a1bg3qqh0b1a0"; + version = "0.3.2"; + sha256 = "1n6q77riz31xqk5qywiqs75avwdni1d9x9955jgs8s1phk48654c"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -18075,8 +18075,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-glacier"; - version = "0.3.1"; - sha256 = "1mxqgivngi9anxkm5smqysniw18gc55a1q31cis2rdz6r9nvknq7"; + version = "0.3.2"; + sha256 = "1cphxr7a60z18zh543nva7v18zh05r4iircfbgifj98w33gvcvqd"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; @@ -18087,8 +18087,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.3.1"; - sha256 = "1jdypy7npfyh0k8pcpbk8wp38sgkhnna0wbq1scnb6d1qppjjwzf"; + version = "0.3.2"; + sha256 = "1v869rmqbihn1314nd1ryqpgrwfxicnjh7i41zbn5hq60c4xkn4z"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -18100,8 +18100,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.3.1"; - sha256 = "06q9w6752z6wgialms2ckra2bjhk6p87987pbmwsa48pjhyfya2q"; + version = "0.3.2"; + sha256 = "03bzizq6mchxk79gqnp8v4avw4alyccd51ks3wl2ljgq0ywl41xs"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -18113,8 +18113,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.3.1"; - sha256 = "045pn2rjh57an8kilcx78fsv5af6sbf3bfhsxvx3vaaspmls59f4"; + version = "0.3.2"; + sha256 = "16gqc9d9s3fz2qs1l4b4wjylsyl2p7ncyfibadkp8an6bfdylx31"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -18126,8 +18126,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.3.1"; - sha256 = "066k2jwin83sz0ry34hfni1zn6r66bcrdvnji9b3zacwsi032713"; + version = "0.3.2"; + sha256 = "10xjddl0mwpkcgz9ydy0lvmwpg3d3hb7kliqsqvfwlqgslhvhs18"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -18138,8 +18138,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.3.1"; - sha256 = "14w1qr8y0kqhddsrr4yrh808k7rw2l815hy02lx3qv94sd8w42ya"; + version = "0.3.2"; + sha256 = "0i4cy5x7br58lmzndx4x8mj81xkwx50nf1r8cszbjwjpml6fc2pz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -18151,8 +18151,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.3.1"; - sha256 = "1n6kgwm6wamnjgbk67v2cyl5f8f6clkraq74kmnl6gbb50bisd74"; + version = "0.3.2"; + sha256 = "0xgj4r8zj0f2wmmpr63p3dlgfvgr5lmd43ngn5ignkmha6m6lcys"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -18164,8 +18164,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.3.1"; - sha256 = "1jz57hx4s0rbzgl3scb0kk7prf1lk48nhzdhijbcyrg1h4s06hac"; + version = "0.3.2"; + sha256 = "0p73yn82pd0i1wi98vfy9kndf1ax0c3wza30nj6dra5xl4jnl73p"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18177,8 +18177,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.3.1"; - sha256 = "17fr8apra72n3viwibyggniw84a96474w07vhi8qkzvxm949zidf"; + version = "0.3.2"; + sha256 = "0w75vc1khlncfx82mcbpp41c8svjm7yy7si0p5rqi6cvx0an1k2v"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18190,8 +18190,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.1"; - sha256 = "0jyvn9rkgpyljx4b813m3na5s0glyzj4104cfl2942fi7b010lkl"; + version = "0.3.2"; + sha256 = "0gsfgkcdprqanjfgcw4lj77b4fvhlq47h636kh87yvjg70migyrx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -18203,8 +18203,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.3.1"; - sha256 = "14d8na8nl733w90i1vpv99y2r8cm4a4q6s8ayna26xpwncb7x0by"; + version = "0.3.2"; + sha256 = "0kzhn1mdk79a8vn0kj5jk5w0vfywh89bf5khjv08m3qwwdyb0mnw"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -18216,8 +18216,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.3.1"; - sha256 = "0wj0wb09y6a9haxhwckx4rxsvjy8g44liwvfb3sgbq4924q0m875"; + version = "0.3.2"; + sha256 = "0ws7dy9bnv7qx43mx6s1lkj4z1r3v7b0pph6kl3s5q60s1f9qr64"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -18229,8 +18229,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.3.1"; - sha256 = "1l2pqzr3li3j9yrfgy42psgaw3sm1q70k9raxsklpy5z6dbwyj9n"; + version = "0.3.2"; + sha256 = "1im0lzgxzxxpb6dmigp9vcwwk79bs9m9y3lhcjn7bcspql426c7a"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -18242,8 +18242,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.3.1"; - sha256 = "0bgjc5nmhvy8cg2v477wad10dcg1sfnd3iyj25827f4spjyg1h9j"; + version = "0.3.2"; + sha256 = "0l9v7kagssnzg1f4w63q4dza5gyxlm3v6hrjcspdlaxw695vn7j8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -18255,8 +18255,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.3.1"; - sha256 = "0awnyw4yii1plbk8is64f6zlnckjb8l74la4d2zls8nmpd31i5n3"; + version = "0.3.2"; + sha256 = "1crlyx87j5iw7dvjngnrqqhkx24f0zd48l2cz37ldqymrsfn7kqb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -18268,8 +18268,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.3.1"; - sha256 = "1p32yl9wdchp4z2rq5b0qwl1hp6n6wvc4i7i6cpdwpq4sb0k968q"; + version = "0.3.2"; + sha256 = "1mr2ra4857j4n4lpf5zlrqxmvf5adk6l0ycbwah4cypd3ki7b7l6"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -18281,8 +18281,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ssm"; - version = "0.3.1"; - sha256 = "13v0vwdd4bq86s1ky1i54s0v82mcvrh9hq7nkb1fkzvsmmiyva7l"; + version = "0.3.2"; + sha256 = "0hb35i65j2zl6v1y3drd2kacg5ahvl14isx1f8b7a1k48l90qccn"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; @@ -18293,8 +18293,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.3.1"; - sha256 = "1ljw1xj3m8qj971s36j2jsp8zppyh1zsi2jlb7ijw6yg3h1hvfl7"; + version = "0.3.2"; + sha256 = "08c74hniznflx7xvlk41r2aym1h3xal68lbr2r0qlmh846pfyiqa"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -18306,8 +18306,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.3.1"; - sha256 = "081mr98ib68j02symjmsx62lbzs1y6mf3bf4hppzq1fxx0qmw3bw"; + version = "0.3.2"; + sha256 = "0sq6ws9qyga1giiv2pkfgfaigni5k33mzq3k1psliwjxscxcjknw"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -18319,8 +18319,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.3.1"; - sha256 = "0817k0kxbgc2df5g7k25d5gkbf4xylbjis9zf3in5yplrlr3m6gq"; + version = "0.3.2"; + sha256 = "1j3vwpjmmlv3c4n4jrgj2vvvcirky1ja7grv5ax790i5p0ll0iw8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -18332,8 +18332,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.3.1"; - sha256 = "0n3kl5sz0ckwdr680jgi9rq604zlcyx9b3gx19yf08dkh8vpkn9h"; + version = "0.3.2"; + sha256 = "18yh9saqjfcn8cjprjqiybgkvxq6hc8q8b6njsh61s6ycdnh0yx8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -18859,8 +18859,8 @@ self: { }: mkDerivation { pname = "api-builder"; - version = "0.4.0.0"; - sha256 = "1vkk47nq0w6v4gv35s8vy7hmsj1hswxqvbrgnnyzp0y9w74h4nl5"; + version = "0.5.0.0"; + sha256 = "1lf70k7cb90jzj3nz31d17zbgsmi3fg3lwzdh9fqkjclhgk3al8y"; buildDepends = [ aeson attoparsec base bifunctors bytestring either HTTP http-conduit http-types text transformers @@ -21904,6 +21904,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "barrier" = callPackage + ({ mkDerivation, base, blaze-svg, bytestring, lens-family-core + , tasty, tasty-golden, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "barrier"; + version = "0.1.0"; + sha256 = "1flhgx323dnqhh6gxmfv4m8qj2yysckrr9pzw0g7jisvk6pmcz4z"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base blaze-svg bytestring template-haskell text + unordered-containers + ]; + testDepends = [ + base bytestring lens-family-core tasty tasty-golden + ]; + homepage = "https://github.com/philopon/barrier"; + description = "Shield.io style badge generator"; + license = stdenv.lib.licenses.mit; + }) {}; + "barrier-monad" = callPackage ({ mkDerivation, base, comonad, mtl, transformers }: mkDerivation { @@ -26474,23 +26496,22 @@ self: { }) {}; "cabal-debian" = callPackage - ({ mkDerivation, base, Cabal, containers, data-default, data-lens - , data-lens-template, debian, deepseq, Diff, directory, filepath - , hsemail, HUnit, memoize, mtl, network-uri, parsec, pretty - , prettyclass, process, pureMD5, regex-tdfa, set-extra, syb, text - , unix, Unixutils, utf8-string + ({ mkDerivation, base, Cabal, containers, data-default, debian + , deepseq, Diff, directory, filepath, hsemail, HUnit, lens, memoize + , mtl, network-uri, parsec, pretty, prettyclass, process, pureMD5 + , regex-tdfa, set-extra, syb, text, unix, Unixutils, utf8-string }: mkDerivation { pname = "cabal-debian"; - version = "4.23.1"; - sha256 = "06m0lr2jxgnwidk9q8ix5bm6s1dc9kgxfb27fdvchi7ikj9gnzia"; + version = "4.24.3"; + sha256 = "0vhsdnjhrh2i78ncn7jmqszr0zha1ib1ja2xxsamgnz0zps0aiwx"; isLibrary = true; isExecutable = true; buildDepends = [ - base Cabal containers data-default data-lens data-lens-template - debian deepseq Diff directory filepath hsemail HUnit memoize mtl - network-uri parsec pretty prettyclass process pureMD5 regex-tdfa - set-extra syb text unix Unixutils utf8-string + base Cabal containers data-default debian deepseq Diff directory + filepath hsemail HUnit lens memoize mtl network-uri parsec pretty + prettyclass process pureMD5 regex-tdfa set-extra syb text unix + Unixutils utf8-string ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; @@ -52539,36 +52560,40 @@ self: { }) {}; "hOpenPGP" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base - , base64-bytestring, bytestring, bzlib, cereal, cereal-conduit + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib , conduit, conduit-extra, containers, crypto-cipher-types , crypto-pubkey, crypto-random, cryptocipher, cryptohash - , data-default, errors, hashable, incremental-parser, ixset, lens - , monad-loops, mtl, nettle, openpgp-asciiarmor, QuickCheck - , quickcheck-instances, resourcet, securemem, semigroups, split - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , unordered-containers, zlib + , data-default-class, errors, hashable, incremental-parser, ixset + , lens, monad-loops, nettle, network, network-uri, newtype + , old-locale, openpgp-asciiarmor, QuickCheck, quickcheck-instances + , resourcet, securemem, semigroups, split, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , wl-pprint-extras, zlib }: mkDerivation { pname = "hOpenPGP"; - version = "1.11"; - sha256 = "1alcaqx2i4a4cbmh0brb9axfsm4nb8fs4mqglh609iy3bdl791b7"; + version = "2.0"; + sha256 = "1krk1019d0ix4ix0qh55l4pzgbggl151vqgd0jbhdcbkmvhfi4xv"; buildDepends = [ - ansi-wl-pprint attoparsec base base64-bytestring bytestring bzlib - cereal cereal-conduit conduit conduit-extra containers - crypto-cipher-types crypto-pubkey crypto-random cryptocipher - cryptohash data-default errors hashable incremental-parser ixset - lens monad-loops mtl nettle openpgp-asciiarmor resourcet securemem - semigroups split text time transformers unordered-containers zlib + aeson attoparsec base base64-bytestring bifunctors binary + binary-conduit byteable bytestring bzlib conduit conduit-extra + containers crypto-cipher-types crypto-pubkey crypto-random + cryptocipher cryptohash data-default-class errors hashable + incremental-parser ixset lens monad-loops nettle network + network-uri newtype old-locale openpgp-asciiarmor resourcet + securemem semigroups split text time transformers + unordered-containers wl-pprint-extras zlib ]; testDepends = [ - ansi-wl-pprint attoparsec base bytestring bzlib cereal - cereal-conduit conduit conduit-extra containers crypto-cipher-types - crypto-pubkey crypto-random cryptocipher cryptohash data-default - errors hashable incremental-parser ixset lens monad-loops mtl - nettle QuickCheck quickcheck-instances resourcet securemem + aeson attoparsec base bifunctors binary binary-conduit byteable + bytestring bzlib conduit conduit-extra containers + crypto-cipher-types crypto-pubkey crypto-random cryptocipher + cryptohash data-default-class errors hashable incremental-parser + ixset lens monad-loops nettle network network-uri newtype + old-locale QuickCheck quickcheck-instances resourcet securemem semigroups split tasty tasty-hunit tasty-quickcheck text time - transformers unordered-containers zlib + transformers unordered-containers wl-pprint-extras zlib ]; homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; @@ -61094,6 +61119,23 @@ self: { license = "GPL"; }) {}; + "hlibBladeRF" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, hlint, libbladeRF + , process, regex-compat + }: + mkDerivation { + pname = "hlibBladeRF"; + version = "0.1.0.1"; + sha256 = "08c7sb447ifk6k53f2wkanqx1lvjiyfb6f6lybs6g1n31jqiixgn"; + editedCabalFile = "132696aa56c96eccaa5efbd49f633a05d93f95557992cd73f2eafbd1b3c2fc55"; + buildDepends = [ base bindings-DSL bytestring ]; + testDepends = [ base hlint process regex-compat ]; + pkgconfigDepends = [ libbladeRF ]; + homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; + description = "Haskell binding to libBladeRF SDR library"; + license = stdenv.lib.licenses.lgpl21; + }) { inherit (pkgs) libbladeRF;}; + "hlibev" = callPackage ({ mkDerivation, base, ev, network }: mkDerivation { @@ -62448,25 +62490,26 @@ self: { "hopenpgp-tools" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec - , base, base16-bytestring, bytestring, cereal, cereal-conduit + , base, base16-bytestring, binary, binary-conduit, bytestring , conduit, conduit-extra, containers, crypto-pubkey, cryptohash , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset, lens , monad-loops, old-locale, openpgp-asciiarmor, optparse-applicative - , resourcet, text, time, transformers, unordered-containers, yaml + , resourcet, text, time, transformers, unordered-containers + , wl-pprint-extras, yaml }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.13"; - sha256 = "07w46jcdx573p4jii6xvgz1y8xm4iab89jg8jh0645pja5zv8nsz"; + version = "0.14"; + sha256 = "16syq600zgq5b60ghvxnnaskn984bqv60024bvpgzydv41l61lcd"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson ansi-wl-pprint array attoparsec base base16-bytestring - bytestring cereal cereal-conduit conduit conduit-extra containers + aeson ansi-wl-pprint array attoparsec base base16-bytestring binary + binary-conduit bytestring conduit conduit-extra containers crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP ixset lens monad-loops old-locale openpgp-asciiarmor optparse-applicative resourcet text time transformers - unordered-containers yaml + unordered-containers wl-pprint-extras yaml ]; buildTools = [ alex happy ]; homepage = "http://floss.scru.org/hopenpgp-tools"; @@ -72560,8 +72603,8 @@ self: { }: mkDerivation { pname = "jsontsv"; - version = "0.1.4.5"; - sha256 = "07yls78gj5zfi0d1kkcsf22wcq2wip9nm6yp1r5m8li8rhzxcczi"; + version = "0.1.4.6"; + sha256 = "05rfpzs7ln87n17dbq22g990hkiqwwr656w6l2mrqfnq10qzx8xc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -74412,21 +74455,16 @@ self: { }) {}; "language-ecmascript-analysis" = callPackage - ({ mkDerivation, base, containers, HUnit, language-ecmascript, mtl - , parsec, test-framework, test-framework-hunit, uniplate + ({ mkDerivation, base, containers, language-ecmascript, parsec + , uniplate }: mkDerivation { pname = "language-ecmascript-analysis"; - version = "0.9"; - sha256 = "073dh69mwz3x4v9xwa14pf9y04darzw1r5kfiv43646zs7axjd4p"; - editedCabalFile = "5fafd7ffe271f00fe33acdb4a18ef28a43a157836495144a0e113fd2bbf8f468"; + version = "0.9.1"; + sha256 = "04zc3iwls4hxlsa2c77an5q1h0xylndld02sn38sgykx6ibmmy9n"; buildDepends = [ base containers language-ecmascript parsec uniplate ]; - testDepends = [ - base HUnit language-ecmascript mtl test-framework - test-framework-hunit uniplate - ]; homepage = "http://github.com/jswebtools/language-ecmascript-analysis"; description = "JavaScript static analysis library"; license = stdenv.lib.licenses.bsd3; @@ -76046,20 +76084,20 @@ self: { "libmpd" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default, filepath, hspec, mtl, network, old-locale + , data-default-class, filepath, hspec, mtl, network, old-locale , QuickCheck, text, time, unix, utf8-string }: mkDerivation { pname = "libmpd"; - version = "0.9.0.1"; - sha256 = "11smm8ai7053hljlxi5l2fkqxrqr1xrh6sxg2r0dlsvmmln7smrd"; + version = "0.9.0.2"; + sha256 = "1q6lcp9gfzvzcsigv6958ng9c44kq68qh4amnszjjji0jq0lvdjz"; buildDepends = [ - attoparsec base bytestring containers data-default filepath mtl - network old-locale text time utf8-string + attoparsec base bytestring containers data-default-class filepath + mtl network old-locale text time utf8-string ]; testDepends = [ - attoparsec base bytestring containers data-default filepath hspec - mtl network old-locale QuickCheck text time unix utf8-string + attoparsec base bytestring containers data-default-class filepath + hspec mtl network old-locale QuickCheck text time unix utf8-string ]; homepage = "http://github.com/vimus/libmpd-haskell#readme"; description = "An MPD client library"; @@ -77059,13 +77097,13 @@ self: { ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty - , process, syb, text, text-format, transformers - , unordered-containers + , process, QuickCheck, syb, tasty, tasty-quickcheck, tasty-rerun + , text, text-format, transformers, unordered-containers }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.2.2.0"; - sha256 = "1r1i8c1hgp4d64zmm473nf4jbcyi7zrjfi6n2v19v38x8gjfg7jw"; + version = "0.2.3.0"; + sha256 = "05axddy9b2dfw574ha444a8ppxsa9hhdx0naj50i7qyg59z2zrg6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77074,6 +77112,9 @@ self: { intern mtl parsec pretty process syb text text-format transformers unordered-containers ]; + testDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-rerun text + ]; buildTools = [ ocaml ]; configureFlags = [ "-fbuild-external" ]; homepage = "https://github.com/ucsd-progsys/liquid-fixpoint"; @@ -77092,8 +77133,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.3.0.0"; - sha256 = "1dq87nd22pm5imh5x4gdwwzg3crdsbgzbfjlrxax4f0xn2b2q4b9"; + version = "0.3.1.0"; + sha256 = "0dcrgbwchssp62n8ywkdfa70dvx186338s3gyyj7rlfvxilfqc7k"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81186,6 +81227,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "miniforth" = callPackage + ({ mkDerivation, base, containers, lens, MonadRandom, mtl, parsec + , parsec3-numbers, readline + }: + mkDerivation { + pname = "miniforth"; + version = "0.1.0.0"; + sha256 = "11np5zbbwmnsx6qqmxn7zi24bmk41xz5vi3wsvbv4cwvn4m4n6dm"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base containers lens MonadRandom mtl parsec parsec3-numbers + readline + ]; + jailbreak = true; + description = "Miniature FORTH-like interpreter"; + license = stdenv.lib.licenses.mit; + }) {}; + "minimal-configuration" = callPackage ({ mkDerivation, base, containers, directory, filepath, tconfig }: mkDerivation { @@ -84445,13 +84505,13 @@ self: { }: mkDerivation { pname = "nagios-check"; - version = "0.2.0"; - sha256 = "0phm3i0k99j26h793xcfszb7l8acf3q3my5z3msj3q5cvkxnixfd"; + version = "0.2.1"; + sha256 = "0qnzdljrdwzrsfapm2d6ykz2xzdhq5hzxy51gixsbmlvknglx5bh"; buildDepends = [ base bifunctors exceptions mtl nagios-perfdata text ]; testDepends = [ base hspec QuickCheck text ]; - homepage = "https://github.com/fractalcat/nagios-check"; + homepage = "https://github.com/fractalcat/haskell-nagios-check"; description = "Package for writing monitoring plugins"; license = stdenv.lib.licenses.mit; }) {}; @@ -90571,8 +90631,8 @@ self: { }: mkDerivation { pname = "persona-idp"; - version = "0.1.0.0"; - sha256 = "11zwic1id47a9zmxg0jd2qfsaygmy5izc8xpl5c5mkby3r7akp78"; + version = "0.1.0.1"; + sha256 = "138s5a565yaj2mq6gn8sh9iivwflgl9sxh6jxsf66a0hnr43mz6k"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -103305,8 +103365,8 @@ self: { ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }: mkDerivation { pname = "shake-minify"; - version = "0.1.1"; - sha256 = "0jg7mzgmi15ig1xwkw8mn593h9246k0higy7hlmlzh4qx4pz0w9v"; + version = "0.1.2"; + sha256 = "1xsh6bjrr0l4vqn8iqlkv8s0y5qwaqqz3yjlxk0y3fsi1qz28yxs"; buildDepends = [ base bytestring css-text hjsmin shake text ]; homepage = "https://github.com/LukeHoersten/shake-minify"; description = "Shake Minify Rules"; @@ -112313,8 +112373,8 @@ self: { }: mkDerivation { pname = "temporal-csound"; - version = "0.4.1"; - sha256 = "1r7v9g3qdp48j8y8g129jamz86fdksrm1amiy761s2nmmr51j6qb"; + version = "0.4.3.1"; + sha256 = "1c7difs3svrq1ka8bdf61vvg9b29baqd086l19a84f0734q5ph19"; buildDepends = [ base csound-catalog csound-expression temporal-media temporal-music-notation temporal-music-notation-western @@ -125133,6 +125193,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yabi-muno" = callPackage + ({ mkDerivation, base, bytestring, containers, lens, mtl, parsec + , yabi + }: + mkDerivation { + pname = "yabi-muno"; + version = "0.1.0.0"; + sha256 = "15p0bb3mclxxg3rmgx1im30l4s58msv5vvsm9wc6m9x79yyk9h8m"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base bytestring containers lens mtl parsec yabi ]; + jailbreak = true; + description = "Yet Another Brainfuck Interpreter"; + license = stdenv.lib.licenses.mit; + }) {}; + "yackage" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, bytestring, Cabal , cmdargs, conduit, containers, directory, http-conduit, http-types From 0cb7630f207efa7f470c29d208ec1781e3dbffbb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 17:50:07 +0100 Subject: [PATCH 33/80] haskell-temporal-csound has been fixed. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1558911ef8e..59ca7b7a7a0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -504,9 +504,6 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); - # https://github.com/anton-k/temporal-csound/issues/2 - temporal-csound = markBrokenVersion "0.4.1" super.temporal-csound; - # https://github.com/seanparsons/wiring/issues/1 wiring = markBrokenVersion super.wiring; From 7cf5b64d4ac661eb134cb40e2b67ccaf18c92fdf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 17:53:33 +0100 Subject: [PATCH 34/80] haskell-shakespeare-js defines no modules Haddock could process. --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 59ca7b7a7a0..b981b92db5d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -117,6 +117,7 @@ self: super: { hxt = dontHaddock super.hxt; # https://github.com/UweSchmidt/hxt/issues/38 markdown-unlit = dontHaddock super.markdown-unlit; network-conduit = dontHaddock super.network-conduit; + shakespeare-js = dontHaddock super.shakespeare-js; shakespeare-text = dontHaddock super.shakespeare-text; types-compat = dontHaddock super.types-compat; # https://github.com/philopon/apiary/issues/15 wai-test = dontHaddock super.wai-test; From a5740b11fa9cfb50015a94319721c9d301847566 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 17:55:51 +0100 Subject: [PATCH 35/80] haskell-cabal-debian has been fixed. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b981b92db5d..3a49324e182 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -606,9 +606,6 @@ self: super: { # Broken by GLUT update. Monadius = markBroken super.Monadius; - # https://github.com/ddssff/cabal-debian/issues/35 - cabal-debian = markBroken super.cabal-debian; - } // { # Not on Hackage. From 62700db96a2c26f6d6f01aa72fadfe3b19e957cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 18:01:38 +0100 Subject: [PATCH 36/80] haskell-influxdb is broken. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3a49324e182..60fabbbe673 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -340,7 +340,6 @@ self: super: { http-client-openssl = dontCheck super.http-client-openssl; http-client-tls = dontCheck super.http-client-tls; ihaskell = dontCheck super.ihaskell; - influxdb = dontCheck super.influxdb; itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; @@ -606,6 +605,10 @@ self: super: { # Broken by GLUT update. Monadius = markBroken super.Monadius; + # https://github.com/maoe/influxdb-haskell/issues/24 + influxdb = markBroken super.influxdb; + snaplet-influxdb = markBroken super.snaplet-influxdb; + } // { # Not on Hackage. From 069d835913fb221c9cf45409969d303a06f56a5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 18:02:53 +0100 Subject: [PATCH 37/80] haskell-persistent-zookeeper: test suite needs an external database running --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 60fabbbe673..5a72b66beae 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -226,6 +226,7 @@ self: super: { Hclip = dontCheck super.Hclip; HList = dontCheck super.HList; memcached-binary = dontCheck super.memcached-binary; + persistent-zookeeper = dontCheck super.persistent-zookeeper; postgresql-simple = dontCheck super.postgresql-simple; postgrest = dontCheck super.postgrest; snowball = dontCheck super.snowball; From cd65782d47faf6e708bb635be2ff745ed2ff0d3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 18:04:59 +0100 Subject: [PATCH 38/80] haskell-jose cannot compile its own test suite. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5a72b66beae..4789795fe97 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -610,6 +610,9 @@ self: super: { influxdb = markBroken super.influxdb; snaplet-influxdb = markBroken super.snaplet-influxdb; + # https://github.com/frasertweedale/hs-jose/issues/4 + jose = dontCheck super.jose; + } // { # Not on Hackage. From e03bec6ca24292fda53b9862df91546fc72d09e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 18:08:22 +0100 Subject: [PATCH 39/80] haskell-haroonga does not compile. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4789795fe97..420901aaaa7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -613,6 +613,10 @@ self: super: { # https://github.com/frasertweedale/hs-jose/issues/4 jose = dontCheck super.jose; + # We don't have the groonga package these libraries bind to. + haroonga = markBroken super.haroonga; + haroonga-httpd = markBroken super.haroonga-httpd; + } // { # Not on Hackage. From 69c7b87483ef1e95de6a312d56fcb74fd06243ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 18:11:10 +0100 Subject: [PATCH 40/80] haskell-hierarchical-clustering cannot compile its test suite --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 420901aaaa7..2cc30b7de32 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -327,6 +327,7 @@ self: super: { hedn = dontCheck super.hedn; hgdbmi = dontCheck super.hgdbmi; hi = dontCheck super.hi; + hierarchical-clustering = dontCheck super.hierarchical-clustering; hmatrix-tests = dontCheck super.hmatrix-tests; hPDB-examples = dontCheck super.hPDB-examples; hquery = dontCheck super.hquery; From fee8f2c11e0455430b41e0797c1c987fc484e905 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 18:14:38 +0100 Subject: [PATCH 41/80] haskell-amazonka-ssm: fix build with GHC 7.8.x --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 66445100ed0..718f56fb44a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -135,7 +135,8 @@ self: super: { amazonka-ecs = super.amazonka-ecs.overrideScope amazonkaEnv; amazonka-glacier = super.amazonka-glacier.overrideScope amazonkaEnv; amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv; + amazonka-ssm = super.amazonka-ssm.overrideScope amazonkaEnv; in { inherit amazonkaEnv; - inherit amazonka amazonka-cloudwatch amazonka-core amazonka-ecs amazonka-kms amazonka-glacier; + inherit amazonka amazonka-cloudwatch amazonka-core amazonka-ecs amazonka-kms amazonka-glacier amazonka-ssm; }) From 4eb43eec47d90461b1bd3a88d6010b8988e67c67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 18:19:37 +0100 Subject: [PATCH 42/80] haskell-webkit is broken. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2cc30b7de32..8459fe329cd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -618,6 +618,10 @@ self: super: { haroonga = markBroken super.haroonga; haroonga-httpd = markBroken super.haroonga-httpd; + # Cannot find pkg-config data for "webkit-1.0". + webkit = markBroken super.webkit; + websnap = markBroken super.websnap; + } // { # Not on Hackage. From 02ce9456933838917d32b65bc5bdd3a6a2ffdeb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Mar 2015 18:22:06 +0100 Subject: [PATCH 43/80] haskell-pocket-dns: test suite depends on external programs --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8459fe329cd..2784ca88aa5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -227,6 +227,7 @@ self: super: { HList = dontCheck super.HList; memcached-binary = dontCheck super.memcached-binary; persistent-zookeeper = dontCheck super.persistent-zookeeper; + pocket-dns = dontCheck super.pocket-dns; postgresql-simple = dontCheck super.postgresql-simple; postgrest = dontCheck super.postgrest; snowball = dontCheck super.snowball; From c532beeb0d0515610b824abd9a1dd995086e8a20 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 2 Mar 2015 20:58:05 +0300 Subject: [PATCH 44/80] sddm: add package --- .../display-managers/sddm/cmake_paths.patch | 55 +++++++++++++++++++ .../display-managers/sddm/default.nix | 47 ++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/display-managers/sddm/cmake_paths.patch create mode 100644 pkgs/applications/display-managers/sddm/default.nix diff --git a/pkgs/applications/display-managers/sddm/cmake_paths.patch b/pkgs/applications/display-managers/sddm/cmake_paths.patch new file mode 100644 index 00000000000..7deb3e2e1bd --- /dev/null +++ b/pkgs/applications/display-managers/sddm/cmake_paths.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d6e0a9..df4ad28 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,7 +77,9 @@ find_package(Qt5LinguistTools REQUIRED) + + # find qt5 imports dir + get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) +-exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR) ++if(NOT QT_IMPORTS_DIR) ++ exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR) ++endif() + + # Set components version + set(COMPONENTS_VERSION 2.0) +diff --git a/data/man/sddm.conf.rst.in b/data/man/sddm.conf.rst.in +index 6a28224..798bc5c 100644 +--- a/data/man/sddm.conf.rst.in ++++ b/data/man/sddm.conf.rst.in +@@ -65,6 +65,10 @@ OPTIONS + Path of the X server. + Default value is "/usr/bin/X". + ++`XephyrPath=` ++ Path of the Xephyr. ++ Default value is "/usr/bin/Xephyr". ++ + `XauthPath=` + Path of the Xauth. + Default value is "/usr/bin/xauth". +diff --git a/src/common/Configuration.h b/src/common/Configuration.h +index 72aa6f4..854cc22 100644 +--- a/src/common/Configuration.h ++++ b/src/common/Configuration.h +@@ -54,6 +54,7 @@ namespace SDDM { + // TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal + Section(XDisplay, + Entry(ServerPath, QString, _S("/usr/bin/X"), _S("X server path")); ++ Entry(XephyrPath, QString, _S("/usr/bin/Xephyr"), _S("Xephyr path")); + Entry(XauthPath, QString, _S("/usr/bin/xauth"), _S("Xauth path")); + Entry(SessionDir, QString, _S("/usr/share/xsessions"), _S("Session description directory")); + Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Xsession script path\n" +diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp +index f10ad82..cb9de3f 100644 +--- a/src/daemon/XorgDisplayServer.cpp ++++ b/src/daemon/XorgDisplayServer.cpp +@@ -136,7 +136,7 @@ namespace SDDM { + if (daemonApp->testing()) { + QStringList args; + args << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600"; +- process->start("/usr/bin/Xephyr", args); ++ process->start(mainConfig.XDisplay.XephyrPath.get(), args); + } else { + // set process environment + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix new file mode 100644 index 00000000000..73a188af0cf --- /dev/null +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs +, libXdmcp, libXau, qt5, pam, systemd }: + +let + version = "0.11.0"; +in +stdenv.mkDerivation rec { + name = "sddm-${version}"; + + src = fetchFromGitHub { + owner = "sddm"; + repo = "sddm"; + rev = "v${version}"; + sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig"; + }; + + nativeBuildInputs = [ cmake pkgconfig qt5.tools makeWrapper ]; + + buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qt5.base pam systemd ]; + + patches = [ (fetchpatch { + url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch"; + sha256 = "1pda0wf4xljdadja7iyh5c48h0347imadg9ya1dw5slgb7w1d94l"; + }) + ./cmake_paths.patch + ]; + + cmakeFlags = [ "-DCONFIG_FILE=/etc/sddm.conf" ]; + + preConfigure = '' + export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" + ''; + + postInstall = '' + wrapProgram $out/bin/sddm-greeter \ + --set QML2_IMPORT_PATH "${qt5.declarative}/lib/qt5/qml/" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "QML based X11 display manager"; + homepage = http://launchpad.net/lightdm; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e1506b3338..aa91dbd48c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11449,11 +11449,14 @@ let printrun = callPackage ../applications/misc/printrun { }; + sddm = callPackage ../applications/display-managers/sddm { + qt5 = qt54; + }; + slim = callPackage ../applications/display-managers/slim { libpng = libpng12; }; - smartgithg = callPackage ../applications/version-management/smartgithg { }; slimThemes = recurseIntoAttrs (import ../applications/display-managers/slim/themes.nix { From db5b08cfaf88568e815af6c8a9a3e60122a5f3d8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 2 Mar 2015 20:58:35 +0300 Subject: [PATCH 45/80] nixos/sddm: add display manager --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/x11/display-managers/sddm.nix | 108 ++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 nixos/modules/services/x11/display-managers/sddm.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index bd0c0bef8b6..158609dcf79 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -180,6 +180,7 @@ panamax = 170; marathon = 171; exim = 172; + sddm = 175; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -322,6 +323,7 @@ exim = 172; fleet = 173; input = 174; + sddm = 175; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 516d35137c5..ef1e9d450c8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -359,6 +359,7 @@ ./services/x11/display-managers/gdm.nix ./services/x11/display-managers/kdm.nix ./services/x11/display-managers/lightdm.nix + ./services/x11/display-managers/sddm.nix ./services/x11/display-managers/slim.nix ./services/x11/hardware/multitouch.nix ./services/x11/hardware/synaptics.nix diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix new file mode 100644 index 00000000000..020e8795045 --- /dev/null +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -0,0 +1,108 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + xcfg = config.services.xserver; + dmcfg = xcfg.displayManager; + cfg = dmcfg.sddm; + xEnv = config.systemd.services."display-manager".environment; + + xserverWrapper = pkgs.writeScript "xserver-wrapper" '' + #!/bin/sh + ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} + exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" + ''; + + cfgFile = pkgs.writeText "sddm.conf" '' + [General] + HaltCommand=${pkgs.systemd}/bin/systemctl poweroff + RebootCommand=${pkgs.systemd}/bin/systemctl reboot + + [Theme] + Current=${cfg.theme} + + [Users] + MaximumUid=${toString config.ids.uids.nixbld} + + [XDisplay] + MinimumVT=${toString xcfg.tty} + ServerPath=${xserverWrapper} + XephyrPath=${pkgs.xorg.xorgserver}/bin/Xephyr + SessionCommand=${dmcfg.session.script} + SessionDir=${dmcfg.session.desktops} + XauthPath=${pkgs.xorg.xauth}/bin/xauth + ''; + +in +{ + options = { + + services.xserver.displayManager.sddm = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable sddm as the display manager. + ''; + }; + + theme = mkOption { + type = types.str; + default = "maui"; + description = '' + Greeter theme to use. + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + + services.xserver.displayManager.slim.enable = false; + + services.xserver.displayManager.job = { + logsXsession = true; + + #execCmd = "${pkgs.sddm}/bin/sddm"; + execCmd = "exec ${pkgs.sddm}/bin/sddm"; + }; + + security.pam.services = { + sddm = { + allowNullPassword = true; + startSession = true; + }; + + sddm-greeter.text = '' + auth required pam_succeed_if.so audit quiet_success user = sddm + auth optional pam_permit.so + + account required pam_succeed_if.so audit quiet_success user = sddm + account sufficient pam_unix.so + + password required pam_deny.so + + session required pam_succeed_if.so audit quiet_success user = sddm + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional pam_keyinit.so force revoke + session optional pam_permit.so + ''; + }; + + users.extraUsers.sddm = { + createHome = true; + home = "/var/lib/sddm"; + group = "sddm"; + uid = config.ids.uids.sddm; + }; + + environment.etc."sddm.conf".source = cfgFile; + + users.extraGroups.sddm.gid = config.ids.gids.sddm; + + }; +} From 9a21011f08fa9e172cd4654cf1485217e33f8da4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 2 Mar 2015 19:04:48 +0300 Subject: [PATCH 46/80] uim: don't accept additional arguments --- pkgs/tools/inputmethods/uim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 1da552a46e2..160efe2ded8 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy, ... }: +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy}: stdenv.mkDerivation rec { version = "1.8.6"; From 0c5169b5367268803ec9c686822ff924ec71b3d1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 2 Mar 2015 19:05:29 +0300 Subject: [PATCH 47/80] samsung-UnifiedLinuxDriver: fix meta --- pkgs/misc/cups/drivers/samsung/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index ab0c0dc25e4..3d111ec5942 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -27,9 +27,10 @@ stdenv.mkDerivation rec { builder = ./builder.sh; - meta = { + meta = with stdenv.lib; { description = "Samsung's Linux drivers; includes binaries without source code"; homepage = "http://www.samsung.com/"; - license = "samsung"; # Binary-only + license = licenses.unfree; + platforms = platforms.linux; }; } From 264c6892f2e232e8a7966155257444490bee4dc8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 2 Mar 2015 19:06:05 +0300 Subject: [PATCH 48/80] nixos/uim: capitalize description --- nixos/modules/programs/uim.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/uim.nix b/nixos/modules/programs/uim.nix index fc25ba6f969..4bf2f9a1757 100644 --- a/nixos/modules/programs/uim.nix +++ b/nixos/modules/programs/uim.nix @@ -7,14 +7,16 @@ let in { options = { + uim = { enable = mkOption { type = types.bool; default = false; example = true; - description = "enable UIM input method"; + description = "Enable UIM input method"; }; }; + }; config = mkIf cfg.enable { From 4f317767dab206fcb1c636478e8feda51318d1bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 2 Mar 2015 19:08:30 +0300 Subject: [PATCH 49/80] lightdm: don't leave a shell running --- nixos/modules/services/x11/display-managers/lightdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 98e3fd6d6a5..6cccb37a474 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -97,7 +97,7 @@ in # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH execCmd = '' export PATH=${lightdm}/sbin:$PATH - ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf} + exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf} ''; }; From bb3cf3b4612bb7c6136dd638f30afd937264f6ad Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 5 Mar 2015 20:22:42 +0000 Subject: [PATCH 50/80] Bump development versions of disnix packages --- .../package-management/disnix/default.nix | 6 ++--- .../disnix/disnixos/default.nix | 6 ++--- .../disnix/dysnomia/default.nix | 26 ++++++++++--------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index b3e548583ff..04741b984fb 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3pre9d3acde83aa4283cb6fc26874c524a98f39a5bc6"; + name = "disnix-0.3precd3288b47c8e7205268d6afb066e21b9d114f797"; src = fetchurl { - url = http://hydra.nixos.org/build/20103891/download/4/disnix-0.3pre9d3acde83aa4283cb6fc26874c524a98f39a5bc6.tar.gz; - sha256 = "04ryf4qlw5jv0xjn6pqy5lkxqlynycsgdjin3ivfhq3pm6i0v65l"; + url = http://hydra.nixos.org/build/20137290/download/4/disnix-0.3precd3288b47c8e7205268d6afb066e21b9d114f797.tar.gz; + sha256 = "1n1m4kr9xp60kkrcx92npc6hh3gi36njzxmds7nw9mz0pccqbci1"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index cee6f7638fa..656a491a254 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.2pre7bbac66b0ed3b637c6ebcfdd8f12055cc330093c"; + name = "disnixos-0.2preead7dea88dedeb844450afc1f78bb58bd16ac909"; src = fetchurl { - url = http://hydra.nixos.org/build/20062333/download/3/disnixos-0.2pre7bbac66b0ed3b637c6ebcfdd8f12055cc330093c.tar.gz; - sha256 = "0d5ql8n93l8xa949cwk7v55lpfcp8j0x8wigqwfh6gim5f21niyb"; + url = http://hydra.nixos.org/build/20173386/download/3/disnixos-0.2preead7dea88dedeb844450afc1f78bb58bd16ac909.tar.gz; + sha256 = "08bkr9lpbfkz0irp4x4v2rgpn6jmm1i6vb29sbnrjdv755yh8q81"; }; buildInputs = [ socat pkgconfig disnix getopt ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index a444a92edd0..cc03972ad08 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -9,6 +9,7 @@ , enableTomcatWebApplication ? false , enableMongoDatabase ? false , catalinaBaseDir ? "/var/tomcat" +, jobTemplate ? "systemd" , getopt }: @@ -19,24 +20,25 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3pre92a89d735776366633fdea301fdc6dc537009bba"; + name = "dysnomia-0.3pre87657a43630ffcb9396261d3874b8fd1a89f4c9f"; src = fetchurl { - url = http://hydra.nixos.org/build/20062629/download/1/dysnomia-0.3pre92a89d735776366633fdea301fdc6dc537009bba.tar.gz; + url = http://hydra.nixos.org/build/20131278/download/1/dysnomia-0.3pre87657a43630ffcb9396261d3874b8fd1a89f4c9f.tar.gz; sha256 = "0dv7ivph2v5j4g5fqdrllxyzmp1hwnsd22n1s61qpkzb6qxaywjj"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - configureFlags = '' - ${if enableApacheWebApplication then "--with-apache" else "--without-apache"} - ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"} - ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"} - ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"} - ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"} - ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"} - ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"} - ${if enableMongoDatabase then "--with-mongodb" else "--without-mongodb"} - ''; + configureFlags = [ + $(if enableApacheWebApplication then "--with-apache" else "--without-apache") + $(if enableAxis2WebService then "--with-axis2" else "--without-axis2") + $(if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd") + $(if enableMySQLDatabase then "--with-mysql" else "--without-mysql") + $(if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql") + $(if enableSubversionRepository then "--with-subversion" else "--without-subversion") + $(if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") + $(if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") + "--with-job-template=${jobTemplate}" + ]; buildInputs = [ getopt ] ++ stdenv.lib.optional enableEjabberdDump ejabberd From b6a3fd396e318d3f687b719a0e6994c115dcd9b5 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Thu, 5 Mar 2015 13:00:50 -0800 Subject: [PATCH 51/80] dysnomia: fix syntax error --- .../disnix/dysnomia/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index cc03972ad08..64066ed0fff 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation { preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; configureFlags = [ - $(if enableApacheWebApplication then "--with-apache" else "--without-apache") - $(if enableAxis2WebService then "--with-axis2" else "--without-axis2") - $(if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd") - $(if enableMySQLDatabase then "--with-mysql" else "--without-mysql") - $(if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql") - $(if enableSubversionRepository then "--with-subversion" else "--without-subversion") - $(if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") - $(if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") + (if enableApacheWebApplication then "--with-apache" else "--without-apache") + (if enableAxis2WebService then "--with-axis2" else "--without-axis2") + (if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd") + (if enableMySQLDatabase then "--with-mysql" else "--without-mysql") + (if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql") + (if enableSubversionRepository then "--with-subversion" else "--without-subversion") + (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") + (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") "--with-job-template=${jobTemplate}" ]; From c08a0d240c0488db2dec944f946f0a1825c65553 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 5 Mar 2015 18:21:56 -0500 Subject: [PATCH 52/80] ats2: bump --- pkgs/development/compilers/ats2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 18f23416e80..43ac75271be 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.1.4"; + version = "0.1.9"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "174kxdvdgp2rlb0qq7d854n6m9gzy0g8annk3bmbqb23m36n2g39"; + sha256 = "0zcki97zj9r1dvlfriwfckp9b9z7iavw09q21v6i5ld90hw9588q"; }; buildInputs = [ gmp ]; From 47712a21bdef19984055980a924d27b32ff6979c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2015 00:44:14 +0100 Subject: [PATCH 53/80] Add libxcomp 3.5.0-2015-02-18 Thanks to Christoph-Simon Senjak --- .../libraries/libxcomp/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/libxcomp/default.nix diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix new file mode 100644 index 00000000000..989373315d0 --- /dev/null +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, autoconf, libjpeg, libpng12, libX11, zlib }: + +let version = "3.5.0-2015-02-18"; in +stdenv.mkDerivation { + name = "libxcomp-${version}"; + + src = fetchgit { + url = git://code.x2go.org/nx-libs.git; + rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298"; + sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9"; + }; + + meta = with stdenv.lib; { + description = "NX compression library"; + homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary"; + license = with licenses; gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ autoconf libjpeg libpng12 libX11 zlib ]; + + preConfigure = '' + cd nxcomp/ + autoconf + ''; + + enableParallelBuilding = true; + + postInstall = '' + mkdir $out/lib + cp libXcomp.so* $out/lib + mkdir $out/include + cp NX.h $out/include + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 975a4d4cf8f..8d477ddbfab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1782,6 +1782,8 @@ let libibverbs = callPackage ../development/libraries/libibverbs { }; + libxcomp = callPackage ../development/libraries/libxcomp { }; + librdmacm = callPackage ../development/libraries/librdmacm { }; limesurvey = callPackage ../servers/limesurvey { }; From 2a93bee7f32c6eabea918ec99251015e5b0b4f16 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2015 01:03:30 +0100 Subject: [PATCH 54/80] Add nxproxy 3.5.0-2015-02-18 Thanks to Christoph-Simon Senjak --- pkgs/tools/admin/nxproxy/default.nix | 29 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/admin/nxproxy/default.nix diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix new file mode 100644 index 00000000000..67d07d6eb3b --- /dev/null +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, autoconf, libxcomp }: + +let version = "3.5.0-2015-02-18"; in +stdenv.mkDerivation { + name = "nxproxy-${version}"; + + src = fetchgit { + url = git://code.x2go.org/nx-libs.git; + rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298"; + sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9"; + }; + + meta = with stdenv.lib; { + description = "NX compression proxy"; + homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary"; + license = with licenses; gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ autoconf libxcomp ]; + + preConfigure = '' + cd nxproxy/ + autoconf + ''; + + installTargets = [ "install.bin" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d477ddbfab..3ca70fbda4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2090,6 +2090,8 @@ let nylon = callPackage ../tools/networking/nylon { }; + nxproxy = callPackage ../tools/admin/nxproxy { }; + nzbget = callPackage ../tools/networking/nzbget { }; oathToolkit = callPackage ../tools/security/oath-toolkit { }; From 22080d19519c91c3e72d69a8b94f939ceb2930c1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2015 01:26:15 +0100 Subject: [PATCH 55/80] Add x2goclient 4.0.3.2 Thanks to Christoph-Simon Senjak --- .../networking/remote/x2goclient/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/networking/remote/x2goclient/default.nix diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix new file mode 100644 index 00000000000..9ce00facfbb --- /dev/null +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }: + +let version = "4.0.3.2"; in +stdenv.mkDerivation rec { + name = "x2goclient-${version}"; + + src = fetchurl { + url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; + sha256 = "0vqcz9kmnbvlj8kns68zl60019fdz97rydz4wsgnsgdf7r370npn"; + }; + + meta = with stdenv.lib; { + description = "Graphical NoMachine NX3 remote desktop client"; + homepage = http://x2go.org/; + license = with licenses; gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ cups libssh libXpm nxproxy openldap makeWrapper qt4 ]; + + patchPhase = '' + substituteInPlace Makefile \ + --replace "lrelease-qt4" "${qt4}/bin/lrelease" \ + --replace "qmake-qt4" "${qt4}/bin/qmake" \ + --replace "-o root -g root" "" + ''; + + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; + + enableParallelBuild = true; + + installTargets = [ "install_client" "install_man" ]; + postInstall = '' + wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin"; + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ca70fbda4e..b3560d5f442 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12010,6 +12010,8 @@ let x11vnc = callPackage ../tools/X11/x11vnc { }; + x2goclient = callPackage ../applications/networking/remote/x2goclient { }; + x2vnc = callPackage ../tools/X11/x2vnc { }; xaos = builderDefsPackage (import ../applications/graphics/xaos) { From 40e4ebbb57afc189be414df77c07fbf1b4222d16 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2015 01:39:15 +0100 Subject: [PATCH 56/80] python-packages: pgcli 0.16.0 -> 0.16.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4cd58995526..b41732005bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7444,10 +7444,10 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.16.0"; + version = "0.16.1"; src = pkgs.fetchFromGitHub { - sha256 = "05xqv3z47xk8v4pbhkavbw49wxq4i3zg49v4g074spqgvcs4jy1n"; + sha256 = "1sysx67inf0fcfa4qhqcii97y59zpg98f4kcvz15rlbnsi357css"; rev = "v${version}"; repo = "pgcli"; owner = "amjith"; From d37e8c401441ea8b9c5e9c91cfbb6d4d41268489 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2015 04:37:28 +0100 Subject: [PATCH 57/80] x2goclient: correct parallel building flag --- pkgs/applications/networking/remote/x2goclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 9ce00facfbb..8544ccc0f79 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; - enableParallelBuild = true; + enableParallelBuilding = true; installTargets = [ "install_client" "install_man" ]; postInstall = '' From 96b2d27e6959cb3eae3193088aaa7ae6330c66f6 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 6 Mar 2015 03:35:10 +0100 Subject: [PATCH 58/80] pax-utils: Update from 1.0 -> 1.0.1 --- pkgs/os-specific/linux/pax-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index d0a81069dfb..28bf24babdc 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "04p356j46symayh2d14i51xv9qic3iz9gnc7fr906skw3hccr7y3"; + sha256 = "0v14dvkg19yabh0ijy8fbrvapxvc36dwhvp90py3baq7qb44wrc7"; }; makeFlags = [ From 02b91f93c49cf5cdf28b9f647e1c8b88a8fc14f6 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 6 Mar 2015 03:35:01 +0100 Subject: [PATCH 59/80] firefox: Update from 36.0 -> 36.0.1 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 6f29784f129..702a9974bc6 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "36.0"; in +let version = "36.0.1"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "bcbfe0e4aa3236582c3b5c49619641224cf942df"; + sha1 = "cde80f5aee704827da43b9ca94a138a6c8a6c553"; }; buildInputs = From e47afb3601f56dc9ed9594a842638ef5bd5ab01c Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 28 Feb 2015 14:49:39 +0000 Subject: [PATCH 60/80] spidermonkey-17: Disable test which fails on ARM. (cherry picked from commit b90dca35aac458953182b4e1ad725c9466d11a66) --- pkgs/development/interpreters/spidermonkey/17.0.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index fc4546bc09e..53b2e4072ad 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip, bash }: stdenv.mkDerivation rec { version = "17.0.0"; @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { preCheck = '' rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 + # Test broken on ARM. Fedora disables it. + # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html + echo -e '#!${bash}/bin/bash\nexit 0' > config/find_vanilla_new_calls + paxmark m shell/js17 paxmark mr jsapi-tests/jsapi-tests ''; From 5f76d088654e12404457185288af791642121b7f Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 28 Feb 2015 18:32:01 +0000 Subject: [PATCH 61/80] polkit: Use spidermonkey-17. The old version doesn't build for ARMv7. (cherry picked from commit 5fe72cafffb22749520dd03a18bb862a37cca8b3) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d1d94890eb..43478a70ca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7057,7 +7057,7 @@ let poker-eval = callPackage ../development/libraries/poker-eval { }; polkit = callPackage ../development/libraries/polkit { - spidermonkey = spidermonkey_185; + spidermonkey = spidermonkey_17; }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { From de8e1bcb03b59b0e6fc34cf57a124497288d2ac2 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 6 Mar 2015 09:41:05 +0000 Subject: [PATCH 62/80] DisnixWebService: bump to latest development version --- .../package-management/disnix/DisnixWebService/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 845c760c41d..50c421ba41e 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: stdenv.mkDerivation { - name = "DisnixWebService-0.2"; + name = "DisnixWebService-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20103911/download/4/DisnixWebService-0.2.tar.bz2; - sha256 = "0sxyv93lc9zp8sk37dmpik1vchi5qa5djd5k90xg0n6920dl4snw"; + url = http://hydra.nixos.org/build/20173679/download/4/DisnixWebService-0.3.tar.bz2; + sha256 = "0gm8a4ijhydlij9byz2jvb925xzg8a7wbr9cnlf3b7r7zibi0sfy"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; From eaf728c3d339b852d5f8116fb7b4f18066655b9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Mar 2015 11:21:21 +0100 Subject: [PATCH 63/80] r-modules: fix git2r, TAQMNGR, and WhopGenome --- pkgs/development/r-modules/default.nix | 210 +++++++++++++------------ 1 file changed, 106 insertions(+), 104 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 0e92dcb6202..3dc8b0874ed 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -198,131 +198,132 @@ let # tweaks for the individual packages and "in self" follow packagesWithRDepends = { - # sort -t '=' -k 2 FactoMineR = [ self.car ]; }; packagesWithNativeBuildInputs = { - # sort -t '=' -k 2 - graphscan = [ pkgs.gsl ]; - RAppArmor = [ pkgs.apparmor ]; - BNSP = [ pkgs.gsl ]; - SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h - curl = [ pkgs.curl pkgs.openldap ]; - Rssa = [ pkgs.fftw ]; - fftw = [ pkgs.fftw ]; - fftwtools = [ pkgs.fftw ]; - kza = [ pkgs.fftw ]; - mwaved = [ pkgs.fftw ]; - spate = [ pkgs.fftw ]; - chebpol = [ pkgs.fftw ]; - seewave = [ pkgs.fftw pkgs.libsndfile ]; - rgeos = [ pkgs.geos ]; - Rglpk = [ pkgs.glpk ]; - RCA = [ pkgs.gmp ]; - gmp = [ pkgs.gmp ]; - rcdd = [ pkgs.gmp ]; - Rlibeemd = [ pkgs.gsl ]; - igraph = [ pkgs.gmp ]; - glpkAPI = [ pkgs.gmp pkgs.glpk ]; - sdcTable = [ pkgs.gmp pkgs.glpk ]; - Rmpfr = [ pkgs.gmp pkgs.mpfr ]; - Formula = [ pkgs.gmp ]; + abn = [ pkgs.gsl ]; + adimpro = [ pkgs.imagemagick ]; + audio = [ pkgs.portaudio ]; BayesSAE = [ pkgs.gsl ]; BayesVarSel = [ pkgs.gsl ]; - HiCseg = [ pkgs.gsl ]; - KFKSDS = [ pkgs.gsl ]; - R2GUESS = [ pkgs.gsl ]; - RcppZiggurat = [ pkgs.gsl ]; - SemiCompRisks = [ pkgs.gsl ]; - VBLPCM = [ pkgs.gsl ]; - abn = [ pkgs.gsl ]; + BayesXsrc = [ pkgs.readline pkgs.ncurses ]; + bigGP = [ pkgs.openmpi ]; + bnpmr = [ pkgs.gsl ]; + BNSP = [ pkgs.gsl ]; + cairoDevice = [ pkgs.gtk2 ]; + Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ]; + CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ]; + chebpol = [ pkgs.fftw ]; cit = [ pkgs.gsl ]; + curl = [ pkgs.curl pkgs.openldap ]; + devEMF = [ pkgs.xlibs.libXft ]; + diversitree = [ pkgs.gsl pkgs.fftw ]; + EMCluster = [ pkgs.liblapack ]; + fftw = [ pkgs.fftw ]; + fftwtools = [ pkgs.fftw ]; + Formula = [ pkgs.gmp ]; + geoCount = [ pkgs.gsl ]; + git2r = [ pkgs.zlib ]; + glpkAPI = [ pkgs.gmp pkgs.glpk ]; + gmp = [ pkgs.gmp ]; + graphscan = [ pkgs.gsl ]; + gsl = [ pkgs.gsl ]; + HiCseg = [ pkgs.gsl ]; + igraph = [ pkgs.gmp ]; + JavaGD = [ pkgs.jdk ]; + jpeg = [ pkgs.libjpeg ]; + KFKSDS = [ pkgs.gsl ]; + kza = [ pkgs.fftw ]; libamtrack = [ pkgs.gsl ]; mixcat = [ pkgs.gsl ]; - outbreaker = [ pkgs.gsl ]; - ridge = [ pkgs.gsl ]; - simplexreg = [ pkgs.gsl ]; - stsm = [ pkgs.gsl ]; - survSNP = [ pkgs.gsl ]; - topicmodels = [ pkgs.gsl ]; - RcppGSL = [ pkgs.gsl ]; - bnpmr = [ pkgs.gsl ]; - V8 = [ pkgs.v8 ]; - geoCount = [ pkgs.gsl ]; - devEMF = [ pkgs.xlibs.libXft ]; - gsl = [ pkgs.gsl ]; mvabund = [ pkgs.gsl ]; - diversitree = [ pkgs.gsl pkgs.fftw ]; - TKF = [ pkgs.gsl ]; - VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; - RGtk2 = [ pkgs.gtk2 ]; - cairoDevice = [ pkgs.gtk2 ]; - adimpro = [ pkgs.imagemagick ]; - rjags = [ pkgs.jags ]; - runjags = [ pkgs.jags ]; - JavaGD = [ pkgs.jdk ]; - RODBC = [ pkgs.libiodbc ]; - RODBCext = [ pkgs.libiodbc ]; - jpeg = [ pkgs.libjpeg ]; - EMCluster = [ pkgs.liblapack ]; - png = [ pkgs.libpng ]; - pbdMPI = [ pkgs.openmpi ]; - bigGP = [ pkgs.openmpi ]; - rtiff = [ pkgs.libtiff ]; - tiff = [ pkgs.libtiff ]; - Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ]; - XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ]; - rpud = [ pkgs.linuxPackages.nvidia_x11 ]; - CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ]; - rgl = [ pkgs.mesa pkgs.x11 ]; - ncdf = [ pkgs.netcdf ]; + mwaved = [ pkgs.fftw ]; ncdf4 = [ pkgs.netcdf ]; - pbdNCDF4 = [ pkgs.netcdf ]; - RNetCDF = [ pkgs.netcdf pkgs.udunits ]; + ncdf = [ pkgs.netcdf ]; nloptr = [ pkgs.nlopt ]; npRmpi = [ pkgs.openmpi ]; - pbdPROF = [ pkgs.openmpi ]; - sprint = [ pkgs.openmpi ]; - Rmpi = [ pkgs.openmpi ]; openssl = [ pkgs.openssl ]; + outbreaker = [ pkgs.gsl ]; + pbdMPI = [ pkgs.openmpi ]; + pbdNCDF4 = [ pkgs.netcdf ]; + pbdPROF = [ pkgs.openmpi ]; PKI = [ pkgs.openssl ]; + png = [ pkgs.libpng ]; + PopGenome = [ pkgs.zlib ]; + proj4 = [ pkgs.proj ]; + qtbase = [ pkgs.qt4 ]; + qtpaint = [ pkgs.qt4 ]; + R2GUESS = [ pkgs.gsl ]; + R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; + RAppArmor = [ pkgs.apparmor ]; + rbamtools = [ pkgs.zlib ]; + RCA = [ pkgs.gmp ]; + rcdd = [ pkgs.gmp ]; + RcppCNPy = [ pkgs.zlib ]; + RcppGSL = [ pkgs.gsl ]; + RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ]; + RcppZiggurat = [ pkgs.gsl ]; + rgdal = [ pkgs.proj pkgs.gdal ]; + rgeos = [ pkgs.geos ]; + rgl = [ pkgs.mesa pkgs.x11 ]; + Rglpk = [ pkgs.glpk ]; + RGtk2 = [ pkgs.gtk2 ]; + Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; + ridge = [ pkgs.gsl ]; + RJaCGH = [ pkgs.zlib ]; + rjags = [ pkgs.jags ]; + rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ]; + Rlibeemd = [ pkgs.gsl ]; + rmatio = [ pkgs.zlib ]; + Rmpfr = [ pkgs.gmp pkgs.mpfr ]; + Rmpi = [ pkgs.openmpi ]; + RMySQL = [ pkgs.zlib pkgs.mysql ]; + RNetCDF = [ pkgs.netcdf pkgs.udunits ]; + RODBCext = [ pkgs.libiodbc ]; + RODBC = [ pkgs.libiodbc ]; + rpg = [ pkgs.postgresql ]; + rphast = [ pkgs.pcre pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; + Rpoppler = [ pkgs.poppler ]; + RPostgreSQL = [ pkgs.postgresql ]; + RProtoBuf = [ pkgs.protobuf ]; + rpud = [ pkgs.linuxPackages.nvidia_x11 ]; + rPython = [ pkgs.python ]; RSclient = [ pkgs.openssl ]; Rserve = [ pkgs.openssl ]; - Rpoppler = [ pkgs.poppler ]; - audio = [ pkgs.portaudio ]; - rpg = [ pkgs.postgresql ]; - RPostgreSQL = [ pkgs.postgresql ]; - ssanv = [ pkgs.proj ]; - proj4 = [ pkgs.proj ]; - rgdal = [ pkgs.proj pkgs.gdal ]; - RProtoBuf = [ pkgs.protobuf ]; - rPython = [ pkgs.python ]; - qtpaint = [ pkgs.qt4 ]; - qtbase = [ pkgs.qt4 ]; - BayesXsrc = [ pkgs.readline pkgs.ncurses ]; - udunits2 = [ pkgs.udunits pkgs.expat ]; - tkrplot = [ pkgs.xlibs.libX11 ]; - rzmq = [ pkgs.zeromq3 ]; - PopGenome = [ pkgs.zlib ]; - RJaCGH = [ pkgs.zlib ]; - RcppCNPy = [ pkgs.zlib ]; - rbamtools = [ pkgs.zlib ]; - rmatio = [ pkgs.zlib ]; - RVowpalWabbit = [ pkgs.zlib pkgs.boost ]; - seqminer = [ pkgs.zlib pkgs.bzip2 ]; - seqinr = [ pkgs.zlib ]; - rphast = [ pkgs.pcre pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; + Rssa = [ pkgs.fftw ]; rtfbs = [ pkgs.zlib pkgs.pcre pkgs.bzip2 pkgs.gzip pkgs.readline ]; - Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; + rtiff = [ pkgs.libtiff ]; + runjags = [ pkgs.jags ]; + RVowpalWabbit = [ pkgs.zlib pkgs.boost ]; + rzmq = [ pkgs.zeromq3 ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; - RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ]; - rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ]; - R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; - sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; + sdcTable = [ pkgs.gmp pkgs.glpk ]; + seewave = [ pkgs.fftw pkgs.libsndfile ]; + SemiCompRisks = [ pkgs.gsl ]; + seqinr = [ pkgs.zlib ]; + seqminer = [ pkgs.zlib pkgs.bzip2 ]; showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ]; + simplexreg = [ pkgs.gsl ]; + SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h + spate = [ pkgs.fftw ]; + sprint = [ pkgs.openmpi ]; + ssanv = [ pkgs.proj ]; + stsm = [ pkgs.gsl ]; + survSNP = [ pkgs.gsl ]; + sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; + TAQMNGR = [ pkgs.zlib ]; + tiff = [ pkgs.libtiff ]; + TKF = [ pkgs.gsl ]; + tkrplot = [ pkgs.xlibs.libX11 ]; + topicmodels = [ pkgs.gsl ]; + udunits2 = [ pkgs.udunits pkgs.expat ]; + V8 = [ pkgs.v8 ]; + VBLPCM = [ pkgs.gsl ]; + VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; + WhopGenome = [ pkgs.zlib ]; XBRL = [ pkgs.zlib pkgs.libxml2 ]; - RMySQL = [ pkgs.zlib pkgs.mysql ]; + XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ]; }; packagesWithBuildInputs = { @@ -847,6 +848,7 @@ let "RAM" # requires Heatplus "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges "RbioRXN" # requires fmcsR, and KEGGREST + "RcppAPT" # configure script depends on /bin/sh "Rcell" # requires EBImage "RcmdrPlugin_seeg" # requires seeg "Rcplex" # requires cplexAPI From ad896e17379508eed21ab631d81f372c3b08bd0a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Mar 2015 12:09:10 +0100 Subject: [PATCH 64/80] Typo --- pkgs/development/libraries/nss_wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 198d9aec6c0..b0595e61e65 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "a wrapper for the user, group and hosts NSS API"; + description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; From cdd00f47fa4f6504120e0d5788a8da64f7fa6bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Mar 2015 12:51:41 +0100 Subject: [PATCH 65/80] libav*.tools: remove overlapping paths, fixes #6682 --- pkgs/development/libraries/libav/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index be3f803cff8..04e85bcfc33 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -79,10 +79,10 @@ let outputs = [ "out" "tools" ]; + # move avplay to get rid of the SDL dependency in the main output postInstall = '' mkdir -p "$tools/bin" mv "$out/bin/avplay" "$tools/bin" - cp -s "$out"/bin/* "$tools/bin/" ''; doInstallCheck = false; # fails randomly From d8a5712ea048fb58064bcf833c540421fee1b58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 6 Mar 2015 13:55:42 +0100 Subject: [PATCH 66/80] chromedriver: 2.10 -> 2.14 --- pkgs/development/tools/selenium/chromedriver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index ca5cfb3e12c..673253cf1ca 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { name = "chromedriver_linux64"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.10/${name}.zip"; - sha256 = "1949lhrv4hrmgapvypsgwzyr75w7vpy7nkkkwjkjxn61dkwmx4jw"; + url = "http://chromedriver.storage.googleapis.com/2.14/${name}.zip"; + sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin"; }; buildInputs = [ unzip makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mv chromedriver $out/bin patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { From f72ae4da79e15c78cf22eb99a0af6d1816de5e7b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Mar 2015 13:12:33 +0100 Subject: [PATCH 67/80] samba4: Fix evaluation http://hydra.nixos.org/build/20173661 --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 610ca73cc1c..362885417b7 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" # buildtools/wafsamba/wscript options - "--bundled-libraries=${if kerberos.implementation == "heimdal" then "NONE" else "com_err"}" + "--bundled-libraries=${if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err"}" "--private-libraries=NONE" "--builtin-libraries=replace" ] ++ (if libiconv != null then [ "--with-libiconv=${libiconv}" ] else [ ]) @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { then [ "--enable-gnutls" ] else [ "--disable-gnutls" ]) ++ [ # wscript options - ] ++ stdenv.lib.optional (kerberos.implementation == "krb5") "--with-system-mitkrb5" + ] ++ stdenv.lib.optional (kerberos != null && kerberos.implementation == "krb5") "--with-system-mitkrb5" ++ stdenv.lib.optional (kerberos == null) "--without-ad-dc" ++ [ # ctdb/wscript From bf0aa66c177a2026bc423b40e2940b4febbe666b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Mar 2015 13:16:10 +0100 Subject: [PATCH 68/80] Only test evaluation on supported platforms --- pkgs/top-level/make-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 356368d137d..c507acf8b1d 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -50,7 +50,7 @@ releaseTools.sourceTarball rec { fi # Check that all-packages.nix evaluates on a number of platforms. - for platform in i686-linux x86_64-linux x86_64-darwin i686-freebsd x86_64-freebsd; do + for platform in i686-linux x86_64-linux x86_64-darwin; do header "checking pkgs/top-level/all-packages.nix on $platform" NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ --show-trace --argstr system "$platform" \ From 494ae5fbebd93be58a1dcca18201a6ca166c156d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 6 Mar 2015 08:36:42 -0500 Subject: [PATCH 69/80] clang: provide path to gcc on Linux gcc contains core runtime bits that aren't available elsewhere for Linux. Fixes #6449 refs #6668 --- pkgs/development/compilers/llvm/3.5/clang.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index a95b77c08b6..93e0056fb92 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -1,6 +1,7 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: - -stdenv.mkDerivation { +let + gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc; +in stdenv.mkDerivation { name = "clang-${version}"; unpackPhase = '' @@ -17,6 +18,8 @@ stdenv.mkDerivation { "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ + # Maybe with compiler-rt this won't be needed? + (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); patches = [ ./clang-purity.patch ]; @@ -36,6 +39,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; + passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + inherit gcc; + }; + meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; From 692ed0882a30bb708659f6abe81e5836fd6a3e98 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Mar 2015 15:09:19 +0100 Subject: [PATCH 70/80] Fix eval-release.nix evaluation --- pkgs/stdenv/linux/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 3838f3e12d2..d432206a9e1 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -288,8 +288,6 @@ rec { ]; overrides = pkgs: { - inherit cc; - gcc = cc; inherit (stage4.pkgs) @@ -298,8 +296,8 @@ rec { attr acl paxctl zlib pcre; }; }; - - + + testBootstrapTools = let defaultPkgs = allPackages { inherit system platform; }; in derivation { @@ -310,7 +308,7 @@ rec { buildCommand = '' export PATH=${bootstrapTools}/bin - + ls -l mkdir $out mkdir $out/bin From f110e6721f651651f5bcf671c3022ee76ff9be42 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Mar 2015 15:11:41 +0100 Subject: [PATCH 71/80] chromedriver: Fix evaluation --- pkgs/development/tools/selenium/chromedriver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 673253cf1ca..f2d39938a48 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mv chromedriver $out/bin patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { From 0f4a9a58d8a9dec4a1cf10f0e9f04f075aaa5671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 6 Mar 2015 14:34:26 +0000 Subject: [PATCH 72/80] Avoid bash arg in Spidermonkey 17 --- pkgs/development/interpreters/spidermonkey/17.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index 53b2e4072ad..74f0fe2b83a 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip, bash }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }: stdenv.mkDerivation rec { version = "17.0.0"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # Test broken on ARM. Fedora disables it. # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html - echo -e '#!${bash}/bin/bash\nexit 0' > config/find_vanilla_new_calls + echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls paxmark m shell/js17 paxmark mr jsapi-tests/jsapi-tests From 3b9b6206561e49eef57d06b6838175ebf2a8064f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Mar 2015 15:59:06 +0100 Subject: [PATCH 73/80] Revert "linux: disable UEVENT_HELPER*" This reverts commit 9f87f3ccb0963e317594018016113ecea4686fe0 because it causes /proc/sys/kernel/hotplug to not be cleared on Linux <= 3.14. --- nixos/modules/services/hardware/udev.nix | 2 ++ pkgs/os-specific/linux/kernel/common-config.nix | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 1dc344a10fc..39180f4d37e 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -236,6 +236,8 @@ in system.activationScripts.udevd = '' + echo "" > /proc/sys/kernel/hotplug + # Regenerate the hardware database /var/lib/udev/hwdb.bin # whenever systemd changes. if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${config.systemd.package} ]; then diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 77045a0440c..c802d3f266d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -269,9 +269,6 @@ with stdenv.lib; SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y THERMAL_HWMON y # Hardware monitoring support - ${optionalString (versionAtLeast version "3.15") '' - UEVENT_HELPER n - ''} USB_DEBUG? n USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling From 5f736a02fbc7427cd3615dc3d992a83a9a75f5d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Mar 2015 11:26:59 +0100 Subject: [PATCH 74/80] hackage-packages.nix: re-generate from Hackage 2015-03-06T11:14:49+0100 --- .../haskell-modules/hackage-packages.nix | 92 ++++++++++--------- 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 429b0350209..c893e8ccbf2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7969,6 +7969,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HostAndPort" = callPackage + ({ mkDerivation, base, doctest, hspec, parsec }: + mkDerivation { + pname = "HostAndPort"; + version = "0.1.0"; + sha256 = "0rykpzp3vvc81ra917vicwsh8x1mr1ykw9a597ks959nmjy06mz8"; + buildDepends = [ base parsec ]; + testDepends = [ base doctest hspec ]; + homepage = "https://github.com/bacher09/hostandport"; + description = "Parser host and port pairs like localhost:22"; + license = stdenv.lib.licenses.mit; + }) {}; + "Hricket" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -32505,9 +32518,8 @@ self: { }: mkDerivation { pname = "contravariant"; - version = "1.2.0.1"; - sha256 = "06jyaxwv9dgpbrifdig9g6bgf6rmmjwhzhfb61rzkhmvm4dkm346"; - editedCabalFile = "dd01fca687e4bd5a1c6d4408f70f7863228155a7d7db2cdd0c20fec264d638a0"; + version = "1.2.1"; + sha256 = "1v8c3wdczp674f1h29w348vibh78m6i1kkrxbw9lvvbpi3aganb4"; buildDepends = [ base semigroups transformers transformers-compat void ]; @@ -47712,8 +47724,8 @@ self: { }: mkDerivation { pname = "fwgl"; - version = "0.1.0.3"; - sha256 = "1gc92r1612zsngw3hwikphav5281hqc4akn9i3zna16lz2jikqg0"; + version = "0.1.1.0"; + sha256 = "07ml9f8x4rw7wg6wib63nayh8mpszrkx0zal9zz0cpjh2f85n10a"; buildDepends = [ base hashable transformers unordered-containers vector Yampa ]; @@ -47730,11 +47742,11 @@ self: { pname = "fwgl-glfw"; version = "0.1.0.3"; sha256 = "1zmvw7945lkghavik72w096rqh8ivjyb9h6j98yjvlj6xf85bsq0"; + editedCabalFile = "f2a35fcd71bbea225624cf3b6d1f78647e103a1ee1edcc0a7eb9e27b0c4642d8"; buildDepends = [ base fwgl gl GLFW-b hashable JuicyPixels transformers unordered-containers vector Yampa ]; - jailbreak = true; homepage = "https://github.com/ZioCrocifisso/FWGL"; description = "FWGL GLFW backend"; license = stdenv.lib.licenses.bsd3; @@ -61125,9 +61137,8 @@ self: { }: mkDerivation { pname = "hlibBladeRF"; - version = "0.1.0.1"; - sha256 = "08c7sb447ifk6k53f2wkanqx1lvjiyfb6f6lybs6g1n31jqiixgn"; - editedCabalFile = "132696aa56c96eccaa5efbd49f633a05d93f95557992cd73f2eafbd1b3c2fc55"; + version = "0.1.0.2"; + sha256 = "0yg8j1vj9p1i2n1nyd9zq9j66k55ib1y1qz0l7v026mvdd6qx7li"; buildDepends = [ base bindings-DSL bytestring ]; testDepends = [ base hlint process regex-compat ]; pkgconfigDepends = [ libbladeRF ]; @@ -71986,29 +71997,29 @@ self: { "jose" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bifunctors, byteable, bytestring, certificate, crypto-pubkey + , bifunctors, byteable, bytestring, crypto-pubkey , crypto-pubkey-types, crypto-random, cryptohash , data-default-class, ghc-prim, hspec, integer-gmp, lens , network-uri, old-locale, safe, semigroups, template-haskell, text - , time, unordered-containers, vector + , time, unordered-containers, vector, x509 }: mkDerivation { pname = "jose"; - version = "0.3.38.0"; - sha256 = "0iwwq1gi5pmagxyrrlmirszdq0xnxj3n34kkw517yj465vlq0csj"; + version = "0.3.41.0"; + sha256 = "035kbwskcf36phcj2s33kx4jjw6km2sw0rm8jbad82d33h67yxah"; buildDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable - bytestring certificate crypto-pubkey crypto-pubkey-types - crypto-random cryptohash data-default-class ghc-prim integer-gmp - lens network-uri safe semigroups template-haskell text time - unordered-containers vector + bytestring crypto-pubkey crypto-pubkey-types crypto-random + cryptohash data-default-class ghc-prim integer-gmp lens network-uri + safe semigroups template-haskell text time unordered-containers + vector x509 ]; testDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable - bytestring certificate crypto-pubkey crypto-pubkey-types - crypto-random cryptohash data-default-class hspec lens network-uri - old-locale safe semigroups template-haskell text time - unordered-containers vector + bytestring crypto-pubkey crypto-pubkey-types crypto-random + cryptohash data-default-class hspec lens network-uri old-locale + safe semigroups template-haskell text time unordered-containers + vector x509 ]; homepage = "https://github.com/frasertweedale/hs-jose"; description = "Javascript Object Signing and Encryption and JSON Web Token library"; @@ -76618,8 +76629,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.16.2"; - sha256 = "1nd9jxg0zyjncmlxx6qf80378si5h1c4pnyy7zzwnbyqm81d9bqv"; + version = "1.16.4"; + sha256 = "11ii56sxsr7c4b7n4lbwjc4kbz443zs2g5afklvvq3l685l5zp68"; buildDepends = [ adjunctions base binary containers deepseq distributive ghc-prim hashable lens reflection semigroupoids semigroups tagged @@ -77097,13 +77108,13 @@ self: { ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty - , process, QuickCheck, syb, tasty, tasty-quickcheck, tasty-rerun - , text, text-format, transformers, unordered-containers + , process, syb, text, text-format, transformers + , unordered-containers }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.2.3.0"; - sha256 = "05axddy9b2dfw574ha444a8ppxsa9hhdx0naj50i7qyg59z2zrg6"; + version = "0.2.3.1"; + sha256 = "0gjndhrd0cjwmvl2ligklvmqr64p50m42rvxb79i13jk2jb16pg5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77112,9 +77123,6 @@ self: { intern mtl parsec pretty process syb text text-format transformers unordered-containers ]; - testDepends = [ - base QuickCheck tasty tasty-quickcheck tasty-rerun text - ]; buildTools = [ ocaml ]; configureFlags = [ "-fbuild-external" ]; homepage = "https://github.com/ucsd-progsys/liquid-fixpoint"; @@ -92950,8 +92958,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "0.2.6.0"; - sha256 = "0aqf4d8a90zxxbnyx8f2ijnkv598akmzy4gp1lishzgrvfhdrywi"; + version = "0.2.7.0"; + sha256 = "1mr7wka4kxxmpnhw9p49a4vh68iavrh74shc712z17gmr9yahvcx"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -100939,8 +100947,8 @@ self: { }: mkDerivation { pname = "satchmo"; - version = "2.9.2"; - sha256 = "0dc5bmwv19jxv6wqkhy3mc2fdawl53c3y0cyy0zyh4zb30iwkpi5"; + version = "2.9.3"; + sha256 = "1vb8j6qm6n4v3621y3gz1hf8h1lygp624c4i3s5kzx6vxmm9d368"; buildDepends = [ array base bytestring containers directory minisat mtl process ]; @@ -107178,8 +107186,8 @@ self: { ({ mkDerivation, base, cereal, doctest, ghc-prim, linear }: mkDerivation { pname = "spatial-math"; - version = "0.2.1.0"; - sha256 = "0s6ica55d3gv3y1iwinbk3pd8i8647p8gizrfh4wnsdy908n0qqv"; + version = "0.2.1.1"; + sha256 = "0c5jy0kx88x48zibia8hiamy0fz2wy1gw6yv0271pdiw34b6va1c"; buildDepends = [ base cereal ghc-prim linear ]; testDepends = [ base doctest ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; @@ -117346,8 +117354,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.1.20150129.0"; - sha256 = "103f37lcz6a72hl4vyd2ynpbd7ldxkn75znss2kbkrqfggb05p9c"; + version = "0.1.20150129.1"; + sha256 = "167ik26nsq2v6xqfk0rljp4p4g3r35rkvsza7cvi8qdak96dc4ay"; buildDepends = [ base bytestring containers vector ]; testDepends = [ base bytestring directory filemanip filepath HUnit MissingH @@ -119801,8 +119809,8 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.2.2"; - sha256 = "1df4y09f25y0sj3qn9x62a4bzdjjrml4510hdf0jsmiimqqyq0ac"; + version = "0.2.3"; + sha256 = "0zswcrd65dv8mnifh3h5hr1bmysc7mlqyyi4viln1is08daramzz"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers @@ -125993,8 +126001,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.3.11"; - sha256 = "1lj8fr659xnpcg6sipd3d03jpxibskdg9s63m0056173z49y2v7c"; + version = "1.4.4"; + sha256 = "0xd5rx9gpaj8m5v1ln3lgi6xhk2lw43c8ykdiqhp3583aybjkvnm"; isLibrary = false; isExecutable = true; buildDepends = [ From 43c4372d4cfa4b44582ef281110578bb56b2790c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Mar 2015 11:28:56 +0100 Subject: [PATCH 75/80] haskell-jose test suite has been fixed. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2784ca88aa5..6ecd0583d6d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -612,9 +612,6 @@ self: super: { influxdb = markBroken super.influxdb; snaplet-influxdb = markBroken super.snaplet-influxdb; - # https://github.com/frasertweedale/hs-jose/issues/4 - jose = dontCheck super.jose; - # We don't have the groonga package these libraries bind to. haroonga = markBroken super.haroonga; haroonga-httpd = markBroken super.haroonga-httpd; From 956ccc7b8d497c500d070aaa56c183ac112915af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Mar 2015 11:40:48 +0100 Subject: [PATCH 76/80] haskell-hlibBladeRF fails its test suite. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6ecd0583d6d..76249f5d9df 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -620,6 +620,9 @@ self: super: { webkit = markBroken super.webkit; websnap = markBroken super.websnap; + # https://github.com/victoredwardocallaghan/hlibBladeRF/issues/4 + hlibBladeRF = dontCheck super.hlibBladeRF; + } // { # Not on Hackage. From 0d4058b0cbf1ff11a362afb9e5b7a9e464cf73cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Mar 2015 14:10:17 +0100 Subject: [PATCH 77/80] haskell-yabi-muno cannot be built with GHC 7.8.x because it needs mtl 2.2.x. --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 718f56fb44a..a507222ee92 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -78,17 +78,16 @@ self: super: { hosc = dontDistribute super.hosc; tidal-midi = dontDistribute super.tidal-midi; - # Needs mtl 2.2.x due to "plailude". - clac = dontDistribute super.clac; - # These packages need mtl 2.2.x directly or indirectly via dependencies. apiary-purescript = markBroken super.apiary-purescript; + clac = dontDistribute super.clac; highlighter2 = markBroken super.highlighter2; hypher = markBroken super.hypher; purescript = markBroken super.purescript; xhb-atom-cache = markBroken super.xhb-atom-cache; xhb-ewmh = markBroken super.xhb-ewmh; yesod-purescript = markBroken super.yesod-purescript; + yabi-muno = markBroken super.yabi-muno; yet-another-logger = markBroken super.yet-another-logger; # https://github.com/frosch03/arrowVHDL/issues/2 From b6c769a15e79ef97d6c5547a27867d5e15cf7d52 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Mar 2015 16:00:59 +0100 Subject: [PATCH 78/80] haskell-persona-idp doesn't support recent versions of optparse-applicative --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 76249f5d9df..449bc82c94f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -623,6 +623,9 @@ self: super: { # https://github.com/victoredwardocallaghan/hlibBladeRF/issues/4 hlibBladeRF = dontCheck super.hlibBladeRF; + # https://github.com/frasertweedale/hs-persona-idp/issues/1 + persona-idp = markBroken super.persona-idp; + } // { # Not on Hackage. From 17a6cbc11c40cf1b2211d3edffea2eb4dbf2c535 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Mar 2015 16:03:31 +0100 Subject: [PATCH 79/80] haskell-miniforth needs mtl 2.2.x. --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index a507222ee92..d4f87fe186d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -83,6 +83,7 @@ self: super: { clac = dontDistribute super.clac; highlighter2 = markBroken super.highlighter2; hypher = markBroken super.hypher; + miniforth = markBroken super.miniforth; purescript = markBroken super.purescript; xhb-atom-cache = markBroken super.xhb-atom-cache; xhb-ewmh = markBroken super.xhb-ewmh; From 13bd8f068fda84f500543d3bf3344e4091ab3a51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Mar 2015 16:09:38 +0100 Subject: [PATCH 80/80] haskell-hopenpgp-tools does not compile. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 449bc82c94f..9a02b964b10 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -626,6 +626,9 @@ self: super: { # https://github.com/frasertweedale/hs-persona-idp/issues/1 persona-idp = markBroken super.persona-idp; + # Build is broken and no contact info available. + hopenpgp-tools = markBroken super.hopenpgp-tools; + } // { # Not on Hackage.