From c719991312599e5a880dc6005042a55e2caf92ad Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 2 Jul 2024 20:50:16 +0200 Subject: [PATCH 1/2] displaylink: 5.8.0-63.33 -> 6.0.0-24 --- pkgs/os-specific/linux/displaylink/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 476ea57d44ec..c6dbf45d9099 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -18,22 +18,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "displaylink"; - version = "5.8.0-63.33"; + version = "6.0.0-24"; src = requireFile rec { - name = "displaylink-580.zip"; - sha256 = "05m8vm6i9pc9pmvar021lw3ls60inlmq92nling0vj28skm55i92"; + name = "displaylink-600.zip"; + sha256 = "1ixrklwk67w25cy77n7l0pq6j9i4bp4lkdr30kp1jsmyz8daaypw"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.8 + https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-6.0 Once you have downloaded the file, please use the following commands and re-run the installation: - mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.8-EXE.zip" \$PWD/${name} + mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu6.0-EXE.zip" \$PWD/${name} nix-prefetch-url file://\$PWD/${name} ''; }; @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { dontPatchELF = true; meta = with lib; { - description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; + description = "DisplayLink DL-7xxx, DL-6xxx, DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; homepage = "https://www.displaylink.com/"; hydraPlatforms = []; license = licenses.unfree; From f6ada863d98bed21b0148e97af4a09bc90cba2fc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 2 Jul 2024 20:50:46 +0200 Subject: [PATCH 2/2] displaylink: reformat with `nixfmt-rfc-style` --- .../os-specific/linux/displaylink/default.nix | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index c6dbf45d9099..016ec76efcdc 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -1,20 +1,30 @@ -{ stdenv -, lib -, unzip -, util-linux -, libusb1 -, evdi -, makeBinaryWrapper -, requireFile +{ + stdenv, + lib, + unzip, + util-linux, + libusb1, + evdi, + makeBinaryWrapper, + requireFile, }: let bins = - if stdenv.hostPlatform.system == "x86_64-linux" then "x64-ubuntu-1604" - else if stdenv.hostPlatform.system == "i686-linux" then "x86-ubuntu-1604" - else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64-linux-gnu" - else throw "Unsupported architecture"; - libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ]; + if stdenv.hostPlatform.system == "x86_64-linux" then + "x64-ubuntu-1604" + else if stdenv.hostPlatform.system == "i686-linux" then + "x86-ubuntu-1604" + else if stdenv.hostPlatform.system == "aarch64-linux" then + "aarch64-linux-gnu" + else + throw "Unsupported architecture"; + libPath = lib.makeLibraryPath [ + stdenv.cc.cc + util-linux + libusb1 + evdi + ]; in stdenv.mkDerivation (finalAttrs: { pname = "displaylink"; @@ -75,11 +85,15 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "DisplayLink DL-7xxx, DL-6xxx, DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; homepage = "https://www.displaylink.com/"; - hydraPlatforms = []; + hydraPlatforms = [ ]; license = licenses.unfree; mainProgram = "DisplayLinkManager"; maintainers = with maintainers; [ abbradar ]; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + "aarch64-linux" + ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; })