Unverified Commit d31888f4 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

various: refactor package definitions (#443475)

parents af654d78 99fcccaf

pkgs/by-name/_1/_1password-cli/package.nix

+7 −7
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ stdenv.mkDerivation { 
    if (builtins.elem system platforms) then

      sources.${system}

    else

      throw "Source for ${pname} is not available for ${system}";

      throw "Source for 1password-cli is not available for ${system}";



  nativeBuildInputs = [

    installShellFiles
@@ -63,23 +63,23 @@ stdenv.mkDerivation { 


  installPhase = ''

    runHook preInstall

    install -D ${mainProgram} $out/bin/${mainProgram}

    install -D op $out/bin/op

    runHook postInstall

  '';



  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

    HOME=$TMPDIR

    installShellCompletion --cmd ${mainProgram} \

      --bash <($out/bin/${mainProgram} completion bash) \

      --fish <($out/bin/${mainProgram} completion fish) \

      --zsh <($out/bin/${mainProgram} completion zsh)

    installShellCompletion --cmd op \

      --bash <($out/bin/op completion bash) \

      --fish <($out/bin/op completion fish) \

      --zsh <($out/bin/op completion zsh)

  '';



  dontStrip = stdenv.hostPlatform.isDarwin;



  doInstallCheck = true;



  versionCheckProgram = "${builtins.placeholder "out"}/bin/${mainProgram}";

  versionCheckProgram = "${builtins.placeholder "out"}/bin/op";

  versionCheckProgramArg = "--version";



  passthru = {

pkgs/by-name/_1/_1password-gui/linux.nix

+3 −3
Original line number Diff line number Diff line
@@ -109,9 +109,9 @@ stdenv.mkDerivation { 
      cp -a * $out/share/1password



      # Desktop file

      install -Dt $out/share/applications resources/${pname}.desktop

      substituteInPlace $out/share/applications/${pname}.desktop \

        --replace-fail 'Exec=/opt/1Password/${pname}' 'Exec=${pname}'

      install -Dt $out/share/applications resources/1password.desktop

      substituteInPlace $out/share/applications/1password.desktop \

        --replace-fail 'Exec=/opt/1Password/1password' 'Exec=1password'



    ''

    + (lib.optionalString (polkitPolicyOwners != [ ]) ''

pkgs/by-name/aa/aaphoto/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  llvmPackages,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "aaphoto";

  version = "0.45";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec { 
  ];



  postInstall = ''

    install -Dm644 NEWS README REMARKS TODO -t $out/share/doc/${pname}

    install -Dm644 NEWS README REMARKS TODO -t $out/share/doc/aaphoto

  '';



  meta = {

pkgs/by-name/ac/acpi/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 
  fetchurl,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "acpi";

  version = "1.8";



  src = fetchurl {

    url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz";

    sha256 = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws=";

    url = "mirror://sourceforge/acpiclient/${finalAttrs.version}/acpi-${finalAttrs.version}.tar.gz";

    hash = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws=";

  };



  meta = {
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec { 
    platforms = lib.platforms.linux;

    maintainers = with lib.maintainers; [ ];

  };

}
 
})

pkgs/by-name/yu/yubikey-touch-detector/package.nix

+7 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ buildGoModule rec { 
  src = fetchFromGitHub {

    owner = "maximbaz";

    repo = "yubikey-touch-detector";

    rev = version;

    tag = version;

    hash = "sha256-aHR/y8rAKS+dMvRdB3oAmOiI7hTA6qlF4Z05OjwYOO4=";

  };

  vendorHash = "sha256-oHEcpu3QvcVC/YCtGtP7nNT9++BSU8BPT5pf8NdLrOo=";
@@ -33,9 +33,9 @@ buildGoModule rec { 
  ];



  postInstall = ''

    install -Dm444 -t $out/share/doc/${pname} *.{md,example}

    install -Dm444 -t $out/share/doc/yubikey-touch-detector *.{md,example}



    install -Dm444 -t $out/share/licenses/${pname} LICENSE

    install -Dm444 -t $out/share/licenses/yubikey-touch-detector LICENSE



    install -Dm444 -t $out/share/icons/hicolor/128x128/apps yubikey-touch-detector.png
@@ -48,12 +48,12 @@ buildGoModule rec { 
    installManPage yubikey-touch-detector.1

  '';



  meta = with lib; {

  meta = {

    description = "Tool to detect when your YubiKey is waiting for a touch";

    homepage = "https://github.com/maximbaz/yubikey-touch-detector";

    maintainers = with maintainers; [ sumnerevans ];

    license = licenses.isc;

    platforms = platforms.linux;

    maintainers = with lib.maintainers; [ sumnerevans ];

    license = lib.licenses.isc;

    platforms = lib.platforms.linux;

    mainProgram = "yubikey-touch-detector";

  };

}