diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-02-20 21:43:09 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-02-20 22:30:51 +0100 |
| commit | 97875ac1757ceb10177b78b4479776fba64e47b2 (patch) | |
| tree | 51bc6752e687365d8a1b10cf9a30299f054181f7 /pkgs | |
| parent | d67ba6c5aba1157ec24154ed3a722aef43463843 (diff) | |
| download | nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.gz nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.bz2 nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.lz nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.xz nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.zst nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.zip | |
bridge-utils: align attrname with pkgname
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/xen/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ea7b043c344..eaf983f7bbc 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper, +{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0d98c7dfzv1gj5ssbyln4pbkbml6rrmy22v5v4ricbsx9qhhwc1l"; }; - buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs ]; + buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; dontStrip = true; diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 5b0a2845e9c..e6ad49f2035 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2 , lvm2, utillinux, procps, texinfo, perl, pythonPackages -, glib, bridge_utils, xlibs, pixman, iproute, udev, bison +, glib, bridge-utils, xlibs, pixman, iproute, udev, bison , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , checkpolicy, transfig, glusterfs, fetchgit, xz }: @@ -92,7 +92,7 @@ stdenv.mkDerivation { [ which zlib pkgconfig SDL openssl libuuid gettext ncurses dev86 iasl pciutils bzip2 xz texinfo perl yajl pythonPackages.python pythonPackages.wrapPython - glib bridge_utils pixman iproute udev bison xlibs.libX11 + glib bridge-utils pixman iproute udev bison xlibs.libX11 flex ocaml ocamlPackages.findlib figlet libaio checkpolicy pythonPackages.markdown transfig glusterfs cmake diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d4973563d7..c18d3c014a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8436,7 +8436,7 @@ let beret = callPackage ../games/beret { }; - bridge_utils = callPackage ../os-specific/linux/bridge-utils { }; + bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; @@ -13643,6 +13643,7 @@ let adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 + bridge_utils = bridge-utils; # added 2015-02-20 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 jquery_ui = jquery-ui; # added 2014-09-07 |