Unverified Commit 762d4603 authored by quantenzitrone's avatar quantenzitrone
Browse files

plik{,d}: untangle derivation definitions 

this shouldn't create any rebuilds
parent 316b15b3

pkgs/servers/plik/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
let

  version = "1.3.7";



  programs = callPackage ./programs.nix { };

  plikd-unwrapped = callPackage ./plikd.nix { };

  plik = callPackage ./plik.nix { plikd = plikd-unwrapped; };



  webapp = fetchurl {

    url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz";
@@ -19,19 +20,19 @@ let 
in

{



  inherit (programs) plik plikd-unwrapped;

  inherit plik plikd-unwrapped;



  plikd =

    runCommand "plikd-${version}"

      {

        nativeBuildInputs = [ makeWrapper ];

        inherit (programs.plikd-unwrapped) passthru;

        inherit (plikd-unwrapped) passthru;

      }

      ''

        mkdir -p $out/libexec/plikd/{bin,webapp} $out/bin

        tar xf ${webapp} plik-${version}-linux-amd64/webapp/dist/

        mv plik-*/webapp/dist $out/libexec/plikd/webapp

        cp ${programs.plikd-unwrapped}/bin/plikd $out/libexec/plikd/bin/plikd

        cp ${plikd-unwrapped}/bin/plikd $out/libexec/plikd/bin/plikd

        makeWrapper $out/libexec/plikd/bin/plikd $out/bin/plikd \

          --chdir "$out/libexec/plikd/bin"

      '';

pkgs/servers/plik/plik.nix

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{

  buildGoModule,

  plikd,

}:



buildGoModule (finalAttrs: {

  pname = "plik";

  inherit (plikd)

    version

    src

    postPatch

    passthru

    ;



  subPackages = [ "client" ];



  vendorHash = null;



  postInstall = ''

    mv $out/bin/client $out/bin/plik

  '';



  meta = {

    inherit (plikd.meta)

      description

      homepage

      license

      maintainers

      ;

    mainProgram = "plik";

  };

})

pkgs/servers/plik/programs.nix→pkgs/servers/plik/plikd.nix

+8 −40
Original line number Diff line number Diff line
@@ -2,12 +2,11 @@ 
  lib,

  buildGoModule,

  fetchFromGitHub,

  makeWrapper,

  runCommand,

  nixosTests,

}:



let

buildGoModule rec {

  pname = "plikd-unwrapped";

  version = "1.3.8";



  src = fetchFromGitHub {
@@ -17,6 +16,8 @@ let 
    hash = "sha256-WCtfkzlZnyzZDwNDBrW06bUbLYTL2C704Y7aXbiVi5c=";

  };



  subPackages = [ "server" ];



  vendorHash = null;



  meta = {
@@ -24,7 +25,6 @@ let 
    description = "Scalable & friendly temporary file upload system";

    maintainers = [ ];

    license = lib.licenses.mit;

    mainProgram = "plik";

  };



  postPatch = ''
@@ -32,43 +32,11 @@ let 
      --replace '"0.0.0"' '"${version}"'

  '';



  passthru.tests = {

    inherit (nixosTests) plikd;

  };



in

{



  plik = buildGoModule {

    pname = "plik";

    inherit

      version

      meta

      src

      vendorHash

      postPatch

      passthru

      ;



    subPackages = [ "client" ];

    postInstall = ''

      mv $out/bin/client $out/bin/plik

    '';

  };



  plikd-unwrapped = buildGoModule {

    pname = "plikd-unwrapped";

    inherit

      version

      src

      vendorHash

      postPatch

      passthru

      ;



    subPackages = [ "server" ];

  postFixup = ''

    mv $out/bin/server $out/bin/plikd

  '';



  passthru.tests = {

    inherit (nixosTests) plikd;

  };

}