Unverified Commit cf7ece28 authored by Gutyina Gergő's avatar Gutyina Gergő
Browse files

{,nixos/}pocket-id: make pocket-id-backend subpackage the main package

parent ab1ce1ea

nixos/modules/services/security/pocket-id.nix

+3 −3
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ in 
    ];



    systemd.services = {

      pocket-id-backend = {

        description = "Pocket ID backend";

      pocket-id = {

        description = "Pocket ID";

        after = [ "network.target" ];

        wantedBy = [ "multi-user.target" ];

        restartTriggers = [
@@ -149,7 +149,7 @@ in 
          User = cfg.user;

          Group = cfg.group;

          WorkingDirectory = cfg.dataDir;

          ExecStart = "${cfg.package}/bin/pocket-id-backend";

          ExecStart = "${cfg.package}/bin/pocket-id";

          Restart = "always";

          EnvironmentFile = [

            cfg.environmentFile

nixos/tests/pocket-id.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
      inherit (builtins) toString;

    in

    ''

      machine.wait_for_unit("pocket-id-backend.service")

      machine.wait_for_unit("pocket-id.service")

      machine.wait_for_open_port(${toString settings.PORT})



      backend_status = machine.succeed("curl -L -o /tmp/backend-output -w '%{http_code}' http://localhost:${toString settings.PORT}/api/users/me")

pkgs/by-name/po/pocket-id/package.nix

+10 −28
Original line number Diff line number Diff line
@@ -3,12 +3,11 @@ 
  fetchFromGitHub,

  buildGoModule,

  buildNpmPackage,

  stdenvNoCC,

  nixosTests,

  nix-update-script,

}:



stdenvNoCC.mkDerivation (finalAttrs: {

buildGoModule (finalAttrs: {

  pname = "pocket-id";

  version = "1.0.0";
@@ -19,10 +18,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    hash = "sha256-cHPG4KZgfLuEDzLJ9dV4PRUlqWjd7Ji3480lrFwK6Ds=";

  };



  backend = buildGoModule {

    pname = "pocket-id-backend";

    inherit (finalAttrs) version src;



  sourceRoot = "${finalAttrs.src.name}/backend";



  vendorHash = "sha256-82kdx9ihJgqMCiUjZTONGa1nCZoxKltw8mpF0KoOdT8=";
@@ -32,9 +27,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
  '';



  preFixup = ''

      mv $out/bin/cmd $out/bin/pocket-id-backend

    mv $out/bin/cmd $out/bin/pocket-id

  '';

  };



  frontend = buildNpmPackage {

    pname = "pocket-id-frontend";
@@ -57,25 +51,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    '';

  };



  dontUnpack = true;



  installPhase = ''

    runHook preInstall



    mkdir -p $out/bin

    ln -s ${finalAttrs.backend}/bin/pocket-id-backend $out/bin/pocket-id-backend



    runHook postInstall

  '';



  passthru = {

    tests = {

      inherit (nixosTests) pocket-id;

    };

    updateScript = nix-update-script {

      extraArgs = [

        "--subpackage"

        "backend"

        "--subpackage"

        "frontend"

      ];
@@ -87,6 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    homepage = "https://pocket-id.org";

    changelog = "https://github.com/pocket-id/pocket-id/releases/tag/v${finalAttrs.version}";

    license = lib.licenses.bsd2;

    mainProgram = "pocket-id";

    maintainers = with lib.maintainers; [

      gepbird

      marcusramberg