summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-02-19 12:11:04 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-02-19 12:11:04 +0100
commit024407bf9adeadc115eeeb3fdf8dba166ea17d7c (patch)
tree0f28c316cea0b7aa95bb15a0df90077415721d71 /pkgs/top-level/all-packages.nix
parentbce12effa7f4279d057acf437e7fdcafefd16557 (diff)
parent390ed4a626211fb7d19fb8da7661c8e3b42c4795 (diff)
downloadnixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar
nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.gz
nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.bz2
nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.lz
nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.xz
nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.zst
nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.zip
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1505754
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d098130ef29..90e0c5ac601 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -173,7 +173,7 @@ in
 
   dispad = callPackage ../tools/X11/dispad { };
 
-  dump1090 = callPackage ../applications/misc/dump1090 { };
+  dump1090 = callPackage ../applications/radio/dump1090 { };
 
   ebook2cw = callPackage ../applications/radio/ebook2cw { };
 
@@ -14625,7 +14625,6 @@ in
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
-      kernelPatches.interpreter-trunc
     ];
   };