From ad594b450386bbc658196638cc778382c4d0a665 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 25 Mar 2024 11:35:25 +0100 Subject: [PATCH 1/2] urserver: 3.10.0.2467 -> 3.13.0.2505 --- nixos/modules/services/x11/urserver.nix | 2 +- pkgs/servers/urserver/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/urserver.nix b/nixos/modules/services/x11/urserver.nix index d0b6e0775e5d..9ba26c574193 100644 --- a/nixos/modules/services/x11/urserver.nix +++ b/nixos/modules/services/x11/urserver.nix @@ -14,7 +14,7 @@ in { allowedUDPPorts = [ 9511 9512 ]; }; - systemd.user.services.urserver = { + systemd.user.services.urserver = { description = '' Server for Unified Remote: The one-and-only remote for your computer. ''; diff --git a/pkgs/servers/urserver/default.nix b/pkgs/servers/urserver/default.nix index c84d40b69c22..933467f895f2 100644 --- a/pkgs/servers/urserver/default.nix +++ b/pkgs/servers/urserver/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "urserver"; - version = "3.10.0.2467"; + version = "3.13.0.2505"; src = fetchurl { url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion version) 3}/urserver-${version}.tar.gz"; - sha256 = "sha256-IaLRhia6mb4h7x5MbBRtPJxJ3uTlkfOzmoTwYzwfbWA="; + hash = "sha256-rklv6Ppha1HhEPunbL8ELYdQ9Z1FN4FrVsNwny3/gA4="; }; nativeBuildInputs = [ From ce845d58a1d9e009cf02efd53185201d791c04f6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 25 Mar 2024 23:25:31 +0100 Subject: [PATCH 2/2] urserver: use finalAttrs instead of rec --- pkgs/servers/urserver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/urserver/default.nix b/pkgs/servers/urserver/default.nix index 933467f895f2..c5c57f70f098 100644 --- a/pkgs/servers/urserver/default.nix +++ b/pkgs/servers/urserver/default.nix @@ -7,12 +7,12 @@ , makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "urserver"; version = "3.13.0.2505"; src = fetchurl { - url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion version) 3}/urserver-${version}.tar.gz"; + url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion finalAttrs.version) 3}/urserver-${finalAttrs.version}.tar.gz"; hash = "sha256-rklv6Ppha1HhEPunbL8ELYdQ9Z1FN4FrVsNwny3/gA4="; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m755 -D urserver $out/bin/urserver - wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" + wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" cp -r remotes $out/bin/remotes cp -r manager $out/bin/manager ''; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sfrijters ]; platforms = [ "x86_64-linux" ]; }; -} +})