diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 12:23:18 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 12:23:18 +0200 |
commit | 8da52a642a293c5b62d044d61e8dd5f5c05eaeb6 (patch) | |
tree | 0fbbc6b2a4103f52619d0df114015d79b1bb9f49 /pkgs/development/libraries/haskell/persistent-postgresql/default.nix | |
parent | 4c3e6a46754f32c059484b25e35925a92a7c9574 (diff) | |
parent | acba6b4da25e4b92e2422036104ad2040bef1acd (diff) | |
download | nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.gz nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.bz2 nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.lz nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.xz nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.zst nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.zip |
Merge branch 'staging' into v/modular
Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/persistent-postgresql/default.nix')
0 files changed, 0 insertions, 0 deletions