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

Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
This commit is contained in:
Vladimír Čunát
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/tools/misc/patchelf/default.nix
View File

@@ -1,27 +1,16 @@
{ stdenv, fetchurl, autoreconfHook }:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "patchelf-${version}";
version = "0.10";
name = "patchelf-0.9";
src = fetchurl {
url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
};
# Drop test that fails on musl (?)
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace tests/Makefile.am \
--replace "set-rpath-library.sh" ""
'';
setupHook = [ ./setup-hook.sh ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ];
# if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
doCheck = stdenv.hostPlatform.isMusl;
doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
meta = with stdenv.lib; {
homepage = https://nixos.org/patchelf.html;

26
pkgs/development/tools/misc/patchelf/unstable.nix
View File

@@ -1,18 +1,24 @@
{ stdenv, fetchurl, autoreconfHook }:
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
name = "patchelf-${version}";
version = "0.10";
pname = "patchelf";
version = "0.10-pre-20190328";
src = fetchurl {
url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
src = fetchFromGitHub {
owner = "NixOS";
repo = "patchelf";
rev = "e1e39f3639e39360ceebb2f7ed533cede4623070";
sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k";
};
# Drop test that fails on musl (?)
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace tests/Makefile.am \
--replace "set-rpath-library.sh" ""
'' +
# extend version identifier to more informative than "0.10".
''
echo -n ${version} > version
'';
setupHook = [ ./setup-hook.sh ];
@@ -22,11 +28,11 @@ stdenv.mkDerivation rec {
doCheck = !stdenv.isDarwin;
meta = with stdenv.lib; {
meta = {
homepage = https://nixos.org/patchelf.html;
license = licenses.gpl3;
license = "GPL";
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
maintainers = [ maintainers.eelco ];
platforms = platforms.all;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all;
};
}