aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/tools/misc
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-09-21 20:05:09 +0200
committerVladimír Čunát <v@cunat.cz>2019-09-21 20:05:09 +0200
commitf8a8fc6c7c079de430fa528f688ddac781bcef16 (patch)
tree08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/development/tools/misc
parent6be720b3a756662bb31adfdc1948553a02057c16 (diff)
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r--pkgs/development/tools/misc/patchelf/default.nix19
-rw-r--r--pkgs/development/tools/misc/patchelf/unstable.nix26
-rw-r--r--pkgs/development/tools/misc/sysbench/default.nix4
3 files changed, 22 insertions, 27 deletions
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index db8bb4f4243..77d03f299f4 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -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;
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index f5ff1c74bcc..c673bd26109 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -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;
};
}
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index 8076925f29b..e2d507ab801 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysqlclient
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql
, libaio }:
stdenv.mkDerivation {
name = "sysbench-1.0.17";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ vim libmysqlclient libaio ];
+ buildInputs = [ vim mysql.connector-c libaio ];
src = fetchFromGitHub {
owner = "akopytov";