diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
| commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
| tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/servers/http/apache-modules | |
| parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
| parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
| download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip | |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/http/apache-modules')
| -rw-r--r-- | nixpkgs/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix | 34 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix | 10 |
2 files changed, 34 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix new file mode 100644 index 000000000000..5fb922c2df08 --- /dev/null +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, apacheHttpd }: + +stdenv.mkDerivation rec { + pname = "mod_cspnonce"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "wyattoday"; + repo = "mod_cspnonce"; + rev = version; + sha256 = "0kqvxf1dn8r0ywrfiwsxryjrxii2sq11wisbjnm7770sjwckwqh5"; + }; + + buildInputs = [ apacheHttpd ]; + + buildPhase = '' + apxs -ca mod_cspnonce.c + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/modules + cp .libs/mod_cspnonce.so $out/modules + runHook postInstall + ''; + + meta = with lib; { + description = "An Apache2 module that makes it dead simple to add nonce values to the CSP"; + homepage = "https://github.com/wyattoday/mod_cspnonce"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dasj19 ]; + }; +} diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 86c9ad6c00dc..a67ea3cc03e7 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,12 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, apacheHttpd }: -let - apache-24-patch = fetchurl { - name = "compile-against-apache24.diff"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; - sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; - }; -in stdenv.mkDerivation rec { pname = "mod_fastcgi"; version = "2.4.7.1"; @@ -18,8 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-ovir59kCjKkgbraX23nsmzlMzGdeNTyj3MQd8cgvLsg="; }; - patches = [ apache-24-patch ]; - buildInputs = [ apacheHttpd ]; preBuild = '' @@ -43,6 +34,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; - broken = true; # patch 'compile-against-apache24.diff' no longer works }; } |