diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-11-16 18:32:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-16 18:32:44 +0100 |
| commit | 3acc2484cf134182bfc556308c5d355ed6edd24a (patch) | |
| tree | 0d58b4825c5cbd37581b05b21fa61db6bc80c5d5 /pkgs/servers/http | |
| parent | a1380bbcc3c1463c9b1545b6601faf6a2470b1d6 (diff) | |
| parent | 8c7c1e7a302671c685cbcfc3730b6d33dfde34b9 (diff) | |
| download | nixlib-3acc2484cf134182bfc556308c5d355ed6edd24a.tar nixlib-3acc2484cf134182bfc556308c5d355ed6edd24a.tar.gz nixlib-3acc2484cf134182bfc556308c5d355ed6edd24a.tar.bz2 nixlib-3acc2484cf134182bfc556308c5d355ed6edd24a.tar.lz nixlib-3acc2484cf134182bfc556308c5d355ed6edd24a.tar.xz nixlib-3acc2484cf134182bfc556308c5d355ed6edd24a.tar.zst nixlib-3acc2484cf134182bfc556308c5d355ed6edd24a.zip | |
Merge pull request #267560 from anthonyroussel/bugfix/plantuml-server-nixos
nixos/plantuml-server: fix
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/jetty/11.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/jetty/12.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/jetty/common.nix (renamed from pkgs/servers/http/jetty/default.nix) | 12 |
3 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix new file mode 100644 index 000000000000..3196b24d7485 --- /dev/null +++ b/pkgs/servers/http/jetty/11.x.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "11.0.18"; + hash = "sha256-HxtO2r6YWo6+MAYUgk7dNSPDqQZoyO9t/8NdI5pPkL4="; +} diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix new file mode 100644 index 000000000000..4dba445b6b90 --- /dev/null +++ b/pkgs/servers/http/jetty/12.x.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "12.0.3"; + hash = "sha256-Z/jJKKzoqTPZnoFOMwbpSd/Kd1w+rXloKH+aw6aNrKs="; +} diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/common.nix index 1ebd33f51d6f..83adac4ddd0d 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/common.nix @@ -1,11 +1,15 @@ +{ version, hash }: + { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "jetty"; - version = "12.0.2"; + + inherit version; + src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - hash = "sha256-DtlHTXjbr31RmK6ycDdiWOL7jIpbWNh0la90OnOhzvM="; + inherit hash; }; dontBuild = true; @@ -17,10 +21,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Web server and javax.servlet container"; - homepage = "https://www.eclipse.org/jetty/"; + homepage = "https://eclipse.dev/jetty/"; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ asl20 epl10 ]; - maintainers = with maintainers; [ emmanuelrosa ]; + maintainers = with maintainers; [ emmanuelrosa anthonyroussel ]; }; } |