diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-19 18:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 18:01:10 +0000 |
| commit | c0cb54f9eeb0c607a08097f84096728aa8ea615d (patch) | |
| tree | c171280941f68726ff0bd35e895cc3c2cd0e918d /pkgs/top-level | |
| parent | c605362140796ff800e34b10d008a7ce7864b500 (diff) | |
| parent | 6cc55fd6380dd892f1d41ba7d07efa2a813d38fe (diff) | |
| download | nixpkgs-c0cb54f9eeb0c607a08097f84096728aa8ea615d.tar nixpkgs-c0cb54f9eeb0c607a08097f84096728aa8ea615d.tar.gz nixpkgs-c0cb54f9eeb0c607a08097f84096728aa8ea615d.tar.bz2 nixpkgs-c0cb54f9eeb0c607a08097f84096728aa8ea615d.tar.lz nixpkgs-c0cb54f9eeb0c607a08097f84096728aa8ea615d.tar.xz nixpkgs-c0cb54f9eeb0c607a08097f84096728aa8ea615d.tar.zst nixpkgs-c0cb54f9eeb0c607a08097f84096728aa8ea615d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95fa14720e3..5d3e942ca5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21194,6 +21194,8 @@ in x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; + xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; + xpadneo = callPackage ../os-specific/linux/xpadneo { }; zenpower = callPackage ../os-specific/linux/zenpower { }; |