diff options
Diffstat (limited to 'pkgs')
8 files changed, 41 insertions, 15 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 6ba60aa0f68..67346ef8389 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -1,13 +1,11 @@ { bdbSupport ? false # build support for Berkeley DB repositories , httpServer ? false # build Apache DAV module , httpSupport ? false # client must support http -, sslSupport ? false # client must support https -, compressionSupport ? false # client must support http compression , pythonBindings ? false , perlBindings ? false , javahlBindings ? false , saslSupport ? false -, stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite +, stdenv, fetchurl, apr, aprutil, zlib, sqlite , httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null }: @@ -16,8 +14,6 @@ assert bdbSupport -> aprutil.bdbSupport; assert httpServer -> httpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; -assert sslSupport -> neon.sslSupport; -assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { @@ -31,7 +27,6 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib apr aprutil sqlite ] - ++ stdenv.lib.optional httpSupport neon ++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional perlBindings perl diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 89c2c31ef7a..e2d72fc7d6b 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apr, expat +{ stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl , bdbSupport ? false, db4 , ldapSupport ? true, openldap @@ -8,6 +8,10 @@ assert sslSupport -> openssl != null; assert bdbSupport -> db4 != null; assert ldapSupport -> openldap != null; +let + optional = stdenv.lib.optional; +in + stdenv.mkDerivation rec { name = "apr-util-1.5.3"; @@ -24,7 +28,15 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString ldapSupport "--with-ldap"} ''; - propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap; + propagatedBuildInputs = [ makeWrapper apr expat ] + ++ optional sslSupport openssl + ++ optional bdbSupport db4 + ++ optional ldapSupport openldap; + + # Give apr1 access to sed for runtime invocations + postInstall = '' + wrapProgram $out/bin/apu-1-config --prefix PATH : "${gnused}/bin" + ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix new file mode 100644 index 00000000000..feb186209b7 --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix @@ -0,0 +1,15 @@ +{ cabal, wai, waiExtra, fcgi }: + +cabal.mkDerivation (self: { + pname = "wai-handler-fastcgi"; + version = "2.0.0"; + sha256 = "1pqiqx1wq2iv705f8bd4sxmjmmkkxiw4g6a9dpwnawwb5n0d88nl"; + buildDepends = [ + wai waiExtra fcgi + ]; + meta = { + description = "A WAI handler that out to the libfcgi C library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 5644eb527c4..419978a1011 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake automoc4 pkgconfig ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + meta = { homepage = http://phonon.kde.org/; description = "GStreamer backend for Phonon"; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 98917f943f5..95f482a8230 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nasm, perl, libuuid }: stdenv.mkDerivation rec { - name = "syslinux-4.06"; + name = "syslinux-4.07"; src = fetchurl { url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2"; - sha256 = "09md61npd5z64rv5s3knl4qsn2bqsn57irm5izk6snf46r77gdyv"; + sha256 = "0nm0lx45h4c5nxnsr538bvryzvqvj1p1p4vqxzd8nlcv47ja8h0j"; }; patches = [ ./perl-deps.patch ]; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 2b9c6d06637..47421185d8a 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -15,6 +15,8 @@ rec { sha256 = "003rj7pv38lgmggya2nbzcyfdx5d4wa7h1h4xh7iivsxja7z4m1d"; }; + passthru = { inherit texmfSrc langTexmfSrc; }; + setupHook = ./setup-hook.sh; doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' @@ -100,8 +102,8 @@ rec { patchShebangsInterimShareTexmfDist = doPatchShebangs ''$out/share/texmf-dist/scripts/''; patchShebangsInterimTexmfDist = doPatchShebangs ''$out/texmf-dist/scripts/''; - patchShebangsInterim = fullDepEntry ("") ["patchShebangsInterimBin" - "patchShebangsInterimLibexec" "patchShebangsInterimTexmfDist" + patchShebangsInterim = fullDepEntry ("") ["patchShebangsInterimBin" + "patchShebangsInterimLibexec" "patchShebangsInterimTexmfDist" "patchShebangsInterimShareTexmfDist"]; buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto @@ -112,7 +114,7 @@ rec { configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" - "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" + "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] ++ ( if stdenv.isDarwin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d479c74d6eb..5695e11e0fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8887,12 +8887,10 @@ let bdbSupport = true; httpServer = false; httpSupport = true; - sslSupport = true; pythonBindings = false; perlBindings = false; javahlBindings = false; saslSupport = false; - compressionSupport = true; httpd = apacheHttpd; sasl = cyrus_sasl; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b787c1b1309..38264d6c4b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2349,6 +2349,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x waiHandlerLaunch = callPackage ../development/libraries/haskell/wai-handler-launch {}; + waiHandlerFastcgi = callPackage ../development/libraries/haskell/wai-handler-fastcgi { inherit (pkgs) fcgi; }; + waiLogger = callPackage ../development/libraries/haskell/wai-logger {}; waiTest = callPackage ../development/libraries/haskell/wai-test {}; |