[rs-commit] r178 - in /rs-distribution/trunk/nixos: ./ pkgs/ pkgs/servers/ pkgs/servers/http/ pkgs/servers/http/apache-modules/ pkgs/servers/http/apache-modules/mod_ca/ pkgs/servers/http/apache-modules/mod_crl/ pkgs/servers/http/apache-modules/mod_csr/ pkgs/servers/http/apache-modules/mod_ocsp/ pkgs/servers/http/apache-modules/mod_pkcs12/ pkgs/servers/http/apache-modules/mod_scep/ pkgs/servers/http/apache-modules/mod_spkac/ pkgs/servers/http/apache-modules/mod_timestamp/
rs-commit at redwax.eu
rs-commit at redwax.eu
Mon Dec 9 14:19:44 CET 2019
Author: dirkx at redwax.eu
Date: Mon Dec 9 14:19:42 2019
New Revision: 178
Log:
Stubs for nixos inclusion -- see also https://github.com/dirkx/nixpkgs/commit/f0f7311717dd8c2c65648918200d92490874eb95
Added:
rs-distribution/trunk/nixos/
rs-distribution/trunk/nixos/README.md
rs-distribution/trunk/nixos/patch-all-packages.txt (with props)
rs-distribution/trunk/nixos/patch-maintainers-list.txt (with props)
rs-distribution/trunk/nixos/pkgs/
rs-distribution/trunk/nixos/pkgs/servers/
rs-distribution/trunk/nixos/pkgs/servers/http/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
Added: rs-distribution/trunk/nixos/README.md
==============================================================================
--- rs-distribution/trunk/nixos/README.md (added)
+++ rs-distribution/trunk/nixos/README.md Mon Dec 9 14:19:42 2019
@@ -0,0 +1,14 @@
+NixOS integration pieces.
+
+Beware - there are tied to trunk as we've not yet done a release.
+
+Use the commands:
+<pre>
+nix-env --install nix-prefetch-svn
+nix-prefetch-svn subversion/git-URL
+</pre>
+
+to regenerate the checksums. Once we have a release we can use proper
+checksums & signatures.
+
+
Added: rs-distribution/trunk/nixos/patch-all-packages.txt
==============================================================================
--- rs-distribution/trunk/nixos/patch-all-packages.txt (added)
+++ rs-distribution/trunk/nixos/patch-all-packages.txt Mon Dec 9 14:19:42 2019
@@ -0,0 +1,17 @@
+diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
+index fd7d8e3..1d466bb 100644
+--- a/maintainers/maintainer-list.nix
++++ b/maintainers/maintainer-list.nix
+@@ -1736,6 +1736,12 @@
+ githubId = 11946442;
+ name = "Dipin Hora";
+ };
++ dirkx= {
++ email = "dirkx at webweaving.org";
++ github = "dirkx";
++ githubId = 392583;
++ name = "Dirk-Willem van Gulik";
++ };
+ disassembler = {
+ email = "disasm at gmail.com";
+ github = "disassembler";
Propchange: rs-distribution/trunk/nixos/patch-all-packages.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rs-distribution/trunk/nixos/patch-all-packages.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: rs-distribution/trunk/nixos/patch-maintainers-list.txt
==============================================================================
--- rs-distribution/trunk/nixos/patch-maintainers-list.txt (added)
+++ rs-distribution/trunk/nixos/patch-maintainers-list.txt Mon Dec 9 14:19:42 2019
@@ -0,0 +1,36 @@
+diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
+index fe1ebed..b5ed911 100644
+--- a/pkgs/top-level/all-packages.nix
++++ b/pkgs/top-level/all-packages.nix
+@@ -14864,6 +14864,16 @@ in
+ inherit apacheHttpd;
+
+ mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { };
++
++ # Redwax collection
++ mod_ca = callPackage ../servers/http/apache-modules/mod_ca { };
++ mod_crl = callPackage ../servers/http/apache-modules/mod_crl { };
++ mod_csr = callPackage ../servers/http/apache-modules/mod_csr { };
++ mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ };
++ mod_scep = callPackage ../servers/http/apache-modules/mod_scep { };
++ mod_pkcs12= callPackage ../servers/http/apache-modules/mod_pkcs12 { };
++ mod_spkac= callPackage ../servers/http/apache-modules/mod_spkac { };
++ mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { };
+
+ mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { };
+
+@@ -15127,6 +15137,14 @@ in
+ mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi;
+ mod_python = pkgs.apacheHttpdPackages.mod_python;
+ mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi;
++ mod_ca = pkgs.apacheHttpdPackages.mod_ca;
++ mod_crl = pkgs.apacheHttpdPackages.mod_crl;
++ mod_csr = pkgs.apacheHttpdPackages.mod_csr;
++ mod_ocsp = pkgs.apacheHttpdPackages.mod_ocsp;
++ mod_scep = pkgs.apacheHttpdPackages.mod_scep;
++ mod_spkac = pkgs.apacheHttpdPackages.mod_spkac;
++ mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12;
++ mod_timestamp= pkgs.apacheHttpdPackages.mod_timestamp;
+
+ inherit (callPackages ../servers/mpd { })
+ mpd mpd-small mpdWithFeatures;
Propchange: rs-distribution/trunk/nixos/patch-maintainers-list.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rs-distribution/trunk/nixos/patch-maintainers-list.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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 (added)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix Mon Dec 9 14:19:42 2019
@@ -0,0 +1,29 @@
+{ stdenv, fetchsvn, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap }:
+
+stdenv.mkDerivation rec {
+ name = "mod_ca";
+
+ meta = with stdenv.lib; {
+ homepage = "https://redwax.eu";
+ description = "RedWax CA service modules.";
+ license = licenses.asl20;
+ # platforms = [ platforms.linux platforms.darwin ];
+ maintainers = with maintainers; [ dirkx ];
+ };
+
+ src = fetchsvn {
+ url = "https://source.redwax.eu/svn/redwax/rs/mod_ca/trunk";
+ sha256 = "0llyx7wwdmw2pychg5396whzvfdvrk6q3kd25sw0fciwbw0hrr99";
+ };
+
+ buildInputs = [ gnused coreutils pkgconfig apacheHttpd openssl openldap ];
+
+ configurePlatforms = [];
+ configureFlags = [
+ "--with-apxs=${apacheHttpd.dev}/bin/apxs"
+ ];
+
+ installPhase = "make INCLUDEDIR=$out/include LIBEXECDIR=$out/libexec install";
+}
+
+
Added: 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 (added)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix Mon Dec 9 14:19:42 2019
@@ -0,0 +1,24 @@
+{ stdenv, fetchsvn, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, mod_ca, apr, aprutil }:
+
+stdenv.mkDerivation rec {
+ name = "mod_crl";
+
+ meta = with stdenv.lib; {
+ homepage = "https://redwax.eu";
+ description = "RedWax CA service module to handle Certificate Revocation Lists.";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dirkx ];
+ };
+
+ src = fetchsvn {
+ url = "https://source.redwax.eu/svn/redwax/rs/mod_crl/trunk";
+ sha256 = "0z9pvv8c10w9rrm29i1zn4vmvxnj525f9xpyy6pyrn26ijbs91qv";
+ };
+ 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";
+}
Added: 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 (added)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix Mon Dec 9 14:19:42 2019
@@ -0,0 +1,26 @@
+{ stdenv, fetchsvn, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil, mod_ca }:
+
+stdenv.mkDerivation rec {
+ name = "mod_csr";
+
+ meta = with stdenv.lib; {
+ homepage = "https://redwax.eu";
+ description = "RedWax CA service module to handle Certificate Signing Requests.";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dirkx ];
+ };
+ src = fetchsvn {
+ url = "https://source.redwax.eu/svn/redwax/rs/mod_csr/trunk";
+ sha256 = "07fnswqxlv40kbj35vqhimk2qhwm01lky7y7z302hc1h14x2cn9z";
+ };
+ 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";
+}
+
+
Added: 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 (added)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix Mon Dec 9 14:19:42 2019
@@ -0,0 +1,27 @@
+{ stdenv, fetchsvn, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil, mod_ca }:
+with import <nixpkgs> {};
+
+stdenv.mkDerivation rec {
+ name = "mod_ocsp";
+
+ meta = with stdenv.lib; {
+ homepage = "https://redwax.eu";
+ description = "RedWax CA service modules of OCSP Online Certificate Validation";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dirkx ];
+ };
+
+ src = fetchsvn {
+ url = "https://source.redwax.eu/svn/redwax/rs/mod_ocsp/trunk";
+ sha256 = "1qai3gcq3mdxqlycd3yns1p2kz0lbwl43573cr98hmrmgwzbwy9c";
+ };
+ 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";
+}
+
+
Added: 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 (added)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix Mon Dec 9 14:19:42 2019
@@ -0,0 +1,27 @@
+{ stdenv, fetchsvn, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil, mod_ca }:
+
+stdenv.mkDerivation rec {
+ name = "mod_pkcs12";
+
+ meta = with stdenv.lib; {
+ homepage = "https://redwax.eu";
+ description = "RedWax CA service modules for PKCS#12 format files";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dirkx ];
+ };
+
+ src = fetchsvn {
+ url = "https://source.redwax.eu/svn/redwax/rs/mod_pkcs12/trunk";
+ sha256 = "0ph88f3n0x7fdxdgv9vbmxxij7hy3gipf96vbp4546b9zr2fs6b8";
+ };
+
+ 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";
+}
+
+
Added: 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 (added)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix Mon Dec 9 14:19:42 2019
@@ -0,0 +1,26 @@
+{ stdenv, fetchsvn, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap , apr, aprutil, mod_ca}:
+
+stdenv.mkDerivation rec {
+ name = "mod_scep";
+
+ meta = with stdenv.lib; {
+ homepage = "https://redwax.eu";
+ description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dirkx ];
+ };
+
+ src = fetchsvn {
+ url = "https://source.redwax.eu/svn/redwax/rs/mod_scep/trunk";
+ sha256 = "0b5np7mbfbczi8vmil9gy5rlh268idmz7p053rwy90v26y6wd8vv";
+ };
+ 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";
+}
+
+
Added: 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 (added)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix Mon Dec 9 14:19:42 2019
@@ -0,0 +1,26 @@
+{ stdenv, fetchsvn, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap , apr, aprutil, mod_ca}:
+
+stdenv.mkDerivation rec {
+ name = "mod_spkac";
+
+ meta = with stdenv.lib; {
+ homepage = "https://redwax.eu";
+ description = "RedWax CA service module for handling the Netscape keygen requests. ";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dirkx ];
+ };
+
+ src = fetchsvn {
+ url = "https://source.redwax.eu/svn/redwax/rs/mod_spkac/trunk";
+ sha256 = "0m9l30pa552jnrjrngk2k60sdqi7b8bsaiiz777bxxrxvaw5fyij";
+ };
+ 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";
+}
+
+
Added: 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 (added)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix Mon Dec 9 14:19:42 2019
@@ -0,0 +1,26 @@
+{ stdenv, fetchsvn, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil, mod_ca}:
+
+stdenv.mkDerivation rec {
+ name = "mod_timestamp";
+
+ meta = with stdenv.lib; {
+ homepage = "https://redwax.eu";
+ description = "RedWax CA service module for issuing signed timestamps.";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dirkx ];
+ };
+
+ src = fetchsvn {
+ url = "https://source.redwax.eu/svn/redwax/rs/mod_timestamp/trunk";
+ sha256 = "1gdd3vq4w8d6ppkwavpj6q1z21wmyzvjfb2sg2dkbkz1rs2bgfcx";
+ };
+ 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";
+}
+
+
More information about the rs-commit
mailing list