[rs-commit] r190 - in /rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules: mod_ca/default.nix mod_crl/default.nix mod_csr/default.nix mod_ocsp/default.nix mod_pkcs12/default.nix mod_scep/default.nix mod_spkac/default.nix mod_timestamp/default.nix
rs-commit at redwax.eu
rs-commit at redwax.eu
Fri Dec 13 23:43:23 CET 2019
Author: dirkx at redwax.eu
Date: Fri Dec 13 23:43:23 2019
New Revision: 190
Log:
Simplyfy the submodules; and bring in line with what was pushed through the CI as pull request https://github.com/NixOS/nixpkgs/pull/75620.
Modified:
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix Fri Dec 13 23:43:23 2019
@@ -1,29 +1,22 @@
{ stdenv, fetchurl, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap }:
stdenv.mkDerivation rec {
+ baseurl = "https://redwax.eu/dist/rs/";
name = "mod_ca";
+ suffix = ".tar.gz";
meta = with stdenv.lib; {
- baseurl = "https://redwax.eu/dist/rs/";
- suffix = ".tar.gz";
-
description = "RedWax CA service modules.";
- homepage = "https://redwax.eu";
-
- license = licenses.asl20;
-
- maintainers = with maintainers; [ dirkx ];
-
version = "0.2.1";
- # This propably should be a wildcard - as we build on all
- # current NixOS platforms.
- # platforms = [ platforms.linux platforms.darwin ];
-
+ homepage = "https://redwax.eu";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dirkx ];
};
src = fetchurl {
- url = "${meta.baseurl}${name}-${meta.version}${meta.suffix}";
+ url = "${baseurl}${name}-${meta.version}${suffix}";
sha256 = "1pxapjrzdsk2s25vhgvf56fkakdqcbn9hjncwmqh0asl1pa25iic";
};
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix Fri Dec 13 23:43:23 2019
@@ -4,24 +4,16 @@
name = "mod_crl";
meta = with stdenv.lib; {
- description = "RedWax CA service module to handle Certificate Revocation Lists.";
- baseurl = "https://redwax.eu/dist/rs/";
- suffix = ".tar.gz";
- homepage = "https://redwax.eu";
- license = licenses.asl20;
- maintainers = with maintainers; [ dirkx ];
+ description = "RedWax module for Certificate Revocation Lists";
version = "0.2.1";
+
+ inherit (mod_ca.meta) license platforms maintainers homepage;
};
src = fetchurl {
- url = "${meta.baseurl}${name}-${meta.version}${meta.suffix}";
+ url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
sha256 = "0k6iqn5a4bqdz3yx6d53f1r75c21jnwhxmmcq071zq0361xjzzj6";
};
buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
-
- configurePlatforms = [];
- configureFlags = [
- "--with-apxs=${apacheHttpd.dev}/bin/apxs"
- ];
- installPhase = "make INCLUDEDIR=$out/include LIBEXECDIR=$out/libexec install";
+ inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
}
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix Fri Dec 13 23:43:23 2019
@@ -5,28 +5,19 @@
meta = with stdenv.lib; {
description = "RedWax CA service module to handle Certificate Signing Requests.";
- baseurl = "https://redwax.eu/dist/rs/";
- suffix = ".tar.gz";
- homepage = "https://redwax.eu";
- license = licenses.asl20;
- maintainers = with maintainers; [ dirkx ];
version = "0.2.1";
+
+ inherit (mod_ca.meta) license platforms maintainers homepage;
};
-
+
src = fetchurl {
- url = "${meta.baseurl}${name}-${meta.version}${meta.suffix}";
+ url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
sha256 = "01sdvv07kchdd6ssrmd2cbhj50qh2ibp5g5h6jy1jqbzp0b3j9ja";
};
buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
-
preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
- configurePlatforms = [];
- configureFlags = [
- "--with-apxs=${apacheHttpd.dev}/bin/apxs"
- ];
-
- installPhase = "make INCLUDEDIR=$out/include LIBEXECDIR=$out/libexec install";
+ inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
}
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix Fri Dec 13 23:43:23 2019
@@ -5,35 +5,17 @@
meta = with stdenv.lib; {
description = "RedWax CA service modules of OCSP Online Certificate Validation";
- suffix = ".tar.gz";
-
- baseurl = "https://redwax.eu/dist/rs/";
- homepage = "https://redwax.eu";
-
- license = licenses.asl20;
-
- maintainers = with maintainers; [ dirkx ];
-
version = "0.2.1";
- # This propably should be a wildcard - as we build on all
- # current NixOS platforms.
- # platforms = [ platforms.linux platforms.darwin ];
-
+ inherit (mod_ca.meta) license platforms maintainers homepage;
};
src = fetchurl {
- url = "${meta.baseurl}${name}-${meta.version}${meta.suffix}";
-
+ url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
sha256 = "1vwgai56krdf8knb0mgy07ni9mqxk82bcb4gibwpnxvl6qwgv2i0";
};
buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
-
- configurePlatforms = [];
- configureFlags = [
- "--with-apxs=${apacheHttpd.dev}/bin/apxs"
- ];
- installPhase = "make INCLUDEDIR=$out/include LIBEXECDIR=$out/libexec install";
+ inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
}
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix Fri Dec 13 23:43:23 2019
@@ -5,34 +5,18 @@
meta = with stdenv.lib; {
description = "RedWax CA service modules for PKCS#12 format files";
- suffix = ".tar.gz";
-
- baseurl = "https://redwax.eu/dist/rs/";
- homepage = "https://redwax.eu";
-
- license = licenses.asl20;
-
- maintainers = with maintainers; [ dirkx ];
-
version = "0.2.1";
- # This propably should be a wildcard - as we build on all
- # current NixOS platforms.
- # platforms = [ platforms.linux platforms.darwin ];
+ inherit (mod_ca.meta) license platforms maintainers homepage;
};
src = fetchurl {
- url = "${meta.baseurl}${name}-${meta.version}${meta.suffix}";
+ url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
sha256 = "0by4qfjs3a8q0amzwazfq8ii6ydv36v2mjga0jzc9i6xyl4rs6ai";
};
buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
-
- configurePlatforms = [];
- configureFlags = [
- "--with-apxs=${apacheHttpd.dev}/bin/apxs"
- ];
- installPhase = "make INCLUDEDIR=$out/include LIBEXECDIR=$out/libexec install";
+ inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
}
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix Fri Dec 13 23:43:23 2019
@@ -5,35 +5,20 @@
meta = with stdenv.lib; {
description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)";
- suffix = ".tar.gz";
-
- baseurl = "https://redwax.eu/dist/rs/";
- homepage = "https://redwax.eu";
-
- license = licenses.asl20;
-
- maintainers = with maintainers; [ dirkx ];
-
version = "0.2.1";
- # This propably should be a wildcard - as we build on all
- # current NixOS platforms.
- # platforms = [ platforms.linux platforms.darwin ];
-
+ inherit (mod_ca.meta) license platforms maintainers homepage;
};
src = fetchurl {
- url = "${meta.baseurl}${name}-${meta.version}${meta.suffix}";
-
+ url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
sha256 = "14l8v6y6kx5dg8avb5ny95qdcgrw40ss80nqrgmw615mk7zcj81f";
};
+
+ buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
+ inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
+
preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
- buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
- configurePlatforms = [];
- configureFlags = [
- "--with-apxs=${apacheHttpd.dev}/bin/apxs"
- ];
- installPhase = "make INCLUDEDIR=$out/include LIBEXECDIR=$out/libexec install";
}
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix Fri Dec 13 23:43:23 2019
@@ -5,35 +5,17 @@
meta = with stdenv.lib; {
description = "RedWax CA service module for handling the Netscape keygen requests. ";
- suffix = ".tar.gz";
-
- baseurl = "https://redwax.eu/dist/rs/";
- homepage = "https://redwax.eu";
-
- license = licenses.asl20;
-
- maintainers = with maintainers; [ dirkx ];
-
version = "0.2.1";
- # This propably should be a wildcard - as we build on all
- # current NixOS platforms.
- # platforms = [ platforms.linux platforms.darwin ];
-
+ inherit (mod_ca.meta) license platforms maintainers homepage;
};
src = fetchurl {
- url = "${meta.baseurl}${name}-${meta.version}${meta.suffix}";
-
+ url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
sha256 = "0x6ia9qcr7lx2awpv9cr4ndic5f4g8yqzmp2hz66zpzkmk2b2pyz";
};
buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
-
- configurePlatforms = [];
- configureFlags = [
- "--with-apxs=${apacheHttpd.dev}/bin/apxs"
- ];
- installPhase = "make INCLUDEDIR=$out/include LIBEXECDIR=$out/libexec install";
+ inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
}
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix Fri Dec 13 23:43:23 2019
@@ -5,34 +5,17 @@
meta = with stdenv.lib; {
description = "RedWax CA service module for issuing signed timestamps.";
- suffix = ".tar.gz";
-
- baseurl = "https://redwax.eu/dist/rs/";
- homepage = "https://redwax.eu";
-
- license = licenses.asl20;
-
- maintainers = with maintainers; [ dirkx ];
-
version = "0.2.1";
- # This propably should be a wildcard - as we build on all
- # current NixOS platforms.
- # platforms = [ platforms.linux platforms.darwin ];
+ inherit (mod_ca.meta) license platforms maintainers homepage;
};
src = fetchurl {
- url = "${meta.baseurl}${name}-${meta.version}${meta.suffix}";
-
+ url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
sha256 = "0j4b04dbdwn9aff3da9m0lnqi0qbw6c6hhi81skl15kyc3vzp67f";
};
buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
-
- configurePlatforms = [];
- configureFlags = [
- "--with-apxs=${apacheHttpd.dev}/bin/apxs"
- ];
-installPhase = "make INCLUDEDIR=$out/include LIBEXECDIR=$out/libexec install";
+ inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
}
More information about the rs-commit
mailing list