diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-19 08:48:32 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-19 08:57:59 +0200 |
| commit | 5aa530f2a8f6ee640b166786a32fbf6788993516 (patch) | |
| tree | 4eab3efa3ee765544ec04eccf28a004d81289686 /pkgs/top-level/all-packages.nix | |
| parent | cbdcc20e7778630cd67f6425c70d272055e2fecd (diff) | |
| parent | 2f22bbe1500dc7439c44daa3d996cc7ac5f3fd15 (diff) | |
| download | nixlib-5aa530f2a8f6ee640b166786a32fbf6788993516.tar nixlib-5aa530f2a8f6ee640b166786a32fbf6788993516.tar.gz nixlib-5aa530f2a8f6ee640b166786a32fbf6788993516.tar.bz2 nixlib-5aa530f2a8f6ee640b166786a32fbf6788993516.tar.lz nixlib-5aa530f2a8f6ee640b166786a32fbf6788993516.tar.xz nixlib-5aa530f2a8f6ee640b166786a32fbf6788993516.tar.zst nixlib-5aa530f2a8f6ee640b166786a32fbf6788993516.zip | |
Merge branch 'master' into staging
A few thousand rebuilds from master.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c60e66936692..ea47d41fc348 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -954,6 +954,8 @@ with pkgs; fsmark = callPackage ../tools/misc/fsmark { }; + fwup = callPackage ../tools/misc/fwup { }; + fzf = callPackage ../tools/misc/fzf { }; fzy = callPackage ../tools/misc/fzy { }; @@ -11520,6 +11522,10 @@ with pkgs; disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; + displaylink = callPackage ../os-specific/linux/displaylink { + inherit (linuxPackages) evdi; + }; + dmidecode = callPackage ../os-specific/linux/dmidecode { }; dmtcp = callPackage ../os-specific/linux/dmtcp { }; @@ -11882,12 +11888,12 @@ with pkgs; cpupower = callPackage ../os-specific/linux/cpupower { }; - displaylink = callPackage ../os-specific/linux/displaylink { }; - dpdk = callPackage ../os-specific/linux/dpdk { }; exfat-nofuse = callPackage ../os-specific/linux/exfat { }; + evdi = callPackage ../os-specific/linux/evdi { }; + pktgen = callPackage ../os-specific/linux/pktgen { }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; |