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 similarity index 87% rename from pkgs/servers/http/jetty/default.nix rename to pkgs/servers/http/jetty/common.nix index d89001b4f76a..5b36282eb2f1 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/common.nix @@ -1,12 +1,15 @@ +{ version, hash }: + { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "jetty"; - version = "12.0.3"; + + inherit version; src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - hash = "sha256-Z/jJKKzoqTPZnoFOMwbpSd/Kd1w+rXloKH+aw6aNrKs="; + inherit hash; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bda9a5447d0b..b70f26cdbe23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26523,7 +26523,9 @@ with pkgs; jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { }; - jetty = callPackage ../servers/http/jetty { }; + jetty = jetty_12; + jetty_12 = callPackage ../servers/http/jetty/12.x.nix { }; + jetty_11 = callPackage ../servers/http/jetty/11.x.nix { }; jibri = callPackage ../servers/jibri { };