diff --git a/pkgs/servers/asouldocs/default.nix b/pkgs/servers/asouldocs/default.nix new file mode 100644 index 000000000000..a10c088670b0 --- /dev/null +++ b/pkgs/servers/asouldocs/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "asouldocs"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "asoul-sig"; + repo = "asouldocs"; + rev = "v${version}"; + hash = "sha256-ctRE7aF3Qj+fI/m0CuLA6x7E+mY6s1+UfBJI5YFea4g="; + }; + + vendorSha256 = "sha256-T/KLiSK6bxXGkmVJ5aGrfHTUfLs/ElGyWSoCL5kb/KU="; + + meta = with lib; { + description = "Web server for multi-language, real-time synchronization and searchable documentation"; + homepage = "https://asouldocs.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ ivar anthonyroussel ]; + }; +} diff --git a/pkgs/servers/peach/default.nix b/pkgs/servers/peach/default.nix deleted file mode 100644 index 59d5a6c2f60d..000000000000 --- a/pkgs/servers/peach/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "peach"; - version = "0.9.8"; - - src = fetchFromGitHub { - owner = "peachdocs"; - repo = "peach"; - rev = "v${version}"; - sha256 = "1pzk3sah39hz8n1kswxl35djh6wm0qcfcwrbfi50nd4k3bdgz7xl"; - }; - - vendorSha256 = "0f215hd5a9d4fyvdirp2j14ghap5vwv12i28jmzm6wxjihj8nn1g"; - - meta = with lib; { - description = "Web server for multi-language, real-time synchronization and searchable documentation"; - homepage = "https://peachdocs.org/"; - license = licenses.asl20; - maintainers = [ maintainers.ivar ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dcc7db2e2b5e..f1e82693e361 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1030,6 +1030,7 @@ mapAliases ({ pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 + peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5c39a8405e1..b6c66d3d7b1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22432,6 +22432,8 @@ with pkgs; archiveopteryx = callPackage ../servers/mail/archiveopteryx { }; + asouldocs = callPackage ../servers/asouldocs { }; + atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { }; atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { }; atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { }; @@ -30026,8 +30028,6 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; - peach = callPackage ../servers/peach { }; - peaclock = callPackage ../applications/misc/peaclock { stdenv = gccStdenv; };