| Commit message (Collapse) | Author | Age |
| |
|
|
|
|
|
|
|
| |
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apr/versions
|
|
|
|
| |
It is deprecated and will be removed after 18.09.
|
| |
|
| |
|
| |
|
|
|
|
| |
Make either 'bin' or 'out' the first output.
|
|
|
|
| |
Also refactor meta.
|
|\
| |
| |
| | |
Many non-conflict problems weren't (fully) resolved in this commit yet.
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| | |
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libsndfile/default.nix
pkgs/misc/cups/default.nix
pkgs/top-level/all-packages.nix
|
| |
| |
| |
| |
| | |
Also drop the accept4 hack because Linux 2.6.32 is now the minimal
kernel version supported by Nixpkgs.
|
|/
|
|
|
| |
This is important because apr stores a copy of libtool, which in turn
contains a reference to GCC.
|
| |
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=34374
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=32303
|
|
|
|
|
|
|
| |
* apr-util updated to 1.3.12.
* httpd updated to 2.2.19.
svn path=/nixpkgs/trunk/; revision=27487
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=23046
|
| |
|
|
|
|
|
|
|
| |
2.6.28. It's rather unfortunate that the result of building apr
depends on the capabilities of the kernel on which it's built...
svn path=/nixpkgs/trunk/; revision=19903
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=19766
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=17767
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=16615
|
|
|
|
|
|
| |
its own copies.
svn path=/nixpkgs/trunk/; revision=12971
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=10502
|
|
|
|
|
|
|
|
|
| |
URLs to http://nix.cs.uu.nl/dist/tarballs. With content-addressable
mirror support (r9190, NIXPKGS-70) this is no longer necessary:
fetchurl will try to download from that location automatically. So
we can keep the original URLs.
svn path=/nixpkgs/trunk/; revision=9192
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=6711
|
|
svn path=/nixpkgs/trunk/; revision=6484
|