diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/servers/http/apache-modules | |
parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/http/apache-modules')
3 files changed, 13 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index da1b4e456b76..a0a6235ace50 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, apacheHttpd, apr, avahi }: stdenv.mkDerivation rec { - name = "mod_dnssd-0.6"; + pname = "mod_dnssd"; + version = "0.6"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/mod_dnssd/${name}.tar.gz"; + url = "http://0pointer.de/lennart/projects/mod_dnssd/${pname}-${version}.tar.gz"; sha256 = "2cd171d76eba398f03c1d5bcc468a1756f4801cd8ed5bd065086e4374997c5aa"; }; @@ -28,6 +29,6 @@ stdenv.mkDerivation rec { description = "Provide Zeroconf support via DNS-SD using Avahi"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix index 3d9d4b21c409..1b8ef94fae95 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, apacheHttpd, python2 }: +{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }: stdenv.mkDerivation rec { - name = "mod_python-3.5.0"; + pname = "mod_python"; + version = "3.5.0"; src = fetchurl { - url = "http://dist.modpython.org/dist/${name}.tgz"; + url = "http://dist.modpython.org/dist/${pname}-${version}.tgz"; sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f"; }; @@ -24,7 +25,8 @@ stdenv.mkDerivation rec { passthru = { inherit apacheHttpd; }; - buildInputs = [ apacheHttpd python2 ]; + buildInputs = [ apacheHttpd python2 ] + ++ lib.optional stdenv.isDarwin libintl; meta = { homepage = "http://modpython.org/"; diff --git a/nixpkgs/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index bea94a888597..20879d4aaf21 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, apacheHttpd, jdk }: stdenv.mkDerivation rec { - name = "tomcat-connectors-1.2.48"; + pname = "tomcat-connectors"; + version = "1.2.48"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-connectors/jk/${name}-src.tar.gz"; + url = "mirror://apache/tomcat/tomcat-connectors/jk/${pname}-${version}-src.tar.gz"; sha256 = "15wfj1mvad15j1fqw67qbpbpwrcz3rb0zdhrq6z2sax1l05kc6yb"; }; |