public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 'staging' into multiple-outputs

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2014-08-23 16:04:53 +02:00
parent db83d9a35b 084626deec
commit 96cec2a7bd
6628 changed files with 165219 additions and 65293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/patchelf/default.nix
+4 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "patchelf-0.6";
name = "patchelf-0.8";
src = fetchurl {
url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
sha256 = "fc7e7fa95f282fc37a591a802629e0e1ed07bc2a8bf162228d9a69dd76127c01";
sha256 = "c99f84d124347340c36707089ec8f70530abd56e7827c54d506eb4cc097a17e7";
};
doCheck = true;
@@ -14,5 +14,7 @@ stdenv.mkDerivation rec {
homepage = http://nixos.org/patchelf.html;
license = "GPL";
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all;
};
}
pkgs/development/tools/misc/patchelf/unstable.nix
-16
View File
@@ -1,16 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "patchelf-0.7pre160_1c057cd";
src = fetchurl {
url = http://hydra.nixos.org/build/2961500/download/2/patchelf-0.7pre160_1c057cd.tar.bz2;
sha256 = "bbc46169f6b6803410e0072cf57e631481e3d5f1dde234f4eacbccb6562c5f4f";
};
meta = {
homepage = http://nixos.org/patchelf.html;
license = "GPL";
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
};
}