chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-05-16 10:13:53 +02:00
parent 096ee19aaa
commit c9f675a885
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 18 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

32
patches/230496.patch
View file

@ -1,32 +0,0 @@
From 633f76779de03234ad3f82e79fc492e8b3ae5df5 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
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 ];

60
patches/231473.patch
View file

@ -1,60 +0,0 @@
From c51fe112cc73f87f282de24aa0fd929e72bb6ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
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;