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

Merge pull request #58715 from booxter/patchelf-version-bump

Browse Source 
Bump patchelf and patchelfUnstable to 0.10
This commit is contained in:
Domen Kožar 2019-09-09 16:51:51 +02:00 committed by GitHub
commit 41ad32febe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,27 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "patchelf-0.9"; name = "patchelf-${version}";
version = "0.10";
src = fetchurl { src = fetchurl {
url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
}; };
# 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 ]; setupHook = [ ./setup-hook.sh ];
doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ];
# if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
doCheck = stdenv.hostPlatform.isMusl;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://nixos.org/patchelf.html; homepage = https://nixos.org/patchelf.html;

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

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