diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:35:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:46:20 +0100 |
| commit | 0a58b512cb696b2482cbac4fd3a20b43ae31c1bc (patch) | |
| tree | 7ae35a255ac57b66696c3db743f6ed9a4dab7431 /pkgs/top-level/release-small.nix | |
| parent | 284833649192072959a335367374fc0a6ec667df (diff) | |
| parent | 9c1d3bfa9f7d7b95eb20d0f729e3b3c9d7abcd4b (diff) | |
| download | nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.gz nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.bz2 nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.lz nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.xz nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.zst nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.zip | |
Merge master into stdenv-updates
Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/top-level/release-small.nix')
0 files changed, 0 insertions, 0 deletions