diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-03 19:21:27 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-03 20:38:44 +0100 |
| commit | 82419575aa66135e83971f92896435d87f206b5a (patch) | |
| tree | a10f3d35bb4b6dc4da4b34d5729ecf2c088afaf2 /pkgs | |
| parent | 1799d134ba4e388d928ebb8b7c47661dd5eb6ca8 (diff) | |
| download | nixpkgs-82419575aa66135e83971f92896435d87f206b5a.tar nixpkgs-82419575aa66135e83971f92896435d87f206b5a.tar.gz nixpkgs-82419575aa66135e83971f92896435d87f206b5a.tar.bz2 nixpkgs-82419575aa66135e83971f92896435d87f206b5a.tar.lz nixpkgs-82419575aa66135e83971f92896435d87f206b5a.tar.xz nixpkgs-82419575aa66135e83971f92896435d87f206b5a.tar.zst nixpkgs-82419575aa66135e83971f92896435d87f206b5a.zip | |
btrfsProgs -> canonical btrfs-progs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix (renamed from pkgs/tools/filesystems/btrfsprogs/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/tools/misc/snapper/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 5a51749652d..1d9b1737f65 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper , go, sqlite, iproute, bridge-utils, devicemapper -, btrfsProgs, iptables, e2fsprogs, xz, utillinux +, btrfs-progs, iptables, e2fsprogs, xz, utillinux , enableLxc ? false, lxc }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - makeWrapper go sqlite iproute bridge-utils devicemapper btrfsProgs + makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs iptables e2fsprogs ]; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 53da1607087..53da1607087 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 0f28b15ea97..41a5a6797d1 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfsProgs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }: +{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }: stdenv.mkDerivation rec { name = "snapper-0.2.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b"; }; - buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfsProgs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ]; + buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ]; patchPhase = '' # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a405d07b327..731089c20b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -733,7 +733,7 @@ let bsod = callPackage ../misc/emulators/bsod { }; - btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; + btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; bwm_ng = callPackage ../tools/networking/bwm-ng { }; @@ -15894,6 +15894,7 @@ aliases = with self; rec { saneBackends = sane-backends; # added 2016-01-02 saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 + btrfsProgs = btrfs-progs; # added 2016-01-03 }; tweakAlias = _n: alias: with lib; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71980a33e2d..f6da9a1d4f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1430,7 +1430,7 @@ in modules // { sha256 = "e61768fa19934bd176799f90bda3ea9f49a5def21fa2523a8e47df8a48e730e9"; }; - buildInputs = with self; [ pkgs.btrfsProgs ]; + buildInputs = with self; [ pkgs.btrfs-progs ]; propagatedBuildInputs = with self; [ contextlib2 pyxdg pycparser alembic ] ++ optionals (!isPyPy) [ cffi ]; |