diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-27 18:43:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 18:43:03 -0500 |
| commit | 75616ceb49d4e51a3c8efbebc17c09553707fb2c (patch) | |
| tree | 23c9dfd0b70ce4449be8ebef66919e6239a90f2b /pkgs/development/tools/misc | |
| parent | 9c4745fe73d986e894732501a5de078b3d2bbc30 (diff) | |
| parent | 49455d7bae2f81c5c984faa6728c9017123fa798 (diff) | |
| download | nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.gz nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.bz2 nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.lz nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.xz nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.zst nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.zip | |
Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
Diffstat (limited to 'pkgs/development/tools/misc')
5 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 37ec63627b15..cbf5883b2973 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -6,8 +6,6 @@ , utillinux }: -assert stdenv.isLinux -> (utillinux != null); - stdenv.mkDerivation rec { name = "creduce-${version}"; version = "2.7.0"; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 9a8c24fa1685..c4994ad24d79 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 makeWrapper ]; - buildInputs = [ libbsd perl SysCPU ]; + buildInputs = [ perl SysCPU libbsd ]; postInstall = '' substituteInPlace $out/bin/compiler_test.pl \ diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index eea54dbdf8be..236402b56634 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tracing tools (kernel + user space) for Linux"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index edfc7dc30ca6..b708ce490d29 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LTTng Userspace Tracer libraries"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 45dd86db41b2..36a89726e81c 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lttv-1.5"; src = fetchurl { - url = "http://lttng.org/files/packages/${name}.tar.bz2"; + url = "https://lttng.org/files/packages/${name}.tar.bz2"; sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical trace viewer for LTTng trace files"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. # The rest of the LTTV package is distributed under the GNU GPL v2. license = with licenses; [ gpl2 lgpl21 ]; |