diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-23 20:06:21 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-23 20:06:21 +0000 |
| commit | 38e3d7bc86d2a48dd4d653fd3f142f422c075563 (patch) | |
| tree | c393d2e331ff60908a2e00727fa4d2b852e85d3b /pkgs/os-specific/linux/acpi-call/default.nix | |
| parent | 79232c5f54c47e8359262601243d2878e2ab5512 (diff) | |
| parent | 65e7aeda65e30ceb44c6d8773bbf69dd122bd9c9 (diff) | |
| download | nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.gz nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.bz2 nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.lz nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.xz nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.zst nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.zip | |
svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you please look at this? svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
Diffstat (limited to 'pkgs/os-specific/linux/acpi-call/default.nix')
0 files changed, 0 insertions, 0 deletions