diff options
| author | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2022-10-09 11:11:37 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-10-09 14:44:14 +0000 |
| commit | 35336a0635cd1fec7df6f0736d0efd477be42db6 (patch) | |
| tree | 7cfd10ec8e0a76f4b06c001709c2016e1603f0cf | |
| parent | Merge pull request #194999 from risicle/ris-go-1-18-apple-sdk-11-r22.05 (diff) | |
| download | nixpkgs-origin/backport-195203-to-release-22.05.tar.gz | |
yaws: 2.0.6 -> 2.1.1origin/backport-195203-to-release-22.05
(cherry picked from commit cc1dbce261847370fb8a787972a22693b233c72e)
| -rw-r--r-- | pkgs/servers/http/yaws/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 17 deletions
diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index be22ebdd36c9..7609c6ea5454 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -1,23 +1,19 @@ -{lib, stdenv, fetchurl, erlang, pam, perl }: +{lib, stdenv, fetchFromGitHub, erlang, pam, perl, autoreconfHook }: stdenv.mkDerivation rec { pname = "yaws"; - version = "2.0.6"; + version = "2.1.1"; - src = fetchurl { - url = "http://yaws.hyber.org/download/${pname}-${version}.tar.gz"; - sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9"; + src = fetchFromGitHub { + owner = "erlyaws"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-F1qhq0SEChWw/EBodXKWTqMNmGoTwP2JgkmfANUFD9I="; }; - # The tarball includes a symlink yaws -> yaws-1.95, which seems to be - # necessary for importing erlang files - unpackPhase = '' - tar xzf $src - cd $name - ''; - configureFlags = [ "--with-extrainclude=${pam}/include/security" ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ erlang pam perl ]; postInstall = '' @@ -25,8 +21,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A high performance HTTP 1.1 server in Erlang"; - homepage = "http://yaws.hyber.org"; + description = "A webserver for dynamic content written in Erlang."; + homepage = "https://github.com/erlyaws/yaws"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 871d739c0841..3d65b5bfeb12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22841,9 +22841,7 @@ with pkgs; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - yaws = callPackage ../servers/http/yaws { - erlang = erlangR21; - }; + yaws = callPackage ../servers/http/yaws { }; youtrack = callPackage ../servers/jetbrains/youtrack.nix { }; |