diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index cdb42fa7308..2552ec18bb9 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -260,7 +260,7 @@ let '' else ""} - ${if cfg.globalRedirect != null then '' + ${if cfg.globalRedirect != null && cfg.globalRedirect != "" then '' RedirectPermanent / ${cfg.globalRedirect} '' else ""} @@ -582,6 +582,12 @@ in ###### implementation config = mkIf config.services.httpd.enable { + + assertions = [ { assertion = mainCfg.enableSSL == true + -> mainCfg.sslServerCert != null + && mainCfg.sslServerKey != null; + message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; } + ]; users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") singleton { name = "wwwrun"; diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index b1df008398d..d0394b72edd 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, alsaLib, autoconf, automake, fftw, gettext, glib -, jackaudio, libX11, libtool, makeWrapper, pkgconfig, tcl, tk +{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper +, alsaLib, jackaudio, tk }: stdenv.mkDerivation rec { name = "puredata-${version}"; - version = "0.44-0"; + version = "0.45-4"; src = fetchurl { url = "mirror://sourceforge/pure-data/pd-${version}.src.tar.gz"; - sha256 = "031bvqfnlpfx0y5n0l5rmslziqc6jgmk99x1prgh1rmhjhjdnijw"; + sha256 = "1ls2ap5yi2zxvmr247621g4jx0hhfds4j5704a050bn2n3l0va2p"; }; - buildInputs = [ - alsaLib autoconf automake fftw gettext glib jackaudio libX11 - libtool makeWrapper pkgconfig tcl tk - ]; + patchPhase = '' + rm portaudio/configure.in + ''; - preConfigure = '' - ./autogen.sh + nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; + + buildInputs = [ alsaLib jackaudio ]; + + configureFlags = '' + --enable-alsa + --enable-jack + --disable-portaudio ''; postInstall = '' diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index cfa44d9285c..c7867ce22af 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mv Sublime* $out/sublime ln -s $out/sublime/sublime_text $out/bin/sublime + ln -s $out/sublime/sublime_text $out/bin/sublime2 echo ${libPath} patchelf \ diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix new file mode 100644 index 00000000000..3d9dec0d8f8 --- /dev/null +++ b/pkgs/applications/editors/sublime3/default.nix @@ -0,0 +1,40 @@ +{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango}: +let + libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; +in +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "sublimetext3-3.0.59"; + src = + if stdenv.system == "i686-linux" then + fetchurl { + name = "sublimetext-3.0.59.tar.bz2"; + url = http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_3059_x32.tar.bz2; + sha256 = "5ee7b42b5db057108e97b86fd408124fc3f7b56662b2851f59d91f8f0c288088"; + } + else + fetchurl { + name = "sublimetext-3.0.59.tar.bz2"; + url = http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_3059_x64.tar.bz2; + sha256 = "da3039687664d33a734cea0151b2291ece9c7f35e5b73df5b2b5eac28a20b972"; + }; + buildCommand = '' + tar xvf ${src} + mkdir -p $out/bin + mv sublime_text_3 $out/sublime + ln -s $out/sublime/sublime_text $out/bin/sublime + ln -s $out/sublime/sublime_text $out/bin/sublime3 + + echo ${libPath} + patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + $out/sublime/sublime_text + ''; + + meta = { + description = "Sophisticated text editor for code, markup and prose"; + license = "unfree"; + }; +} diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix new file mode 100644 index 00000000000..6d54032bb38 --- /dev/null +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }: + +stdenv.mkDerivation { + name = "keepassx-2.0alpha5"; + src = fetchurl { + url = "https://github.com/keepassx/keepassx/archive/2.0-alpha5.tar.gz"; + sha256 = "1vxj306zhrr38mvsy3vpjlg6d0xwlcvsi3l69nhhwzkccsc4smfm"; + }; + + buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ]; + + meta = { + description = "Qt password manager compatible with its Win32 and Pocket PC versions"; + homepage = http://www.keepassx.org/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [qknight]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 87cdf673041..908e54f3e43 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -40,6 +40,8 @@ let inherit url sha256; }; + buildInputs = [ python ]; # cannot patch shebangs otherwise + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; opensslPatches = optional useOpenSSL openssl.patches; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 527642348d2..173dfe9c929 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig -, intltool, libxslt }: +, intltool, libxslt, gobjectIntrospection, dbus_libs }: stdenv.mkDerivation rec { project = "telepathy-logger"; @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; }; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ]; + NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool + gobjectIntrospection dbus_libs ]; nativeBuildInputs = [ libxslt ]; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index b2c9b7c3e73..619925354f0 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, imake, zlib, openjdk, libX11, libXt, libXmu, libXaw, libXext, libXpm, openjpeg, openssl }: +{ stdenv, fetchurl, imake, zlib, openjdk, libX11, libXt, libXmu +, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk }: -let version = "1.0.29"; in stdenv.mkDerivation rec { name = "ssvnc-${version}"; + version = "1.0.29"; src = fetchurl { url = "mirror://sourceforge/ssvnc/${name}.src.tar.gz"; @@ -13,6 +14,10 @@ stdenv.mkDerivation rec { configurePhase = "makeFlags=PREFIX=$out"; + postInstall = '' + sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/lib/ssvnc/util/ssvnc.tcl + ''; + meta = { description = "VNC viewer that adds encryption security to VNC connections"; homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html"; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 5f88bbc74cc..90bca9b0712 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, ed }: stdenv.mkDerivation rec { - name = "rcs-5.8.2"; + name = "rcs-5.9.2"; src = fetchurl { - url = "mirror://gnu/rcs/${name}.tar.gz"; - sha256 = "1p4kqqrvc7plc3n6ls4xwp6d3mw1jcx9p36pilwd65q31mgbs07a"; + url = "mirror://gnu/rcs/${name}.tar.xz"; + sha256 = "0wdmmplga9k05d9k7wjqv4zb6xvvzsli8hmn206pvangki1g66k5"; }; + buildInputs = [ ed ]; + doCheck = true; meta = { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix new file mode 100644 index 00000000000..b718d89c8c7 --- /dev/null +++ b/pkgs/applications/virtualization/docker/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, iptables, lvm2 +, bash}: + +stdenv.mkDerivation rec { + name = "docker-${version}"; + version = "0.7.6"; + + src = fetchurl { + url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; + sha256 = "0anlzba2vm1fs5nf0dl2svrgj3ddsbl5iyhsm8vfbi3f23vppkfv"; + }; + + phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"]; + + buildInputs = [ makeWrapper go sqlite lxc iproute lvm2 iptables ]; + + preBuild = '' + patchShebangs ./hack + ''; + + buildPhase = '' + mkdir -p src/github.com/dotcloud + ln -sn "../../../" "src/github.com/dotcloud/docker" + export GOPATH="$(pwd):$(pwd)/vendor" + export DOCKER_GITCOMMIT="bc3b2ec0622f50879ae96f042056b6bd2e0b4fba" + export DOCKER_INITPATH="$out/libexec/docker/dockerinit" + ./hack/make.sh dynbinary + ''; + + installPhase = '' + install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker + install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit + wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:${lvm2}:sbin:${lxc}/bin:${iptables}/sbin" + + # systemd + install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + + # completion + install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker + install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + ''; + + meta = with stdenv.lib; { + homepage = http://www.docker.io/; + description = "An open source project to pack, ship and run any application as a lightweight container"; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index c54d8f304b6..981aa59369d 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "docbook-xsl-1.72.0"; + name = "docbook-xsl-1.78.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/docbook/docbook-xsl-1.72.0.tar.bz2; - sha256 = "1cnrfgqz8pc9wnlgqjch2338ad7jki6d4h6b2fhaxn1a2201df5k"; + url = mirror://sourceforge/docbook/docbook-xsl-1.78.1.tar.bz2; + sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"; }; } diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix index 2c401856b7f..ab30c81efc2 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib -, libX11, xextproto, libSM, libICE, libXtst, libXi }: +, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation (rec { versionMajor = "2.10"; @@ -15,6 +15,7 @@ stdenv.mkDerivation (rec { buildInputs = [ python pkgconfig popt intltool dbus_glib libX11 xextproto libSM libICE libXtst libXi + gobjectIntrospection ]; # ToDo: on non-NixOS we create a symlink from there? diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index fc7471019bd..47dae0486e9 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2 +{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2 , intltool, polkit, orbit }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; }; - buildInputs = [ libxml2 polkit gtk orbit ]; + buildInputs = [ libxml2 polkit gnome3.gtk orbit ]; propagatedBuildInputs = [ glib dbus_glib ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 7b7588b9528..059942530ea 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk }: +, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk +, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gcr-3.10.1"; @@ -10,12 +11,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig intltool gnupg p11_kit glib + pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk ]; - configureFlags = [ "--disable-introspection" ]; - #doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 2955c5f399b..3df5ab40eaf 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11 -, gtk, libcanberra_gtk3, pam, libtool -}: +, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gdm-3.10.0.1"; src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; + url = "mirror://gnome/sources/gdm/3.10/${name}.tar.xz"; sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl"; }; - buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice libX11 gtk libcanberra_gtk3 pam libtool ]; + buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice + gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index e4a0752eb4a..429d147e728 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17 }: +{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17, pango }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = with gnome3; - [ gobjectIntrospection pkgconfig glib ]; + [ gobjectIntrospection pkgconfig glib pango ]; propagatedBuildInputs = [ spidermonkey_17 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 14f0110e374..455f18de98e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit -, docbook_xsl_ns, docbook_xsl }: +, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit +, docbook_xsl_ns, docbook_xsl, gnome3 }: stdenv.mkDerivation rec { name = "gnome-keyring-3.10.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q"; }; - buildInputs = [ + buildInputs = with gnome3; [ dbus libgcrypt pam python gtk3 gconf libgnome_keyring pango gcr gdk_pixbuf atk p11_kit ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix index 0103800b02f..37d2ea1c086 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: -let - version = "3.10.1"; -in -stdenv.mkDerivation { - name = "gnome-menus-${version}"; - src = fetchurl { - url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz"; +stdenv.mkDerivation rec { + name = "gnome-menus-${version}"; + version = "3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 3040d817a16..c17b3ba3eb6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "gnome-online-accounts-3.10.2"; src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-online-accounts/3.10/${name}.tar.xz"; sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 40426986182..804a0c54a41 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper }: +, libxslt, intltool, makeWrapper, systemd }: stdenv.mkDerivation rec { @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n"; }; + configureFlags = "--enable-systemd"; + buildInputs = with gnome3; [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gsettings_desktop_schemas upower intltool gconf makeWrapper ]; - - # TODO: dbus, gnome-shell, gnome-settings-daemon + gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; postInstall = '' wrapProgram "$out/bin/gnome-session" \ diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index cce0ff46ca0..cb9b00f5279 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst , libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool -, docbook_xsl, docbook_xsl_ns, makeWrapper }: +, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }: stdenv.mkDerivation rec { name = "gnome-settings-daemon-3.10.2"; @@ -11,13 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240"; }; - configureFlags = "--disable-ibus"; - # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; buildInputs = with gnome3; - [ intltool pkgconfig gtk glib gsettings_desktop_schemas libnotify gnome_desktop + [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt libtool docbook_xsl docbook_xsl_ns makeWrapper ]; @@ -25,6 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix PATH : "${glib}/bin" \ --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix new file mode 100644 index 00000000000..3799a008c1b --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -0,0 +1,43 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret +, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns +, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit +, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper +, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }: + + +stdenv.mkDerivation rec { + name = "gnome-shell-3.10.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell/3.10/${name}.tar.xz"; + sha256 = "0k642y6h878v6mczx4z1zj4pjl7z4bvq02raxxwxkjyvyz2fv36j"; + }; + + buildInputs = with gnome3; + [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice + libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf + clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns + libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server + libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm + at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger ]; + + configureFlags = "--disable-static"; + + preBuild = '' + patchShebangs src/data-to-c.pl + ''; + + postInstall = with gnome3; '' + wrapProgram "$out/bin/gnome-shell" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \ + --prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share" + wrapProgram "$out/libexec/gnome-shell-calendar-server" \ + --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 59097b6aeef..772aaf54e0a 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -3,6 +3,7 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gtk = gtk3; # just to be sure + libcanberra = pkgs.libcanberra_gtk3; # just to be sure inherit (pkgs.gnome2) gnome_common ORBit2; orbit = ORBit2; @@ -47,6 +48,8 @@ rec { gnome_session = callPackage ./core/gnome-session { }; + gnome_shell = callPackage ./core/gnome-shell { }; + gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; gnome_terminal = callPackage ./core/gnome-terminal { }; diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 4609dd0b442..10aa5ba4e07 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,8 +1,8 @@ { cabal, ansiTerminal, ansiWlPprint, binary, boehmgc, Cabal -, deepseq, filepath, gmp, happy, haskeline, languageJava, mtl -, network, parsers, split, text, time, transformers, trifecta -, unorderedContainers, utf8String, vector, vectorBinaryInstances -, xml +, deepseq, filepath, gmp, happy, haskeline, languageJava, libffi +, llvmGeneral, llvmGeneralPure, mtl, network, parsers, split, text +, time, transformers, trifecta, unorderedContainers, utf8String +, vector, vectorBinaryInstances, xml }: cabal.mkDerivation (self: { @@ -13,12 +13,13 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ ansiTerminal ansiWlPprint binary Cabal deepseq filepath haskeline - languageJava mtl network parsers split text time transformers - trifecta unorderedContainers utf8String vector - vectorBinaryInstances xml + languageJava libffi llvmGeneral llvmGeneralPure mtl network parsers + split text time transformers trifecta unorderedContainers + utf8String vector vectorBinaryInstances xml ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; + configureFlags = "-fllvm -fgmp -fffi"; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; diff --git a/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch b/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch new file mode 100644 index 00000000000..5e7370718ab --- /dev/null +++ b/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch @@ -0,0 +1,21 @@ +diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp +--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 ++++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400 +@@ -2146,9 +2146,6 @@ + if (DriverArgs.hasArg(options::OPT_nostdinc)) + return; + +- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) +- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); +- + if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { + llvm::sys::Path P(D.ResourceDir); + P.appendComponent("include"); +@@ -2264,6 +2261,7 @@ + return; + + // Check if libc++ has been enabled and provide its include paths if so. ++ // !!! Will need to modify this if/when nixpkgs uses libc++ + if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) { + // libc++ is always installed at a fixed path on Linux currently. + addSystemInclude(DriverArgs, CC1Args, diff --git a/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch b/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch new file mode 100644 index 00000000000..ffa67b464ec --- /dev/null +++ b/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch @@ -0,0 +1,57 @@ +diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp +--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 ++++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400 +@@ -2077,16 +2077,6 @@ + addPathIfExists(LibPath + "/../" + Multilib, Paths); + } + } +- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); +- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); +- +- // Try walking via the GCC triple path in case of multiarch GCC +- // installations with strange symlinks. +- if (GCCInstallation.isValid()) +- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + +- "/../../" + Multilib, Paths); + + // Add the non-multilib suffixed paths (if potentially different). + if (GCCInstallation.isValid()) { +@@ -2100,8 +2090,6 @@ + addPathIfExists(LibPath, Paths); + } + } +- addPathIfExists(SysRoot + "/lib", Paths); +- addPathIfExists(SysRoot + "/usr/lib", Paths); + } + + bool Linux::HasNativeLLVMSupport() const { +diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp +--- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400 ++++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400 +@@ -5210,24 +5210,6 @@ + ToolChain.getArch() == llvm::Triple::thumb || + (!Args.hasArg(options::OPT_static) && + !Args.hasArg(options::OPT_shared))) { +- CmdArgs.push_back("-dynamic-linker"); +- if (ToolChain.getArch() == llvm::Triple::x86) +- CmdArgs.push_back("/lib/ld-linux.so.2"); +- else if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::thumb) +- CmdArgs.push_back("/lib/ld-linux.so.3"); +- else if (ToolChain.getArch() == llvm::Triple::mips || +- ToolChain.getArch() == llvm::Triple::mipsel) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::mips64 || +- ToolChain.getArch() == llvm::Triple::mips64el) +- CmdArgs.push_back("/lib64/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::ppc) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::ppc64) +- CmdArgs.push_back("/lib64/ld64.so.1"); +- else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); + } + + CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/llvm/3.1/clang.nix b/pkgs/development/compilers/llvm/3.1/clang.nix new file mode 100644 index 00000000000..c152d2215d8 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.1/clang.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, perl, groff, llvm, cmake }: + +let + version = "3.1"; + gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; +in + +stdenv.mkDerivation { + name = "clang-${version}"; + + buildInputs = [ perl llvm groff cmake ]; + + patches = stdenv.lib.optionals (stdenv.gcc.libc != null) + [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; + + cmakeFlags = [ + "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_TARGETS_TO_BUILD=all" + "-DGCC_INSTALL_PREFIX=${gccReal}" + ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ + "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" + ]; + + enableParallelBuilding = true; + + src = fetchurl { + url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; + sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz"; + }; + + passthru = { gcc = stdenv.gcc.gcc; }; + + meta = { + homepage = http://clang.llvm.org/; + description = "A C language family frontend for LLVM"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric vlstill]; + platforms = with stdenv.lib.platforms; all; + }; +} + diff --git a/pkgs/development/compilers/llvm/3.1/default.nix b/pkgs/development/compilers/llvm/3.1/default.nix new file mode 100644 index 00000000000..60837d58b29 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.1/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, perl, groff, cmake, python, binutils }: + +let version = "3.1"; in + +stdenv.mkDerivation { + name = "llvm-${version}"; + + src = fetchurl { + url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; + sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; + }; + + buildInputs = [ perl groff cmake python ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://llvm.org/; + description = "Collection of modular and reusable compiler and toolchain technologies"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric raskin vlstill]; + platforms = with stdenv.lib.platforms; all; + }; +} + diff --git a/pkgs/development/compilers/llvm/3.2/clang-purity.patch b/pkgs/development/compilers/llvm/3.2/clang-purity.patch new file mode 100644 index 00000000000..18c70b56c54 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.2/clang-purity.patch @@ -0,0 +1,137 @@ +diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver/ToolChains.cpp +--- clang-3.2.src-orig/lib/Driver/ToolChains.cpp 2012-12-16 10:59:27.000000000 -0500 ++++ clang-3.2.src/lib/Driver/ToolChains.cpp 2013-01-22 14:16:55.787547681 -0500 +@@ -2153,16 +2153,6 @@ + addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib", Paths); + } + } +- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); +- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); +- +- // Try walking via the GCC triple path in case of multiarch GCC +- // installations with strange symlinks. +- if (GCCInstallation.isValid()) +- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + +- "/../../" + Multilib, Paths); + + // Add the non-multilib suffixed paths (if potentially different). + if (GCCInstallation.isValid()) { +@@ -2176,8 +2166,6 @@ + addPathIfExists(LibPath, Paths); + } + } +- addPathIfExists(SysRoot + "/lib", Paths); +- addPathIfExists(SysRoot + "/usr/lib", Paths); + } + + bool Linux::HasNativeLLVMSupport() const { +@@ -2228,9 +2216,6 @@ + if (DriverArgs.hasArg(options::OPT_nostdinc)) + return; + +- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) +- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); +- + if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { + llvm::sys::Path P(D.ResourceDir); + P.appendComponent("include"); +@@ -2295,24 +2280,6 @@ + "/usr/include/powerpc64-linux-gnu" + }; + ArrayRef MultiarchIncludeDirs; +- if (getTriple().getArch() == llvm::Triple::x86_64) { +- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::x86) { +- MultiarchIncludeDirs = X86MultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::arm) { +- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) +- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs; +- else +- MultiarchIncludeDirs = ARMMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::mips) { +- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::mipsel) { +- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::ppc) { +- MultiarchIncludeDirs = PPCMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::ppc64) { +- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs; +- } + for (ArrayRef::iterator I = MultiarchIncludeDirs.begin(), + E = MultiarchIncludeDirs.end(); + I != E; ++I) { +@@ -2324,13 +2291,6 @@ + + if (getTriple().getOS() == llvm::Triple::RTEMS) + return; +- +- // Add an include of '/include' directly. This isn't provided by default by +- // system GCCs, but is often used with cross-compiling GCCs, and harmless to +- // add even when Clang is acting as-if it were a system compiler. +- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include"); +- +- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); + } + + /// \brief Helper to add the thre variant paths for a libstdc++ installation. +diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tools.cpp +--- clang-3.2.src-orig/lib/Driver/Tools.cpp 2012-11-21 02:56:23.000000000 -0500 ++++ clang-3.2.src/lib/Driver/Tools.cpp 2013-01-22 14:24:37.167212186 -0500 +@@ -5972,34 +5972,6 @@ + ToolChain.getArch() == llvm::Triple::thumb || + (!Args.hasArg(options::OPT_static) && + !Args.hasArg(options::OPT_shared))) { +- CmdArgs.push_back("-dynamic-linker"); +- if (isAndroid) +- CmdArgs.push_back("/system/bin/linker"); +- else if (ToolChain.getArch() == llvm::Triple::x86) +- CmdArgs.push_back("/lib/ld-linux.so.2"); +- else if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::thumb) { +- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) +- CmdArgs.push_back("/lib/ld-linux-armhf.so.3"); +- else +- CmdArgs.push_back("/lib/ld-linux.so.3"); +- } +- else if (ToolChain.getArch() == llvm::Triple::mips || +- ToolChain.getArch() == llvm::Triple::mipsel) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::mips64 || +- ToolChain.getArch() == llvm::Triple::mips64el) { +- if (hasMipsN32ABIArg(Args)) +- CmdArgs.push_back("/lib32/ld.so.1"); +- else +- CmdArgs.push_back("/lib64/ld.so.1"); +- } +- else if (ToolChain.getArch() == llvm::Triple::ppc) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::ppc64) +- CmdArgs.push_back("/lib64/ld64.so.1"); +- else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); + } + + CmdArgs.push_back("-o"); +diff -Naur clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp +--- clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp 2012-10-24 12:19:39.000000000 -0400 ++++ clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp 2013-01-22 14:20:32.803925775 -0500 +@@ -221,8 +221,6 @@ + case llvm::Triple::Bitrig: + break; + default: +- // FIXME: temporary hack: hard-coded paths. +- AddPath("/usr/local/include", System, true, false, false); + break; + } + } +@@ -330,8 +328,6 @@ + break; + } + +- if ( os != llvm::Triple::RTEMS ) +- AddPath("/usr/include", System, false, false, false); + } + + void InitHeaderSearch:: diff --git a/pkgs/development/compilers/llvm/3.2/clang.nix b/pkgs/development/compilers/llvm/3.2/clang.nix new file mode 100644 index 00000000000..b8e9f946773 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.2/clang.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }: + +let + version = "3.2"; + gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; +in + +stdenv.mkDerivation { + name = "clang-${version}"; + + buildInputs = [ perl llvm groff cmake libxml2 ]; + + patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; + + cmakeFlags = [ + "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_TARGETS_TO_BUILD=all" + "-DGCC_INSTALL_PREFIX=${gccReal}" + ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ + "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" + ]; + + enableParallelBuilding = true; + + src = fetchurl { + url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; + sha256 = "0n2nzw3pw2v7fk67f2k2qyzd9wibvi3i5j7cjzz1csqgghzz1aia"; + }; + + passthru = { gcc = stdenv.gcc.gcc; }; + + meta = { + homepage = http://clang.llvm.org/; + description = "A C language family frontend for LLVM"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/development/compilers/llvm/3.2/default.nix b/pkgs/development/compilers/llvm/3.2/default.nix new file mode 100644 index 00000000000..c373f1c1a4a --- /dev/null +++ b/pkgs/development/compilers/llvm/3.2/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }: + +let version = "3.2"; in + +stdenv.mkDerivation { + name = "llvm-${version}"; + + src = fetchurl { + url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; + sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j"; + }; + + patches = [ ./set_soname.patch ]; # http://llvm.org/bugs/show_bug.cgi?id=12334 + patchFlags = "-p0"; + + preConfigure = "patchShebangs ."; + + propagatedBuildInputs = [ libffi ]; + buildInputs = [ perl groff cmake python ]; # ToDo: polly, libc++; enable cxx11? + + # created binaries need to be run before installation... I coudn't find a better way + preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib''; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_SHARED_LIBS=ON" + "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + ]; + + enableParallelBuilding = true; + #doCheck = true; # tests are broken, don't know why + + meta = { + homepage = http://llvm.org/; + description = "Collection of modular and reusable compiler and toolchain technologies"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric raskin vlstill]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/development/compilers/llvm/3.2/set_soname.patch b/pkgs/development/compilers/llvm/3.2/set_soname.patch new file mode 100644 index 00000000000..69ba74dddad --- /dev/null +++ b/pkgs/development/compilers/llvm/3.2/set_soname.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/show_bug.cgi?id=409267 +http://llvm.org/bugs/show_bug.cgi?id=12334 +--- tools/llvm-shlib/Makefile.orig 2012-03-26 18:14:13.071797115 +0200 ++++ tools/llvm-shlib/Makefile 2012-03-26 17:31:12.491196254 +0200 +@@ -67,6 +67,7 @@ + # Include everything from the .a's into the shared library. + LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ + -Wl,--no-whole-archive ++ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) + endif + + ifeq ($(HOST_OS),Linux) diff --git a/pkgs/development/compilers/llvm/3.3/clang-purity.patch b/pkgs/development/compilers/llvm/3.3/clang-purity.patch new file mode 100644 index 00000000000..e82305189e8 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.3/clang-purity.patch @@ -0,0 +1,162 @@ +diff -Naur cfe-3.3.src-orig/lib/Driver/ToolChains.cpp cfe-3.3.src/lib/Driver/ToolChains.cpp +--- cfe-3.3.src-orig/lib/Driver/ToolChains.cpp 2013-05-06 12:26:41.000000000 -0400 ++++ cfe-3.3.src/lib/Driver/ToolChains.cpp 2013-06-21 19:28:12.120364372 -0400 +@@ -2318,17 +2318,6 @@ + Paths); + } + } +- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); +- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); +- +- // Try walking via the GCC triple path in case of multiarch GCC +- // installations with strange symlinks. +- if (GCCInstallation.isValid()) +- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + +- "/../../" + Multilib, Paths); +- + // Add the non-multilib suffixed paths (if potentially different). + if (GCCInstallation.isValid()) { + const std::string &LibPath = GCCInstallation.getParentLibPath(); +@@ -2341,8 +2330,6 @@ + addPathIfExists(LibPath, Paths); + } + } +- addPathIfExists(SysRoot + "/lib", Paths); +- addPathIfExists(SysRoot + "/usr/lib", Paths); + + IsPIEDefault = SanitizerArgs(*this, Args).hasZeroBaseShadow(); + } +@@ -2395,9 +2382,6 @@ + if (DriverArgs.hasArg(options::OPT_nostdinc)) + return; + +- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) +- addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include"); +- + if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { + llvm::sys::Path P(D.ResourceDir); + P.appendComponent("include"); +@@ -2479,26 +2463,6 @@ + "/usr/include/powerpc64-linux-gnu" + }; + ArrayRef MultiarchIncludeDirs; +- if (getTriple().getArch() == llvm::Triple::x86_64) { +- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::x86) { +- MultiarchIncludeDirs = X86MultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::aarch64) { +- MultiarchIncludeDirs = AArch64MultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::arm) { +- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) +- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs; +- else +- MultiarchIncludeDirs = ARMMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::mips) { +- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::mipsel) { +- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::ppc) { +- MultiarchIncludeDirs = PPCMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::ppc64) { +- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs; +- } + for (ArrayRef::iterator I = MultiarchIncludeDirs.begin(), + E = MultiarchIncludeDirs.end(); + I != E; ++I) { +@@ -2510,13 +2474,6 @@ + + if (getTriple().getOS() == llvm::Triple::RTEMS) + return; +- +- // Add an include of '/include' directly. This isn't provided by default by +- // system GCCs, but is often used with cross-compiling GCCs, and harmless to +- // add even when Clang is acting as-if it were a system compiler. +- addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include"); +- +- addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include"); + } + + /// \brief Helper to add the three variant paths for a libstdc++ installation. +diff -Naur cfe-3.3.src-orig/lib/Driver/Tools.cpp cfe-3.3.src/lib/Driver/Tools.cpp +--- cfe-3.3.src-orig/lib/Driver/Tools.cpp 2013-05-30 14:01:30.000000000 -0400 ++++ cfe-3.3.src/lib/Driver/Tools.cpp 2013-06-21 19:30:51.604726574 -0400 +@@ -5976,43 +5976,6 @@ + } + } + +- if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::thumb || +- (!Args.hasArg(options::OPT_static) && +- !Args.hasArg(options::OPT_shared))) { +- CmdArgs.push_back("-dynamic-linker"); +- if (isAndroid) +- CmdArgs.push_back("/system/bin/linker"); +- else if (ToolChain.getArch() == llvm::Triple::x86) +- CmdArgs.push_back("/lib/ld-linux.so.2"); +- else if (ToolChain.getArch() == llvm::Triple::aarch64) +- CmdArgs.push_back("/lib/ld-linux-aarch64.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::thumb) { +- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) +- CmdArgs.push_back("/lib/ld-linux-armhf.so.3"); +- else +- CmdArgs.push_back("/lib/ld-linux.so.3"); +- } +- else if (ToolChain.getArch() == llvm::Triple::mips || +- ToolChain.getArch() == llvm::Triple::mipsel) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::mips64 || +- ToolChain.getArch() == llvm::Triple::mips64el) { +- if (hasMipsN32ABIArg(Args)) +- CmdArgs.push_back("/lib32/ld.so.1"); +- else +- CmdArgs.push_back("/lib64/ld.so.1"); +- } +- else if (ToolChain.getArch() == llvm::Triple::ppc) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::ppc64 || +- ToolChain.getArch() == llvm::Triple::systemz) +- CmdArgs.push_back("/lib64/ld64.so.1"); +- else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); +- } +- + CmdArgs.push_back("-o"); + CmdArgs.push_back(Output.getFilename()); + +diff -Naur cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp +--- cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp 2013-04-29 21:21:43.000000000 -0400 ++++ cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp 2013-06-21 19:32:47.627016565 -0400 +@@ -225,20 +225,6 @@ + const HeaderSearchOptions &HSOpts) { + llvm::Triple::OSType os = triple.getOS(); + +- if (HSOpts.UseStandardSystemIncludes) { +- switch (os) { +- case llvm::Triple::FreeBSD: +- case llvm::Triple::NetBSD: +- case llvm::Triple::OpenBSD: +- case llvm::Triple::Bitrig: +- break; +- default: +- // FIXME: temporary hack: hard-coded paths. +- AddPath("/usr/local/include", System, false); +- break; +- } +- } +- + // Builtin includes use #include_next directives and should be positioned + // just prior C include dirs. + if (HSOpts.UseBuiltinIncludes) { +@@ -332,9 +318,6 @@ + default: + break; + } +- +- if ( os != llvm::Triple::RTEMS ) +- AddPath("/usr/include", ExternCSystem, false); + } + + void InitHeaderSearch:: diff --git a/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch new file mode 100644 index 00000000000..de6a468b239 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch @@ -0,0 +1,9 @@ +--- a/utils/TableGen/CMakeLists.txt (revision 190146) ++++ b/utils/TableGen/CMakeLists.txt (working copy) +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS Support) ++set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) + + add_tablegen(clang-tblgen CLANG + ClangASTNodesEmitter.cpp + diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix new file mode 100644 index 00000000000..262e0bff248 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.3/clang.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2, python }: + +let + version = "3.3"; + gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; +in + +stdenv.mkDerivation { + name = "clang-${version}"; + + buildInputs = [ perl llvm groff cmake libxml2 python ]; + + patches = [ ./clang-tablegen-dir.patch ] ++ + stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; + + cmakeFlags = [ + "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_TARGETS_TO_BUILD=all" + "-DGCC_INSTALL_PREFIX=${gccReal}" + ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ + "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" + ]; + + enableParallelBuilding = true; + + src = fetchurl { + url = "http://llvm.org/releases/${version}/cfe-${version}.src.tar.gz"; + sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; + }; + + passthru = { gcc = stdenv.gcc.gcc; }; + + meta = { + homepage = http://clang.llvm.org/; + description = "A C language family frontend for LLVM"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/development/compilers/llvm/3.4/clang-purity.patch b/pkgs/development/compilers/llvm/3.4/clang-purity.patch new file mode 100644 index 00000000000..c7021a58f9b --- /dev/null +++ b/pkgs/development/compilers/llvm/3.4/clang-purity.patch @@ -0,0 +1,19 @@ +diff -Naur clang-3.4-orig/lib/Driver/Tools.cpp clang-3.4/lib/Driver/Tools.cpp +--- clang-3.4-orig/lib/Driver/Tools.cpp 2013-12-08 21:59:27.000000000 -0500 ++++ clang-3.4/lib/Driver/Tools.cpp 2014-01-27 12:48:29.421872597 -0500 +@@ -6477,15 +6477,6 @@ + } + } + +- if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::thumb || +- (!Args.hasArg(options::OPT_static) && +- !Args.hasArg(options::OPT_shared))) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString( +- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); +- } +- + CmdArgs.push_back("-o"); + CmdArgs.push_back(Output.getFilename()); + diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 6f174a411cb..eafbc28661f 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { (cd llvm-${version} && patch -Np1 -i ${./llvm-separate-build.patch}) ''; - patches = [ ./clang-separate-build.patch ]; + patches = [ ./clang-separate-build.patch ./clang-purity.patch ]; buildInputs = [ cmake libedit libxml2 ]; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 812148c7adc..de0a02c56e2 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -35,7 +35,7 @@ let ver_maj = "2.38"; ver_min = "2"; in -with { inherit (stdenv.lib) optionalString; }; +with { inherit (stdenv.lib) optional optionalString; }; stdenv.mkDerivation rec { name = "glib-${ver_maj}.${ver_min}"; @@ -55,9 +55,11 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -fi"; - configureFlags = stdenv.lib.optional stdenv.isSunOS "--disable-modular-tests"; + configureFlags = + optional stdenv.isDarwin "--disable-compile-warnings" + ++ optional stdenv.isSunOS "--disable-modular-tests"; - CPPFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-DBSD_COMP"; + CPPFLAGS = optionalString stdenv.isSunOS "-DBSD_COMP"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix new file mode 100644 index 00000000000..8e1212f5e5a --- /dev/null +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -0,0 +1,15 @@ +{ cabal, fay }: + +cabal.mkDerivation (self: { + pname = "fay-base"; + version = "0.18.0.0"; + sha256 = "010zjcs4y0zdb4gijrw10sjc56i271s35bkwg5c0lblyr62nml0s"; + buildDepends = [ fay ]; + meta = { + homepage = "https://github.com/faylang/fay-base"; + description = "The base package for Fay"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix new file mode 100644 index 00000000000..d7c8ba5a447 --- /dev/null +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -0,0 +1,30 @@ +{ cabal, aeson, attoparsec, Cabal, cpphs, dataDefault, filepath +, ghcPaths, haskellNames, haskellPackages, haskellSrcExts, HUnit +, languageEcmascript, mtl, optparseApplicative, prettyShow, safe +, sourcemap, split, syb, testFramework, testFrameworkHunit +, testFrameworkTh, text, time, uniplate, unorderedContainers +, utf8String, vector +}: + +cabal.mkDerivation (self: { + pname = "fay"; + version = "0.18.1.3"; + sha256 = "1m747l2555w1jkdwh8b851mxvngiy7l7sbkwvm2il6k5ygcz5gbv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec Cabal cpphs dataDefault filepath ghcPaths + haskellNames haskellPackages haskellSrcExts HUnit + languageEcmascript mtl optparseApplicative prettyShow safe + sourcemap split syb testFramework testFrameworkHunit + testFrameworkTh text time uniplate unorderedContainers utf8String + vector + ]; + meta = { + homepage = "http://fay-lang.org/"; + description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 8b2bec395fc..4d773603c04 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -16,8 +16,8 @@ cabal.mkDerivation (self: { utf8String xhtml zlib ]; testDepends = [ HUnit parsec zlib ]; - doCheck = false; jailbreak = true; + doCheck = false; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index a2db6032675..863a0441b02 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; - prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal"; jailbreak = true; + prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal"; meta = { homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix new file mode 100644 index 00000000000..7244e15c293 --- /dev/null +++ b/pkgs/development/libraries/haskell/iCalendar/default.nix @@ -0,0 +1,20 @@ +{ cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl +, network, parsec, text, time +}: + +cabal.mkDerivation (self: { + pname = "iCalendar"; + version = "0.3.0.1"; + sha256 = "0d51rb46vcpb05vsqqmk3w7rymybl3vz8cqs0pw088a52kiy4xc3"; + buildDepends = [ + base64Bytestring caseInsensitive dataDefault mime mtl network + parsec text time + ]; + meta = { + homepage = "http://github.com/tingtun/iCalendar"; + description = "iCalendar data types, parser, and printer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix new file mode 100644 index 00000000000..37c231d08ff --- /dev/null +++ b/pkgs/development/libraries/haskell/mime/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "mime"; + version = "0.3.4"; + sha256 = "1klvy32idy6v029p5a6g93r79ac5cycnrx5c8z9bgvplbplpfjwy"; + meta = { + homepage = "https://github.com/GaloisInc/mime"; + description = "Working with MIME types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix new file mode 100644 index 00000000000..602654b0a01 --- /dev/null +++ b/pkgs/development/libraries/haskell/sourcemap/default.nix @@ -0,0 +1,17 @@ +{ cabal, aeson, attoparsec, text, unorderedContainers, utf8String +}: + +cabal.mkDerivation (self: { + pname = "sourcemap"; + version = "0.1.2.0"; + sha256 = "040j2k1cwzlq5pybs6cg7wmf0x5i22zdidv2xvzdvgi5v7gf6kp1"; + buildDepends = [ + aeson attoparsec text unorderedContainers utf8String + ]; + meta = { + description = "Implementation of source maps as proposed by Google and Mozilla"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix index 98772476fc0..67c3ae28d58 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.1.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix @@ -16,7 +16,8 @@ cabal.mkDerivation (self: { testDepends = [ doctest filepath ]; postPatch = '' substituteInPlace trifecta.cabal \ - --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \ + --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ + --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ --replace "comonad == 3.*," "comonad >= 3 && < 5," \ diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix index 8181c445a5a..447e0d36c9c 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.2.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix @@ -16,7 +16,8 @@ cabal.mkDerivation (self: { testDepends = [ doctest filepath ]; postPatch = '' substituteInPlace trifecta.cabal \ - --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \ + --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ + --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ --replace "comonad == 3.*," "comonad >= 3 && < 5," \ diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix index 6200196d403..6c82ad839e1 100644 --- a/pkgs/development/libraries/ibus/default.nix +++ b/pkgs/development/libraries/ibus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python, glib, intltool, pkgconfig +{ stdenv, fetchurl, makeWrapper, python, intltool, pkgconfig , gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }: stdenv.mkDerivation rec { @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2"; }; - configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library"; + configureFlags = "--enable-dconf --disable-memconf --enable-ui --enable-python-library"; buildInputs = [ - makeWrapper python glib wayland + makeWrapper python gnome3.glib wayland intltool pkgconfig gnome3.gtk2 gnome3.gtk3 dbus gnome3.dconf gnome3.gconf libnotify isocodes gobjectIntrospection @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { preBuild = "patchShebangs ./scripts"; postInstall = '' - #${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ - for f in "$out"/bin/*; do wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share" done diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index a23de5d98c6..911cc6dd40d 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's|/usr/bin/||' build.xml + substituteInPlace src/main/org/newsclub/net/unix/NativeUnixSocketConfig.java \ + --replace /opt/newsclub/lib-native $out/lib ''; buildPhase = "ant"; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 3dca6a04af7..5e0a8560110 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, cmake, curl }: let - name = "libjson-rpc-cpp"; + basename = "libjson-rpc-cpp"; version = "0.2.1"; in stdenv.mkDerivation { - name = "${name}-${version}"; + name = "${basename}-${version}"; src = fetchurl { - url = "https://github.com/cinemast/${name}/archive/${version}.tar.gz"; + url = "https://github.com/cinemast/${basename}/archive/${version}.tar.gz"; sha256 = "1pc9nn4968qkda8vr4f9dijn2fcldm8i0ymwmql29h4cl5ghdnpw"; }; @@ -23,6 +23,8 @@ stdenv.mkDerivation { meta = { description = "C++ framework for json-rpc (json remote procedure call)"; + homepage = https://github.com/cinemast/libjson-rpc-cpp; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index d02217afd3e..a49cd95822f 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -3,7 +3,10 @@ stdenv.mkDerivation { name = "libmspack-0.4alpha"; src = fetchurl { - url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz; + # upstream url: "curl: (22) The requested URL returned error: 406 Not Acceptable" + #url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz; + url = "http://pkgs.fedoraproject.org/lookaside/pkgs/libmspack/" + + "libmspack-0.4alpha.tar.gz/1ab10b507259993c74b4c41a88103b59/libmspack-0.4alpha.tar.gz"; sha256 = "0s2w5zxx9cw7445cx9ap59ky5n7r201551zg906w9ghcys1qk5dp"; }; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 821e66ea0b3..d5d1614ec8f 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -53,13 +53,10 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-polkitd-user=polkituser" #TODO? config.ids.uids.polkituser "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS + "--enable-introspection" ]; - makeFlags = - '' - INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 - INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0 - ''; + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; #doCheck = true; # some /bin/bash problem that isn't auto-solved by patchShebangs diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix new file mode 100644 index 00000000000..84a7a9b4ccf --- /dev/null +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake, openssl, popt, xmlto }: + +stdenv.mkDerivation rec { + version = "0.4.1"; + name = "rabbitmq-c-${version}"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz"; + sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93"; + }; + + buildInputs = [ cmake openssl popt xmlto ]; + + meta = { + description = "RabbitMQ C AMQP client library"; + homepage = https://github.com/alanxz/rabbitmq-c; + license = with stdenv.lib.licenses; mit; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix index 719face2135..9fdcb3743b7 100644 --- a/pkgs/development/libraries/readline/readline-6.2-patches.nix +++ b/pkgs/development/libraries/readline/readline-6.2-patches.nix @@ -5,4 +5,5 @@ patch: [ (patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy") (patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb") (patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89") +(patch "005" "1x61bjl3wgs1gwla9b3y1hh12m1j5qlbis22258mljjl9mg900pg") ] diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 7eea3bedcef..ef07d04212b 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ]; stdenv.mkDerivation rec { - name = "phantomjs-1.9.2"; + name = "phantomjs-1.9.7"; # I chose to use the binary build for now. # The source version is quite nasty to compile @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://phantomjs.googlecode.com/files/${name}-linux-i686.tar.bz2"; - sha256 = "1nywb9xhcfjark6zfjlnrljc08r5185vv25vfcc65jzla8hy75qp"; + url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2"; + sha256 = "1ffd5544wnkww5cgwsims4bk4bymvm6pm19p32nbhwabxqhbnj9a"; } else # x86_64-linux fetchurl { - url = "http://phantomjs.googlecode.com/files/${name}-linux-x86_64.tar.bz2"; - sha256 = "1xsjx4j6rwkq27y4iqdn0ai4yrq70a3g9309blywki0g976phccg"; + url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2"; + sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7"; }; buildPhase = '' diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 4cb600b5238..6e22d6ed524 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.25"; + version = "3.10.28"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1kf75br35i35p231i3z3blf90zv1xns26bcd0gwhlkxgvs46vi56"; + sha256 = "1blzvr3qywi8wxgl28zsn5djwgvw70yh3i6qjh2sz3zk9gnpd6mq"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index fbf0df2ee2f..6edb3669c53 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.7"; + version = "3.12.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1pmz1g919kbhf8mq23d25187gwzr8l85xj7bf9dvn3vpai7spafb"; + sha256 = "1jzmcqshfgnkk4dibkxc7w06axw7c2fxdpghvm6d7amfpcd9ygka"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 37d652a44e3..d1909c17967 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.76"; + version = "3.4.77"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0rwa5n4z359351dnpfknmwi3f5is8haflpx9zq6rgb9dprv8af3j"; + sha256 = "05hfa5cxcxvqg183amfpvjzh6i9lphx1956j92sh6r90pnhg0xgz"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix index 0e0f5a3ff0c..48be4fbc343 100644 --- a/pkgs/os-specific/linux/rfkill/default.nix +++ b/pkgs/os-specific/linux/rfkill/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rfkill-0.4"; - + name = "rfkill-0.5"; + src = fetchurl { - url = "http://wireless.kernel.org/download/rfkill/${name}.tar.bz2"; - sha256 = "1hb884vgyldci648azbx17w83gzynn0svrmfjgh3c2jzga1f846a"; + url = "mirror://kernel/software/network/rfkill/${name}.tar.bz2"; + sha256 = "01zs7p9kd92pxgcgwl5w46h3iyx4acfg6m1j5fgnflsaa350q5iy"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh index d07c7298183..bf6e679660c 100755 --- a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh +++ b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh @@ -10,10 +10,10 @@ if [ -z "$RFKILL_STATE" ]; then exit 1 fi -if [ -x /var/run/current-system/etc/rfkill.hook ]; then - exec /var/run/current-system/etc/rfkill.hook +if [ -x /run/current-system/etc/rfkill.hook ]; then + exec /run/current-system/etc/rfkill.hook elif [ ! -z "$RFKILL_HOOK" ]; then exec $RFKILL_HOOK else echo "rfkill-hook: $RFKILL_STATE" -fi \ No newline at end of file +fi diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index cba4a510ff0..e9fa2b4adb1 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils -, useSystemd ? true, systemd +, useSystemd ? true, systemd, gobjectIntrospection }: assert stdenv.isLinux; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ] + [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 59788be15d1..4bb05a23faf 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.0.3"; + version = "3.2.1"; src = fetchurl { url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz"; - sha256 = "07mp57xvszdrlgw8rgn9r9dpa6vdqdjk7f1dyh6a9sdg8s9fby38"; + sha256 = "0j9yx64sdgkv0h20zjs65aa2ag6wwv50i6hd3x69m0cc6shzcc0f"; }; buildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man"; + installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/share/doc"; preInstall = '' diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix new file mode 100644 index 00000000000..1c1be59f515 --- /dev/null +++ b/pkgs/tools/filesystems/zfstools/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, ruby, zfs }: + +stdenv.mkDerivation rec { + name = "zfstools-${version}"; + + version = "0.3.1"; + + src = fetchgit { + url = https://github.com/bdrewery/zfstools.git; + rev = "refs/tags/v${version}"; + sha256 = "0bhs0gn1f4z1jm631vp26sbysy4crq489q56rxqfd8ns1xsp1f5j"; + }; + + buildInputs = [ ruby ]; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin/ + + cp -R lib $out/ + + for f in $out/bin/*; do + substituteInPlace $f --replace "/usr/bin/env ruby" "ruby -I$out/lib" + done + + sed -e 's|cmd.*=.*"zfs |cmd = "${zfs}/sbin/zfs |g' -i $out/lib/zfstools/{dataset,snapshot}.rb + ''; + + meta = { + homepage = https://github.com/bdrewery/zfstools; + description = "OpenSolaris-like and compatible auto snapshotting script for ZFS"; + longDescription = '' + zfstools is an OpenSolaris-like and compatible auto snapshotting script + for ZFS, which also supports auto snapshotting mysql databases. + ''; + + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1e8f9fd292d..40a2f7f481d 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.01.23.1"; + version = "2014.01.23.4"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "07nzwjw3m63w53fk2chmv4dpq71h4k0kx02x6hzsb28bc89v06nr"; + sha256 = "0wnw11s3k191wqf3h13ibdbkgdyabv3gigsjk5xq3sqswlmmcvd9"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 0c2d02a5e77..4d2dff22d11 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf -, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring +{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 +, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, networkmanager_openvpn, networkmanager_vpnc , networkmanager_openconnect, udev, hicolor_icon_theme }: @@ -19,15 +19,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk libglade networkmanager libnotify libsecret dbus_glib - polkit isocodes makeWrapper udev GConf libgnome_keyring + gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib + polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; - propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ]; - - configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ]; makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' @@ -50,7 +48,7 @@ stdenv.mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ - --prefix PATH ":" "${GConf}/bin" + --prefix PATH ":" "${gnome3.gconf}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 901f53c5e5c..b231f2875c0 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsigsegv }: +{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }: stdenv.mkDerivation rec { name = "gawk-4.1.0"; @@ -12,9 +12,13 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 - buildInputs = [ libsigsegv ]; + buildInputs = [ libsigsegv ] + ++ stdenv.lib.optional readlineSupport readline; - configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ]; + configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ] + ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}" + # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv) + ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline"; meta = { homepage = http://www.gnu.org/software/gawk/; diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 70b9bf69e29..3981f67aefb 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -1,17 +1,14 @@ -{ stdenv, fetchurl, which, screen }: +{ stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "wdiff-1.1.2"; + name = "wdiff-1.2.1"; src = fetchurl { url = "mirror://gnu/wdiff/${name}.tar.gz"; - sha256 = "0q78y5awvjjmsvizqilbpwany62shlmlq2ayxkjbygmdafpk1k8j"; + sha256 = "1gb5hpiyikada9bwz63q3g96zs383iskiir0xsqynqnvq1vd4n41"; }; - # Required for the compile-time for the test suite. - buildInputs = [ which screen ]; - - doCheck = true; + buildInputs = [ texinfo ]; meta = { homepage = http://www.gnu.org/software/wdiff/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0de827f9e84..1ad204a6577 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -974,7 +974,9 @@ let g500-control = callPackage ../tools/misc/g500-control { }; - gawk = callPackage ../tools/text/gawk { }; + gawk = lowPrio (callPackage ../tools/text/gawk { }); + gawkInteractive = appendToName "interactive" + (gawk.override { readlineSupport = true; }); gdmap = callPackage ../tools/system/gdmap { }; @@ -2238,6 +2240,10 @@ let zdelta = callPackage ../tools/compression/zdelta { }; + zfstools = callPackage ../tools/filesystems/zfstools { + zfs = linuxPackages.zfs; + }; + zile = callPackage ../applications/editors/zile { }; zip = callPackage ../tools/archivers/zip { }; @@ -2302,6 +2308,18 @@ let clang = wrapClang llvmPackages.clang; + clang_34 = wrapClang llvmPackages.clang; + clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); + clang_32 = wrapClang (clangUnwrapped llvm_32 ../development/compilers/llvm/3.2/clang.nix); + clang_31 = wrapClang (clangUnwrapped llvm_31 ../development/compilers/llvm/3.1/clang.nix); + + clangUnwrapped = llvm: pkg: callPackage pkg { + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenvAdapters.overrideGCC stdenv gcc48; + llvm = llvm; + }; + clangSelf = clangWrapSelf llvmPackagesSelf.clang; clangWrapSelf = build: (import ../build-support/clang-wrapper) { @@ -2762,11 +2780,18 @@ let lessc = callPackage ../development/compilers/lessc { }; llvm = llvmPackages.llvm; - llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { + + llvm_34 = llvmPackages.llvm; + llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; + llvm_32 = llvm_v ../development/compilers/llvm/3.2; + llvm_31 = llvm_v ../development/compilers/llvm/3.1; + + llvm_v = path: callPackage path { stdenv = if stdenv.isDarwin then stdenvAdapters.overrideGCC stdenv gccApple else stdenv; }; + llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit newScope stdenv fetchurl; isl = isl_0_12; }); llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; }; @@ -5407,6 +5432,8 @@ let qwt = callPackage ../development/libraries/qwt {}; + rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + readline = readline6; readline4 = callPackage ../development/libraries/readline/readline4.nix { }; @@ -7521,6 +7548,8 @@ let inherit (xlibs) libX11; }; + docker = callPackage ../applications/virtualization/docker { }; + doodle = callPackage ../applications/search/doodle { }; dunst = callPackage ../applications/misc/dunst { }; @@ -7713,6 +7742,7 @@ let evopedia = callPackage ../applications/misc/evopedia { }; keepassx = callPackage ../applications/misc/keepassx { }; + keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; @@ -8716,6 +8746,8 @@ let stumpwm = lispPackages.stumpwm; sublime = callPackage ../applications/editors/sublime { }; + + sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { }); subversion = callPackage ../applications/version-management/subversion/default.nix { bdbSupport = true; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6115c4de684..6e738048a92 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1036,6 +1036,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x executablePath = callPackage ../development/libraries/haskell/executable-path {}; + fay = callPackage ../development/libraries/haskell/fay {}; + fayBase = callPackage ../development/libraries/haskell/fay-base {}; + filepath_1_3_0_0 = callPackage ../development/libraries/haskell/filepath {}; filepath = null; # a core package in recent GHCs @@ -1434,6 +1437,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {}; + iCalendar = callPackage ../development/libraries/haskell/iCalendar {}; + idna = callPackage ../development/libraries/haskell/idna {}; IfElse = callPackage ../development/libraries/haskell/IfElse {}; @@ -1550,7 +1555,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { - llvmConfig = pkgs.llvm; + # !!! llvm-general pre-release supports 3.4... + llvmConfig = pkgs.llvm_33; }; llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; @@ -1585,6 +1591,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x midi = callPackage ../development/libraries/haskell/midi {}; + mime = callPackage ../development/libraries/haskell/mime {}; + minimorph = callPackage ../development/libraries/haskell/minimorph {}; miniutter = callPackage ../development/libraries/haskell/miniutter { @@ -2174,6 +2182,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x socketActivation = callPackage ../development/libraries/haskell/socket-activation {}; + sourcemap = callPackage ../development/libraries/haskell/sourcemap {}; + split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {}; split = self.split_0_2_2;