diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-06-12 20:41:41 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-06-12 20:41:41 +0000 |
| commit | 7f3de607584bd21b5b2512e2551a9f13289b2d7a (patch) | |
| tree | 6e5c9453cf25d10a3e2385a9764807d2c11179a3 /pkgs/top-level/unix-tools.nix | |
| parent | 2ed34da4cec1656f35d048a5075cf961251a9459 (diff) | |
| parent | 4d5565e87e134ccdb9e245c1753b086e2b0a20e7 (diff) | |
| download | nixlib-7f3de607584bd21b5b2512e2551a9f13289b2d7a.tar nixlib-7f3de607584bd21b5b2512e2551a9f13289b2d7a.tar.gz nixlib-7f3de607584bd21b5b2512e2551a9f13289b2d7a.tar.bz2 nixlib-7f3de607584bd21b5b2512e2551a9f13289b2d7a.tar.lz nixlib-7f3de607584bd21b5b2512e2551a9f13289b2d7a.tar.xz nixlib-7f3de607584bd21b5b2512e2551a9f13289b2d7a.tar.zst nixlib-7f3de607584bd21b5b2512e2551a9f13289b2d7a.zip | |
Merge branch 'master' into staging
* master: (161 commits)
pcsclite: clean up after #41790
tor: 0.3.3.6 -> 0.3.3.7
opae: init at 1.0.0
tinc: 1.0.33 -> 10.0.34
tinc_pre: 1.1pre15 -> 1.1pre16
sit: 0.3.2 -> 0.4.0 (#41863)
platforms/raspberrypi: enable kernelAutoModules
libupnp: 1.6.21 -> 1.8.3 (#41684)
androidStudioPackages.{dev,canary}: 3.2.0.16 -> 3.2.0.17
tdesktop: 1.3.0 -> 1.3.7
gns3Packages.{server,gui}{Stable,Preview}: 2.1.6 -> 2.1.7
aws-sam-cli: init at 0.3.0 (#41877)
nixos/nat: optional networking.nat.externalInterface (#41864)
linux: 4.17 -> 4.17.1
linux: 4.16.14 -> 4.16.15
linux: 4.14.48 -> 4.14.49
nixos/unbound: add restart (#41885)
maintainers/create-azure.sh: remove hydra.nixos.org as binary cache (#41883)
gshogi: init at 0.5.1 (#41840)
neovim: add missing libiconv
...
Diffstat (limited to 'pkgs/top-level/unix-tools.nix')
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 34d04fdec492..c1bd46ad68dc 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -81,6 +81,10 @@ let linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; }; + locale = { + linux = pkgs.glibc; + darwin = pkgs.netbsd.locale; + }; logger = { linux = pkgs.utillinux; }; |