diff options
| -rw-r--r-- | nixos/release-small.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 80 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-modules/mod_dnssd/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
5 files changed, 17 insertions, 108 deletions
diff --git a/nixos/release-small.nix b/nixos/release-small.nix index f6e7a65fbdea..36c20ce1fddc 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -53,8 +53,7 @@ in rec { nixpkgs = { inherit (nixpkgs') - apacheHttpd_2_2 - apacheHttpd_2_4 + apacheHttpd cmake cryptsetup emacs diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix index f8b40e42d025..587165e107b0 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix @@ -1,6 +1,6 @@ -{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus +{ stdenv, intltool, fetchurl, apacheHttpd, nautilus , pkgconfig, gtk3, glib, libxml2, gnused, systemd -, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd +, bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: stdenv.mkDerivation rec { @@ -11,17 +11,18 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf + sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ + -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ + -i data/dav_user_2.4.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2.dev}/modules" + configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" + "--with-modules-path=${apacheHttpd.dev}/modules" "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--disable-bluetooth" "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg + wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg nautilus libnotify libcanberra_gtk3 systemd ]; postInstall = '' @@ -30,12 +31,6 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas ''; - preFixup = '' - wrapProgram "$out/libexec/gnome-user-share-webdav" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-user-share/3.8; description = "Service that exports the contents of the Public folder in your home directory on the local network"; diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix deleted file mode 100644 index 8cab241f85c0..000000000000 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, perl, zlib -, sslSupport, proxySupport ? true -, apr, aprutil, pcre -, ldapSupport ? true, openldap -, # Multi-processing module to use. This is built into the server and - # cannot be selected at runtime. - mpm ? "prefork" -}: - -assert sslSupport -> openssl != null; -assert ldapSupport -> aprutil.ldapSupport && openldap != null; -assert mpm == "prefork" || mpm == "worker" || mpm == "event"; - -stdenv.mkDerivation rec { - version = "2.2.31"; - name = "apache-httpd-${version}"; - - src = fetchurl { - url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk"; - }; - - # FIXME: -dev depends on -doc - outputs = [ "out" "dev" "doc" ]; - setOutputFlags = false; # it would move $out/modules, etc. - - propagatedBuildInputs = [ apr ]; # otherwise mod_* fail to find includes often - buildInputs = [ pkgconfig perl aprutil pcre zlib ] ++ - stdenv.lib.optional sslSupport openssl; - - # Required for ‘pthread_cancel’. - NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s"); - - patchPhase = '' - sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" - ''; - - preConfigure = '' - configureFlags="$configureFlags --includedir=$dev/include" - ''; - configureFlags = '' - --with-z=${zlib.dev} - --with-pcre=${pcre.dev} - --enable-mods-shared=all - --enable-authn-alias - ${if proxySupport then "--enable-proxy" else ""} - ${if sslSupport then "--enable-ssl --with-ssl=${openssl.dev}" else ""} - ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} - --with-mpm=${mpm} - --enable-cache - --enable-disk-cache - --enable-file-cache - --enable-mem-cache - --docdir=$(doc)/share/doc - ''; - - enableParallelBuilding = true; - - stripDebugList = "lib modules bin"; - - postInstall = '' - mkdir -p $doc/share/doc/httpd - mv $out/manual $doc/share/doc/httpd - mkdir -p $dev/bin - mv $out/bin/apxs $dev/bin/apxs - ''; - - passthru = { - inherit apr aprutil sslSupport proxySupport; - }; - - meta = { - description = "Apache HTTPD, the world's most popular web server"; - branch = "2.2"; - homepage = http://httpd.apache.org/; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - }; -} diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 06f12820a10d..80cbf12d2a6b 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, apacheHttpd_2_2, apr, avahi }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }: stdenv.mkDerivation rec { name = "mod_dnssd-0.6"; @@ -10,7 +10,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - buildInputs = [ pkgconfig apacheHttpd_2_2 avahi apr ]; + buildInputs = [ pkgconfig apacheHttpd avahi apr ]; + + patches = [ (fetchpatch { + url = "http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/mod-dnssd/vivid/download/package-import%40ubuntu.com-20130530193334-kqebiy78q534or5k/portforapache2.4.pat-20130530222510-7tlw5btqchd04edb-3/port-for-apache2.4.patch"; + sha256 = "1hgcxwy1q8fsxfqyg95w8m45zbvxzskf1jxd87ljj57l7x1wwp4r"; + }) ]; installPhase = '' mkdir -p $out/modules @@ -25,4 +30,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lethalman ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d08239d40f4..2520f020e07e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10164,15 +10164,7 @@ with pkgs; rdf4store = callPackage ../servers/http/4store { }; apacheHttpd = pkgs.apacheHttpd_2_4; - - apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { - sslSupport = true; - }; - - apacheHttpd_2_4 = lowPrio (callPackage ../servers/http/apache-httpd/2.4.nix { - # 1.0.2+ for ALPN support - openssl = openssl_1_0_2; - }); + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; @@ -10197,7 +10189,6 @@ with pkgs; }; apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages; - apacheHttpdPackages_2_2 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_2 pkgs.apacheHttpdPackages_2_2; apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { }; |