diff --git a/flake.lock b/flake.lock index 966e8f40..dcd01774 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1684089756, - "narHash": "sha256-5cx3XpRcZKP1qNcu3Doa93yM1c7thew/F5u8t0T3fK0=", + "lastModified": 1684214620, + "narHash": "sha256-2Z6NTVW7QtowT20TWuQEikcxaVlZDW77tciwx/Cj52M=", "owner": "accentor", "repo": "api", - "rev": "5314ad96f217591b1bd84773e2cde6927290f7f4", + "rev": "627b52bfab471f1f0d1a4b7d6df9bc7a4055c6ff", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1684089855, - "narHash": "sha256-2v7e/7mVv8cZtCE/Oa0tShkJFje5Nq3eqT7wICWvLGs=", + "lastModified": 1684212115, + "narHash": "sha256-/IyGzjM2QLd31/XE6XhpU1+WcYFL4kgOYUGG+3rtO8w=", "owner": "accentor", "repo": "web", - "rev": "f15e28d44530ca92f0f9cd85256e5087000f1fed", + "rev": "ac6ead1918d7114637104fa31b4aa4ceb5b8e903", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1684174178, - "narHash": "sha256-uK05ToTuh5BP3U+wOOTfOAcJKy1q3KTjilzmr9ig1WQ=", + "lastModified": 1684207621, + "narHash": "sha256-6WphXBsSTqdCIle9+gpcnIACl+LfUE6jL5HlTeeiRTc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e4cc7646293b591244f9e1cacdab53170084846b", + "rev": "f8824fa1a882d07921d229c35d7076428e9d9075", "type": "github" }, "original": { @@ -294,11 +294,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684049129, - "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=", + "lastModified": 1684139381, + "narHash": "sha256-YPLMeYE+UzxxP0qbkBzv3RBDvyGR5I4d7v2n8dI3+fY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1", + "rev": "17a689596b72d1906883484838eb1aaf51ab8001", "type": "github" }, "original": { @@ -325,11 +325,11 @@ }, "nur": { "locked": { - "lastModified": 1684194379, - "narHash": "sha256-8+Ka2AjXZ+er4s9JEq2Z5SpSYFgQuIiDtl5SheXbJCo=", + "lastModified": 1684218745, + "narHash": "sha256-UvP4puWuP+FD7/mxzd9UZZxeeggS5si3EyYMa6oZRR8=", "owner": "nix-community", "repo": "NUR", - "rev": "f1d72bc75d3b9777639323ef7dc662133c20d3a4", + "rev": "4543a5dcb060e40588ba753f773793e34e7e9489", "type": "github" }, "original": { @@ -384,11 +384,11 @@ ] }, "locked": { - "lastModified": 1684089337, - "narHash": "sha256-dnRmOMgRAuDznbwMjzMoVolAh8btGLF9OhLtjw1FTTk=", + "lastModified": 1684211746, + "narHash": "sha256-rDyRPKc54nG0p2ThQhKLmFoB9DpaHz21T5wY8QgC+k0=", "owner": "chvp", "repo": "tetris", - "rev": "74f5a0436f7155440f2b20e978c68cfae7cfe489", + "rev": "7847401ab9740a17d949eb794e5f322787ae3fe2", "type": "github" }, "original": { diff --git a/patches/230496.patch b/patches/230496.patch deleted file mode 100644 index 107daa13..00000000 --- a/patches/230496.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 633f76779de03234ad3f82e79fc492e8b3ae5df5 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sun, 7 May 2023 12:45:07 +0200 -Subject: [PATCH] xrdp: 0.9.21.1 -> 0.9.22 - -https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.22 ---- - pkgs/applications/networking/remote/xrdp/default.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix -index b7c51d70dfecb..67ddde5ce14ee 100644 ---- a/pkgs/applications/networking/remote/xrdp/default.nix -+++ b/pkgs/applications/networking/remote/xrdp/default.nix -@@ -34,7 +34,7 @@ let - }; - - xrdp = stdenv.mkDerivation rec { -- version = "0.9.21.1"; -+ version = "0.9.22"; - pname = "xrdp"; - - src = fetchFromGitHub { -@@ -42,7 +42,7 @@ let - repo = "xrdp"; - rev = "v${version}"; - fetchSubmodules = true; -- hash = "sha256-/o052ij+Tpcw5/k1UyP6OGOzrtBwh3jRkftStIEhUF0="; -+ hash = "sha256-/i2rLVrN1twKtQH6Qt1OZOPGZzegWBOKpj0Wnin8cR8="; - }; - - nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; diff --git a/patches/231473.patch b/patches/231473.patch deleted file mode 100644 index 2533b407..00000000 --- a/patches/231473.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c51fe112cc73f87f282de24aa0fd929e72bb6ed0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20M=C3=B6ller?= -Date: Fri, 12 May 2023 14:56:23 +0200 -Subject: [PATCH] treewide: pass system argument to eval-config.nix - -Calling `eval-config.nix` without a `system` from a Nix flake fails with -`error: attribute 'currentSystem' missing` since #230523. Setting -`system = null` removes the use of `currentSystem` and instead uses the -value from the `nixpkgs` module. ---- - nixos/modules/virtualisation/nixos-containers.nix | 4 ++++ - nixos/tests/containers-imperative.nix | 4 ++++ - pkgs/top-level/all-packages.nix | 4 ++++ - 3 files changed, 12 insertions(+) - -diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix -index d54e2ed3f3ae1..c3949564d4bde 100644 ---- a/nixos/modules/virtualisation/nixos-containers.nix -+++ b/nixos/modules/virtualisation/nixos-containers.nix -@@ -515,6 +515,10 @@ in - in [ extraConfig ] ++ (map (x: x.value) defs); - prefix = [ "containers" name ]; - inherit (config) specialArgs; -+ -+ # The system is inherited from the host above. -+ # Set it to null, to remove the "legacy" entrypoint's non-hermetic default. -+ system = null; - }).config; - }; - }; -diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix -index 3007efaf88710..22b664a90e170 100644 ---- a/nixos/tests/containers-imperative.nix -+++ b/nixos/tests/containers-imperative.nix -@@ -25,6 +25,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { - system.stateVersion = "18.03"; - }; - }; -+ -+ # The system is inherited from the host above. -+ # Set it to null, to remove the "legacy" entrypoint's non-hermetic default. -+ system = null; - }; - in with pkgs; [ - stdenv stdenvNoCC emptyContainer.config.containers.foo.path -diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix -index 22efeb42ebffc..fa0947bf2db45 100644 ---- a/pkgs/top-level/all-packages.nix -+++ b/pkgs/top-level/all-packages.nix -@@ -39009,6 +39009,10 @@ with pkgs; - then configuration - else [configuration] - ); -+ -+ # The system is inherited from the current pkgs above. -+ # Set it to null, to remove the "legacy" entrypoint's non-hermetic default. -+ system = null; - }; - in - c.config.system.build // c;