Unverified Commit b77e1a3a authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #307188 from JohnRTitor/anydesk

treewide: migrate some packages to finalAttrs, also reference lib explicitly in meta
parents ecf924c4 722a1316
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@
, xorg
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "whatsapp-for-linux";
  version = "1.6.4";

  src = fetchFromGitHub {
    owner = "eneshecan";
    repo = pname;
    rev = "v${version}";
    sha256 = "sha256-DU9tvIvDfOtBydR68yeRMFYdMjiBrOobCDXIZMmm7pQ=";
    repo = "whatsapp-for-linux";
    rev = "v${finalAttrs.version}";
    hash = "sha256-DU9tvIvDfOtBydR68yeRMFYdMjiBrOobCDXIZMmm7pQ=";
  };

  nativeBuildInputs = [
@@ -68,12 +68,12 @@ stdenv.mkDerivation rec {
    xorg.libXtst
  ];

  meta = with lib; {
  meta = {
    homepage = "https://github.com/eneshecan/whatsapp-for-linux";
    description = "Whatsapp desktop messaging app";
    mainProgram = "whatsapp-for-linux";
    license = licenses.gpl3Only;
    maintainers = with maintainers; [ bartuka ];
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ bartuka ];
    platforms = [ "x86_64-linux" ];
  };
}
})
+9 −9
Original line number Diff line number Diff line
@@ -5,14 +5,14 @@

let
  description = "Desktop sharing application, providing remote support and online meetings";
in stdenv.mkDerivation rec {
in stdenv.mkDerivation (finalAttrs: {
  pname = "anydesk";
  version = "6.3.2";

  src = fetchurl {
    urls = [
      "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
      "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz"
      "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
      "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
    ];
    hash = "sha256-nSY4qHRsEvQk4M3JDHalAk3C6Y21WlfDQ2Gpp6/jjMs=";
  };
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
  postFixup = ''
    patchelf \
      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
      --set-rpath "${lib.makeLibraryPath buildInputs}" \
      --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" \
      $out/bin/anydesk

    # pangox is not actually necessary (it was only added as a part of gtkglext)
@@ -77,12 +77,12 @@ in stdenv.mkDerivation rec {
    };
  };

  meta = with lib; {
  meta = {
    inherit description;
    homepage = "https://www.anydesk.com";
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
    license = licenses.unfree;
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
    license = lib.licenses.unfree;
    platforms = [ "x86_64-linux" ];
    maintainers = with maintainers; [ shyim cheriimoya ];
    maintainers = with lib.maintainers; [ shyim cheriimoya ];
  };
}
})
+8 −8
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@
  nixosTests,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "keydb";
  version = "6.3.4";

  src = fetchFromGitHub {
    owner = "snapchat";
    repo = "keydb";
    rev = "v${version}";
    rev = "v${finalAttrs.version}";
    hash = "sha256-j6qgK6P3Fv+b6k9jwKQ5zW7XLkKbXXcmHKBCQYvwEIU=";
  };

@@ -94,13 +94,13 @@ stdenv.mkDerivation rec {
  passthru.tests.redis = nixosTests.redis;
  passthru.serverBin = "keydb-server";

  meta = with lib; {
  meta = {
    homepage = "https://keydb.dev";
    description = "A Multithreaded Fork of Redis";
    license = licenses.bsd3;
    platforms = platforms.all;
    changelog = "https://github.com/Snapchat/KeyDB/raw/v${version}/00-RELEASENOTES";
    maintainers = teams.helsinki-systems.members;
    license = lib.licenses.bsd3;
    platforms = lib.platforms.all;
    changelog = "https://github.com/Snapchat/KeyDB/raw/v${finalAttrs.version}/00-RELEASENOTES";
    maintainers = lib.teams.helsinki-systems.members;
    mainProgram = "keydb-cli";
  };
}
})
+10 −7
Original line number Diff line number Diff line
@@ -8,15 +8,17 @@
, zug
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "lager";
  version = "0.1.0";

  src = fetchFromGitHub {
    owner = "arximboldi";
    repo = "lager";
    rev = "v${version}";
    rev = "v${finalAttrs.version}";
    hash = "sha256-KTHrVV/186l4klwlcfDwFsKVoOVqWCUPzHnIbWuatbg=";
  };

  buildInputs = [
    boost
    immer
@@ -28,10 +30,11 @@ stdenv.mkDerivation rec {
  cmakeFlags = [
    "-Dlager_BUILD_EXAMPLES=OFF"
  ];
  meta = with lib; {

  meta = {
    homepage = "https://github.com/arximboldi/lager";
    description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++";
    license     = licenses.mit;
    maintainers = with maintainers; [ nek0 ];
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ nek0 ];
  };
}
})
+7 −7
Original line number Diff line number Diff line
@@ -59,14 +59,14 @@ let
  ];
  py = python3.withPackages python-deps;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "syslog-ng";
  version = "4.7.1";

  src = fetchFromGitHub {
    owner = "syslog-ng";
    repo = "syslog-ng";
    rev = "syslog-ng-${version}";
    rev = "syslog-ng-${finalAttrs.version}";
    hash = "sha256-runFMUxQv7B023I38QfGqn89ZbzA5vMXHOOkYwMxArI=";
    fetchSubmodules = true;
  };
@@ -117,11 +117,11 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

  meta = with lib; {
  meta = {
    homepage = "https://www.syslog-ng.com";
    description = "Next-generation syslogd with advanced networking and filtering capabilities";
    license = with licenses; [ gpl2Plus lgpl21Plus ];
    maintainers = with maintainers; [ vifino ];
    platforms = platforms.linux;
    license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
    maintainers = with lib.maintainers; [ vifino ];
    platforms = lib.platforms.linux;
  };
}
})
Loading