From acd3c673a2849cd048b0eb7c9c6497c924d3afc1 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 14 Nov 2023 23:10:18 +0100 Subject: jetty: fix meta.homepage --- pkgs/servers/http/jetty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 1ebd33f51d6f4..638f2b6e6a4b4 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -17,7 +17,7 @@ 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 ]; -- cgit 1.4.1 From 4d77d2a63f18b622df8d15ba529761a3c92d62d5 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 14 Nov 2023 23:10:27 +0100 Subject: jetty: 12.0.2 -> 12.0.3 --- pkgs/servers/http/jetty/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 638f2b6e6a4b4..d89001b4f76a7 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "12.0.2"; + version = "12.0.3"; + src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - hash = "sha256-DtlHTXjbr31RmK6ycDdiWOL7jIpbWNh0la90OnOhzvM="; + hash = "sha256-Z/jJKKzoqTPZnoFOMwbpSd/Kd1w+rXloKH+aw6aNrKs="; }; dontBuild = true; -- cgit 1.4.1 From c7d414ef389f42959b71d6c274f70fec7aaa8e9b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 14 Nov 2023 23:42:58 +0100 Subject: jetty_11,jetty_12: init --- pkgs/servers/http/jetty/11.x.nix | 4 ++++ pkgs/servers/http/jetty/12.x.nix | 4 ++++ pkgs/servers/http/jetty/common.nix | 30 ++++++++++++++++++++++++++++++ pkgs/servers/http/jetty/default.nix | 27 --------------------------- pkgs/top-level/all-packages.nix | 4 +++- 5 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 pkgs/servers/http/jetty/11.x.nix create mode 100644 pkgs/servers/http/jetty/12.x.nix create mode 100644 pkgs/servers/http/jetty/common.nix delete mode 100644 pkgs/servers/http/jetty/default.nix (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix new file mode 100644 index 0000000000000..3196b24d74856 --- /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 0000000000000..4dba445b6b90e --- /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/common.nix b/pkgs/servers/http/jetty/common.nix new file mode 100644 index 0000000000000..5b36282eb2f1b --- /dev/null +++ b/pkgs/servers/http/jetty/common.nix @@ -0,0 +1,30 @@ +{ version, hash }: + +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "jetty"; + + inherit version; + + src = fetchurl { + url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; + inherit hash; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out + mv etc lib modules start.jar $out + ''; + + meta = with lib; { + description = "A Web server and javax.servlet container"; + homepage = "https://eclipse.dev/jetty/"; + platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = with licenses; [ asl20 epl10 ]; + maintainers = with maintainers; [ emmanuelrosa ]; + }; +} diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix deleted file mode 100644 index d89001b4f76a7..0000000000000 --- a/pkgs/servers/http/jetty/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "jetty"; - version = "12.0.3"; - - src = fetchurl { - url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - hash = "sha256-Z/jJKKzoqTPZnoFOMwbpSd/Kd1w+rXloKH+aw6aNrKs="; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out - mv etc lib modules start.jar $out - ''; - - meta = with lib; { - description = "A Web server and javax.servlet container"; - homepage = "https://eclipse.dev/jetty/"; - platforms = platforms.all; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = with licenses; [ asl20 epl10 ]; - maintainers = with maintainers; [ emmanuelrosa ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bda9a5447d0b4..b70f26cdbe237 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 { }; -- cgit 1.4.1 From 252d793e792eff90b11e97d03251daf65e5e506c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 15 Nov 2023 00:02:36 +0100 Subject: jetty_11,jetty_12: add anthonyroussel to maintainers --- pkgs/servers/http/jetty/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/jetty/common.nix b/pkgs/servers/http/jetty/common.nix index 5b36282eb2f1b..83adac4ddd0d3 100644 --- a/pkgs/servers/http/jetty/common.nix +++ b/pkgs/servers/http/jetty/common.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ asl20 epl10 ]; - maintainers = with maintainers; [ emmanuelrosa ]; + maintainers = with maintainers; [ emmanuelrosa anthonyroussel ]; }; } -- cgit 1.4.1