From 4f03bfebd9e2a06c4dc64157d277c4871f0c9e38 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 May 2025 11:31:34 +0200 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f02fddb8acef29a8b32f10a335d44828d7825b78?narHash=sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds%2Bhc%3D' (2025-05-01) → 'github:NixOS/nixpkgs/adaa24fbf46737f3f1b5497bf64bae750f82942e?narHash=sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY%3D' (2025-05-13) (cherry picked from commit 3ba49d7ec204c2985ef0cffd6e8ceefab448e475) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b8ff29a0c..3075eabc2 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { From dc238ba1029732aa87f7056b0f741c99a10b936e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 May 2025 12:55:08 +0200 Subject: [PATCH 2/3] Fix nix-copy-closure VM test https://hydra.nixos.org/build/297112538 (cherry picked from commit d626348f42c60a9a3192b43b13dd27ebb6252ad8) --- tests/nixos/nix-copy-closure.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/nixos/nix-copy-closure.nix b/tests/nixos/nix-copy-closure.nix index 34e3a2c7d..d24930de0 100644 --- a/tests/nixos/nix-copy-closure.nix +++ b/tests/nixos/nix-copy-closure.nix @@ -61,12 +61,10 @@ in "${pkgs.openssh}/bin/ssh-keygen", "-t", "ed25519", "-f", "key", "-N", "" ], capture_output=True, check=True) - client.succeed("mkdir -m 700 /root/.ssh") client.copy_from_host("key", "/root/.ssh/id_ed25519") client.succeed("chmod 600 /root/.ssh/id_ed25519") # Install the SSH key on the server. - server.succeed("mkdir -m 700 /root/.ssh") server.copy_from_host("key.pub", "/root/.ssh/authorized_keys") server.wait_for_unit("sshd") server.wait_for_unit("multi-user.target") From 2b7e3e9b817c3e7ab072b33b397b9ced42c17891 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Thu, 15 May 2025 21:13:13 +0000 Subject: [PATCH 3/3] dev-shell: Drop bear dependency Since the autotools-based build system has been removed and meson already generates compile database there's no need to have it in the devshell. (cherry picked from commit 67535263a577699002b9b0d05c2eea3f9615dd73) --- packaging/dev-shell.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix index be760496a..8d3fa3852 100644 --- a/packaging/dev-shell.nix +++ b/packaging/dev-shell.nix @@ -119,9 +119,6 @@ pkgs.nixComponents2.nix-util.overrideAttrs ( (pkgs.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript) pkgs.buildPackages.nixfmt-rfc-style ] - # TODO: Remove the darwin check once - # https://github.com/NixOS/nixpkgs/pull/291814 is available - ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) ( lib.hiPrio pkgs.buildPackages.clang-tools )