From 82901548f4d502d7c8f77839ba5395a3af9f7b6f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 15 Mar 2024 15:12:00 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 36 ++++++++++++++++++------------------ patches/295249.patch | 36 ------------------------------------ patches/295914.patch | 22 ---------------------- 3 files changed, 18 insertions(+), 76 deletions(-) delete mode 100644 patches/295249.patch delete mode 100644 patches/295914.patch diff --git a/flake.lock b/flake.lock index 87f5d30e..a1bc8883 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1710319351, - "narHash": "sha256-3WEQZQgCr2l+MdZBdR6NZ2Zc4NPvES5xJ9v1UMO/k/Y=", + "lastModified": 1710506986, + "narHash": "sha256-ePsZmrf5sATxq1oBu1gzD8MhLusYpJp0yWHnE8qmyM4=", "owner": "accentor", "repo": "api", - "rev": "eaebfc638570bc63573b76ab3a0c4221d4badb8a", + "rev": "34710cf7e17a01dc826c442a0a6a980e43f8a2ee", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710319322, - "narHash": "sha256-8E7EEk4lPoBr495QrJDjBqqbnl85Po0GqU71rcZbmck=", + "lastModified": 1710507062, + "narHash": "sha256-V2goCIoEmhtqXojaQvxrhe2Cr3yMaAhxEGrWrRuPs8Y=", "owner": "accentor", "repo": "web", - "rev": "06d6af9ac4c2f250bbb4f7c70c7e8ccd0b4e4d75", + "rev": "8b66dd422daff7995f13c0a1b53c7a8f167e6bb6", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1710499337, - "narHash": "sha256-FsPpFFw59MFU+E1PD6t9K9it17DaV5nU/+mWEkfS2YE=", + "lastModified": 1710506163, + "narHash": "sha256-Xpl2LzbAIUHcTkAZ08UZM0USxVaQn194I8ma9c8wnAA=", "owner": "nix-community", "repo": "home-manager", - "rev": "ca922258e1682b435e632a5ca1910bbbed835345", + "rev": "dc2f3812b41f825ed466c24c4211160d75cb890c", "type": "github" }, "original": { @@ -476,11 +476,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", "type": "github" }, "original": { @@ -554,11 +554,11 @@ }, "nur": { "locked": { - "lastModified": 1710499346, - "narHash": "sha256-sLwiLH9aCE1jxuySVqhPWJp27h5tnXW7c41M1803/mQ=", + "lastModified": 1710506669, + "narHash": "sha256-9m+oWHbBZi3c7YyiMs5hiOIqCG+WgP1sMA+s60AtWOU=", "owner": "nix-community", "repo": "NUR", - "rev": "5a2cb69a0486e645c3cfc52c9d6ec29b407446c1", + "rev": "90155b2212a941712b74575db564c6afd24492b5", "type": "github" }, "original": { @@ -771,11 +771,11 @@ ] }, "locked": { - "lastModified": 1710315365, - "narHash": "sha256-nLv5uXsBEdfDRvlxhxaIK/scMasjhdA8DdmYt095eYI=", + "lastModified": 1710506760, + "narHash": "sha256-hpv2/PDQ9u8+TiUDwWSe3uZBjiDG7IhjyGdFYTNLPIo=", "owner": "chvp", "repo": "tetris", - "rev": "0a8d249f584f6edb80649aee5c720324ec493116", + "rev": "8699bdb88e12039491e3431fcb00d0169dc3a7e1", "type": "github" }, "original": { diff --git a/patches/295249.patch b/patches/295249.patch deleted file mode 100644 index f1e0ee9d..00000000 --- a/patches/295249.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix -index c9f679d9e12472..10ad5f8d93fb29 100644 ---- a/pkgs/applications/networking/remote/xrdp/default.nix -+++ b/pkgs/applications/networking/remote/xrdp/default.nix -@@ -22,7 +22,7 @@ - }: - - let -- version = "0.9.24"; -+ version = "0.9.25"; - patchedXrdpSrc = applyPatches { - patches = [ ./dynamic_config.patch ]; - name = "xrdp-patched-${version}"; -@@ -31,19 +31,19 @@ let - repo = "xrdp"; - rev = "v${version}"; - fetchSubmodules = true; -- hash = "sha256-Kvj72l+jmoad6VgmCYW2KtQAbJMJ8AZjNIYJ5lUNzRM="; -+ hash = "sha256-XVaNN+sBEACh/yGnCLn9GHszoofWbcyA+Mr6KZMVFB0="; - }; - }; - - xorgxrdp = stdenv.mkDerivation rec { - pname = "xorgxrdp"; -- version = "0.9.19"; -+ version = "0.9.20"; - - src = fetchFromGitHub { - owner = "neutrinolabs"; - repo = "xorgxrdp"; - rev = "v${version}"; -- hash = "sha256-WI1KyJDQkmNHwweZMbNd2KUfawaieoGMDMQfeD12cZs="; -+ hash = "sha256-cAAWk/GqR5zJmh7EAzX3qJiYNl/RrDWdncdFeqsFIaU="; - }; - - nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; diff --git a/patches/295914.patch b/patches/295914.patch deleted file mode 100644 index 6db4cf73..00000000 --- a/patches/295914.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix -index 10ad5f8d93fb29..3d6d1de3d964c1 100644 ---- a/pkgs/applications/networking/remote/xrdp/default.nix -+++ b/pkgs/applications/networking/remote/xrdp/default.nix -@@ -22,7 +22,7 @@ - }: - - let -- version = "0.9.25"; -+ version = "0.9.25.1"; - patchedXrdpSrc = applyPatches { - patches = [ ./dynamic_config.patch ]; - name = "xrdp-patched-${version}"; -@@ -31,7 +31,7 @@ let - repo = "xrdp"; - rev = "v${version}"; - fetchSubmodules = true; -- hash = "sha256-XVaNN+sBEACh/yGnCLn9GHszoofWbcyA+Mr6KZMVFB0="; -+ hash = "sha256-oAs0oWkCyj3ObdJuHLfT25ZzkTrxNAXDiFU64OOP4Ow="; - }; - }; -