diff options
author | Domen Kožar <domen@dev.si> | 2019-09-09 16:51:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-09 16:51:51 +0200 |
commit | 41ad32febea7e0f661fe77a48a8cbc03baac6123 (patch) | |
tree | 1fece4d9419ed0557c29acb523c5d5c08f165bba | |
parent | 791ac31dfa8d9f9e13f0ee07f238dfc6a31476a1 (diff) | |
parent | 59bed0a7b3248b8cf5a174097508fdf35988a4ef (diff) | |
download | nixpkgs-41ad32febea7e0f661fe77a48a8cbc03baac6123.tar nixpkgs-41ad32febea7e0f661fe77a48a8cbc03baac6123.tar.gz nixpkgs-41ad32febea7e0f661fe77a48a8cbc03baac6123.tar.bz2 nixpkgs-41ad32febea7e0f661fe77a48a8cbc03baac6123.tar.lz nixpkgs-41ad32febea7e0f661fe77a48a8cbc03baac6123.tar.xz nixpkgs-41ad32febea7e0f661fe77a48a8cbc03baac6123.tar.zst nixpkgs-41ad32febea7e0f661fe77a48a8cbc03baac6123.zip |
Merge pull request #58715 from booxter/patchelf-version-bump
Bump patchelf and patchelfUnstable to 0.10
-rw-r--r-- | pkgs/development/tools/misc/patchelf/default.nix | 19 | ||||
-rw-r--r-- | pkgs/development/tools/misc/patchelf/unstable.nix | 26 |
2 files changed, 25 insertions, 20 deletions
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 77d03f299f4..db8bb4f4243 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,16 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "patchelf-0.9"; + name = "patchelf-${version}"; + version = "0.10"; src = fetchurl { 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 ]; - 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; { homepage = https://nixos.org/patchelf.html; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index c673bd26109..f5ff1c74bcc 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,24 +1,18 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - pname = "patchelf"; - version = "0.10-pre-20190328"; + name = "patchelf-${version}"; + version = "0.10"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "patchelf"; - rev = "e1e39f3639e39360ceebb2f7ed533cede4623070"; - sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k"; + src = fetchurl { + url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; + sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n"; }; # 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 ]; @@ -28,11 +22,11 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = { + meta = with stdenv.lib; { 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"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; }; } |