From 4f1c95024c64ddef011c8c5e86845449d1c68395 Mon Sep 17 00:00:00 2001 From: guangtao Date: Sat, 16 Nov 2024 17:23:22 -0800 Subject: [PATCH] chore(tests): cleanup --- local/flake.lock | 18 +++++++++--------- tests/darwin/expr.nix | 28 ---------------------------- tests/darwin/format.nix | 6 ------ tests/srvos/expr.nix | 22 ---------------------- tests/srvos/format.nix | 6 ------ 5 files changed, 9 insertions(+), 71 deletions(-) delete mode 100644 tests/darwin/expr.nix delete mode 100644 tests/darwin/format.nix delete mode 100644 tests/srvos/expr.nix delete mode 100644 tests/srvos/format.nix diff --git a/local/flake.lock b/local/flake.lock index fc74fc4..d915db2 100755 --- a/local/flake.lock +++ b/local/flake.lock @@ -28,11 +28,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708539134, - "narHash": "sha256-F4QtnwbcbRY146ZC0E1NHkJhNOn98pIBLSrPsrg8Mgk=", + "lastModified": 1731804449, + "narHash": "sha256-1ka+5B90UAt7D5kkT9dOExGLJjtLM8dqLeBdFRoeuWg=", "owner": "nix-community", "repo": "namaka", - "rev": "7d9535cac71b773dc0bdac7d6369b6836d1be7aa", + "rev": "6a8f92b7963e772adee605f7e1a683ad92df0190", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717893485, - "narHash": "sha256-WMU6ZRZrBgEUDIF0siu2aIyVAXcxfElSwzZtS/mSpN4=", + "lastModified": 1731763621, + "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bcedce9f4de37570242faf16e1e143583407eab", + "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", "type": "github" }, "original": { diff --git a/tests/darwin/expr.nix b/tests/darwin/expr.nix deleted file mode 100644 index 79400a4..0000000 --- a/tests/darwin/expr.nix +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-FileCopyrightText: 2023 The omnibus Authors -# SPDX-FileCopyrightText: 2024 The omnibus Authors -# -# SPDX-License-Identifier: MIT - -{ - debug, - lib, - root, - omnibus, -}: -let - out = root.nixos.pops.exports.default; -in -{ - darwinFontProfile = - (out.layouts.darwinConfiguration [ - omnibus.darwinProfiles.presets.homebrew - omnibus.darwinProfiles.presets.nix.default - { homebrew.__profiles__.enableFonts = true; } - ]).config.homebrew.casks; - - darwinNixProfile = - (out.layouts.darwinConfiguration [ omnibus.darwinProfiles.presets.nix.default ]) - .config.nix.extraOptions; -} - -// lib.optionalAttrs debug { } diff --git a/tests/darwin/format.nix b/tests/darwin/format.nix deleted file mode 100644 index 85889da..0000000 --- a/tests/darwin/format.nix +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: 2023 The omnibus Authors -# SPDX-FileCopyrightText: 2024 The omnibus Authors -# -# SPDX-License-Identifier: MIT - -"pretty" diff --git a/tests/srvos/expr.nix b/tests/srvos/expr.nix deleted file mode 100644 index 70053c9..0000000 --- a/tests/srvos/expr.nix +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-FileCopyrightText: 2023 The omnibus Authors -# SPDX-FileCopyrightText: 2024 The omnibus Authors -# -# SPDX-License-Identifier: MIT - -{ - debug, - lib, - root, -}: -let - exporter = root.nixos.pops.exports.default; -in -{ - srvosCommonOpenssh = - (exporter.layouts.nixosConfiguration [ - exporter.layouts.outputs.nixosProfiles.default.presets.boot - # -- suites profile -- - exporter.layouts.outputs.nixosProfiles.default.cloud.default - ]).config.services.openssh.settings.KexAlgorithms; -} -// lib.optionalAttrs debug { } diff --git a/tests/srvos/format.nix b/tests/srvos/format.nix deleted file mode 100644 index 85889da..0000000 --- a/tests/srvos/format.nix +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: 2023 The omnibus Authors -# SPDX-FileCopyrightText: 2024 The omnibus Authors -# -# SPDX-License-Identifier: MIT - -"pretty"