summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/duf/default.nix2
-rw-r--r--pkgs/tools/misc/ethminer/default.nix11
-rw-r--r--pkgs/tools/misc/lf/default.nix6
-rw-r--r--pkgs/tools/misc/patdiff/default.nix4
-rw-r--r--pkgs/tools/misc/yad/default.nix4
5 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix
index 29456f54cd16..ed8a11e182c9 100644
--- a/pkgs/tools/misc/duf/default.nix
+++ b/pkgs/tools/misc/duf/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
homepage = "https://github.com/muesli/duf/";
description = "Disk Usage/Free Utility";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ petabyteboy penguwin ];
};
}
diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix
index d593d677cc32..f84b0096d044 100644
--- a/pkgs/tools/misc/ethminer/default.nix
+++ b/pkgs/tools/misc/ethminer/default.nix
@@ -1,5 +1,5 @@
{
- stdenv,
+ clangStdenv,
fetchFromGitHub,
opencl-headers,
cmake,
@@ -16,7 +16,11 @@
cli11
}:
-stdenv.mkDerivation rec {
+# Note that this requires clang < 9.0 to build, and currently
+# clangStdenv provides clang 7.1 which satisfies the requirement.
+let stdenv = clangStdenv;
+
+in stdenv.mkDerivation rec {
pname = "ethminer";
version = "0.18.0";
@@ -71,8 +75,5 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ nand0p ];
license = licenses.gpl2;
- # Doesn't build with gcc9, and if overlayed to use gcc8 stdenv fails on CUDA issues.
- broken = true;
};
-
}
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index da6fa0a338ef..c3cb3200e06f 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lf";
- version = "17";
+ version = "18";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
- sha256 = "0hs70hbbwz9kbbf13l2v32yv70n4aw8sz7rky82qdcqcpnpisjq8";
+ sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6";
};
- vendorSha256 = "1xjanlq67b6n07pha6ljgnl3n2ks4x3albvca317l68cvjiw3shs";
+ vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix
index e0b54e56081d..dcd06ce1d2b7 100644
--- a/pkgs/tools/misc/patdiff/default.nix
+++ b/pkgs/tools/misc/patdiff/default.nix
@@ -4,8 +4,8 @@ with ocamlPackages;
janePackage {
pname = "patdiff";
- hash = "1yqvxdmkgcwgx3npgncpdqwkpdxiqr1q41wci7589s8z7xi5nwyz";
- buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre shell ];
+ hash = "1yslj6xxyv8rx8y5s1civ1zq8y6vvxmkszdds958zdm1p1ign54r";
+ buildInputs = [ core patience_diff ocaml_pcre ];
meta = {
description = "File Diff using the Patience Diff algorithm";
};
diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix
index d00d737c17ce..889c266d28e2 100644
--- a/pkgs/tools/misc/yad/default.nix
+++ b/pkgs/tools/misc/yad/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yad";
- version = "6.0";
+ version = "7.2";
src = fetchFromGitHub {
owner = "v1cont";
repo = "yad";
rev = "v${version}";
- sha256 = "07myjv0g0iwgclc6q9wkj25myhlc86ahy2lqma8vgv9i3rgy03p7";
+ sha256 = "0ih97hrcra2bg8q19b8819hip1p424z1vj61cl1ym5p477rp37yx";
};
configureFlags = [