diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-05 12:34:05 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-05 12:34:05 +0200 |
commit | 0be2928ac9f8fa7ad2245785e586381ba8002585 (patch) | |
tree | c1d9a25219eb2e614c945aeac3e9ea33f74a135b /pkgs/shells | |
parent | 81025f9ef717895b4170bf93b234311d0f8f2386 (diff) | |
parent | 623df97af5a1bf1f5dcbf9075b0ac8cbba036e25 (diff) | |
download | nixpkgs-0be2928ac9f8fa7ad2245785e586381ba8002585.tar nixpkgs-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.gz nixpkgs-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.bz2 nixpkgs-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.lz nixpkgs-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.xz nixpkgs-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.zst nixpkgs-0be2928ac9f8fa7ad2245785e586381ba8002585.zip |
Merge branch 'master' into staging
Evaluation was blocked on Hydra; this should fix it.
Diffstat (limited to 'pkgs/shells')
0 files changed, 0 insertions, 0 deletions