Merge pull request #162 from nix-community/remove-nixpkgs-test

treewide: remove nixpkgs-test
This commit is contained in:
nikstur 2023-04-25 01:13:37 +02:00 committed by GitHub
commit b21c4007af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 27 deletions

View File

@ -103,11 +103,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1681109905,
"narHash": "sha256-2dBz4WSjYzkjCzDgepH5i2BsN0fVQOlLseG/kt6FhZg=",
"lastModified": 1682347030,
"narHash": "sha256-HYpAMGhF82mEaozCPz7FrHRCMJK5rOGA9Ed/kyszgmY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4fba351146e26d9e09d455687b75089ac50b9b13",
"rev": "8dd0f0a459b206fc4209570f6b7ce44ae66f264e",
"type": "github"
},
"original": {
@ -133,22 +133,6 @@
"type": "github"
}
},
"nixpkgs-test": {
"locked": {
"lastModified": 1679009563,
"narHash": "sha256-jizICiQOqUcYFNHRNNOo69bfyNo36iyuRAHem5z68LQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "371d3778c4f9cee7d5cf014e6ce400d57366570f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "qemu-boot-disk-using-make-disk-image",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks-nix": {
"inputs": {
"flake-compat": [
@ -184,7 +168,6 @@
"flake-parts": "flake-parts",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"nixpkgs-test": "nixpkgs-test",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay"
}

View File

@ -3,7 +3,6 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
nixpkgs-test.url = "github:NixOS/nixpkgs/qemu-boot-disk-using-make-disk-image";
flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
@ -39,7 +38,7 @@
};
};
outputs = inputs@{ self, nixpkgs, nixpkgs-test, crane, rust-overlay, flake-parts, ... }:
outputs = inputs@{ self, nixpkgs, crane, rust-overlay, flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } ({ moduleWithSystem, ... }: {
imports = [
# Derive the output overlay automatically from all packages that we define.
@ -76,8 +75,6 @@
];
};
testPkgs = import nixpkgs-test { system = "x86_64-linux"; };
inherit (pkgs) lib;
uefi-rust-stable = pkgs.rust-bin.fromRustupToolchainFile ./rust/stub/rust-toolchain.toml;
@ -178,7 +175,7 @@
toolClippy = toolCrane.clippy;
stubClippy = stubCrane.clippy;
} // (import ./nix/tests/lanzaboote.nix {
inherit pkgs testPkgs;
inherit pkgs;
lanzabooteModule = self.nixosModules.lanzaboote;
});

View File

@ -1,12 +1,11 @@
{ pkgs
, testPkgs
, lanzabooteModule
}:
let
inherit (pkgs) lib;
mkSecureBootTest = { name, machine ? { }, useSecureBoot ? true, testScript }: testPkgs.nixosTest {
mkSecureBootTest = { name, machine ? { }, useSecureBoot ? true, testScript }: pkgs.nixosTest {
inherit name testScript;
nodes.machine = { lib, ... }: {
imports = [