From 3d6150c3cd2ea66790d4159395a452c56fb6379d Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 15 May 2023 10:29:04 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 36 +++++++++++++------------- patches/231473.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 18 deletions(-) create mode 100644 patches/231473.patch diff --git a/flake.lock b/flake.lock index 0389cfe5..aad902a5 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1683638857, - "narHash": "sha256-ZGgbHxT9tJ7OasNPwjiDpEXxqvwAz0CHY8sV0p9/HS0=", + "lastModified": 1684089756, + "narHash": "sha256-5cx3XpRcZKP1qNcu3Doa93yM1c7thew/F5u8t0T3fK0=", "owner": "accentor", "repo": "api", - "rev": "585e415a78595c61b01d324a50906f5ec18db113", + "rev": "5314ad96f217591b1bd84773e2cde6927290f7f4", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1684063251, - "narHash": "sha256-VVPctReiGeLDOYlSIhfjQSwa6R+4Giaq5a+4pqdWuKM=", + "lastModified": 1684089855, + "narHash": "sha256-2v7e/7mVv8cZtCE/Oa0tShkJFje5Nq3eqT7wICWvLGs=", "owner": "accentor", "repo": "web", - "rev": "af91192e85e67b0ce52cceb6c9d8b4ae40d0c4f0", + "rev": "f15e28d44530ca92f0f9cd85256e5087000f1fed", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1684055074, - "narHash": "sha256-yD7MidZf6nlKvepMtcr3iCDc4oHjkjdtU//ywqJLnKs=", + "lastModified": 1684116144, + "narHash": "sha256-A3O3S15+g5Xqr2vdcnb9oGynuJsB1sW0ZsSS4TehJmE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bd593adc4469b86260085d8ac3148c6d5a65a669", + "rev": "f4a8c7d56584b087ae1eff81f4419029ab42fa69", "type": "github" }, "original": { @@ -294,11 +294,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", + "lastModified": 1684049129, + "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1", "type": "github" }, "original": { @@ -325,11 +325,11 @@ }, "nur": { "locked": { - "lastModified": 1684078972, - "narHash": "sha256-HfzRAo1bgQInTLXSb2EkaKUv8vlWP2jzgWH8qdxNFCA=", + "lastModified": 1684132416, + "narHash": "sha256-o0NSL/e4uFSC38wRXFWhgGKaDcr2baG2pvE2uWlVkkI=", "owner": "nix-community", "repo": "NUR", - "rev": "a04e5e31112cf7307e1c63cfd7278a5e322ac689", + "rev": "e3e76e6f738839784188d6509216b9d9b9098f84", "type": "github" }, "original": { @@ -384,11 +384,11 @@ ] }, "locked": { - "lastModified": 1683638678, - "narHash": "sha256-IkcWKy/zODPLcTpb7L8VqfZQzLbKTyZdk8nWjiLCXL4=", + "lastModified": 1684089337, + "narHash": "sha256-dnRmOMgRAuDznbwMjzMoVolAh8btGLF9OhLtjw1FTTk=", "owner": "chvp", "repo": "tetris", - "rev": "0f1d98f8f54ce4c0502ca0d2ea1bebc334e5afbd", + "rev": "74f5a0436f7155440f2b20e978c68cfae7cfe489", "type": "github" }, "original": { diff --git a/patches/231473.patch b/patches/231473.patch new file mode 100644 index 00000000..2533b407 --- /dev/null +++ b/patches/231473.patch @@ -0,0 +1,60 @@ +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;