mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 18:42:15 +00:00
7079e744d4
Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix |
||
---|---|---|
.. | ||
BerkeleyDB | ||
Compress-Raw-Zlib | ||
DB_File | ||
DBD-mysql | ||
DBD-Pg | ||
DBD-SQLite | ||
expression-generator | ||
File-Slurp | ||
generic | ||
maatkit | ||
boost-geometry-utils-fix-oom.patch | ||
catalyst-fix-chunked-encoding.patch | ||
catalyst-plugin-static-simple-etag.patch | ||
CatalystXScriptServerStarman-fork-arg.patch | ||
dbiclassx-fix.patch | ||
gd-options-passthrough-and-fontconfig.patch | ||
Google-ProtocolBuffers-multiline-comments.patch | ||
lwp-protocol-https-cert-file.patch | ||
module-pluggable.patch | ||
MooseXAttributeHelpers-perl-5.20.patch | ||
net-amazon-ec2-ipv6.patch | ||
net-amazon-ec2-nova-compat.patch | ||
net-amazon-mechanicalturk.patch | ||
perl-opengl-gl-extensions.txt | ||
perl-opengl.patch | ||
perl-POE-1.367-pod_linkcheck.patch | ||
perl-POE-1.367-pod_no404s.patch | ||
Unicode-String-perl-5-22.patch | ||
WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch | ||
xml-grove-utf8.patch |