diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/bfr/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/misc/cpuminer-multi/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/ipxe/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/less/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/logstash/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/makebootfat/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/svtplay-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/tlp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/xapian-omega/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/misc/yank/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/zsh-navigation-tools/default.nix | 4 |
12 files changed, 55 insertions, 18 deletions
diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 3be824d9a404..85bd21f9b721 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy"; }; + patches = + [ (fetchurl { + url = "https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-misc/bfr/files/bfr-1.6-perl.patch?revision=1.1"; + sha256 = "1pk9jm3c1qzs727lh0bw61w3qbykaqg4jblywf9pvq5bypk88qfj"; + }) + ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 40ebf2174ae2..4d9adc6c6886 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -2,6 +2,7 @@ , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null , autoconf, automake114x, texinfo +, withPrefix ? false }: assert aclSupport -> acl != null; @@ -39,6 +40,8 @@ let outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ]; + configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no"; + buildInputs = [ gmp ] ++ optional aclSupport acl ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch @@ -82,9 +85,21 @@ let enableParallelBuilding = false; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; + FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1"; makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; + # e.g. ls -> gls; grep -> ggrep + postFixup = # feel free to simplify on a mass rebuild + if withPrefix then + '' + ( + cd "$out/bin" + find * -type f -executable -exec mv {} g{} \; + ) + '' + else null; + meta = { homepage = http://www.gnu.org/software/coreutils/; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; @@ -105,6 +120,3 @@ let }; in self - // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) { - FORCE_UNSAFE_CONFIGURE = 1; - } diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 220063107803..4b4eb87b0ea7 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Multi-algo CPUMiner"; homepage = https://github.com/wolf9466/cpuminer-multi; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index ec9458e70aeb..e4c161b2e51c 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { { description = "Network boot firmware"; homepage = http://ipxe.org/; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index af8a0dd7d81b..75e00635320a 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.greenwoodsoftware.com/less/; description = "A more advanced file pager than ‘more’"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index ab02c7dc3d1d..15bb44a0e479 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -r {Gemfile*,vendor,lib} $out - cp bin/logstash $out/logstash - cp bin/plugin $out/logstash-plugin + cp -r {Gemfile*,vendor,lib,bin} $out + mv $out/bin/plugin $out/bin/logstash-plugin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix index 03c913b72244..dc66976720d0 100644 --- a/pkgs/tools/misc/makebootfat/default.nix +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { description = "Create bootable USB disks using the FAT filesystem and syslinux"; homepage = "http://advancemame.sourceforge.net/boot-readme.html"; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 1d5da633061d..dafc30bd6472 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "0.20.2015.10.25"; + version = "0.20.2015.11.29"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0azai5clc96lhsx4kj5rvp5bhiq4bwgl51r49b9x4i5s1bhfaz40"; + sha256 = "10y0qxyyfw9kxiax3b0gdd38yz2y3lii75mgvlq6q6h77r3wham4"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 52d79a9bd5d2..d21b4fb2f3f8 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils -, kmod, pciutils, smartmontools, x86_energy_perf_policy +, module_init_tools, pciutils, smartmontools, x86_energy_perf_policy , enableRDW ? false, networkmanager }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation { buildInputs = [ perl ]; paths = lib.makeSearchPath "bin" - ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools + ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools x86_energy_perf_policy ] ++ lib.optional enableRDW networkmanager diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/tools/misc/xapian-omega/default.nix new file mode 100644 index 000000000000..68241ac0e907 --- /dev/null +++ b/pkgs/tools/misc/xapian-omega/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib }: + +stdenv.mkDerivation rec { + name = "xapian-omega-${version}"; + version = "1.2.21"; + + src = fetchurl { + url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; + sha256 = "0zjjr4ypanwrjkcpgi37d72v2jjcfwnw8lgddv0i7z2jf1fklbc6"; + }; + + buildInputs = [ pkgconfig xapian perl pcre zlib ]; + + meta = with stdenv.lib; { + description = "Indexer and CGI search front-end built on Xapian library"; + homepage = http://xapian.org/; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 049fc1b5f3fe..f6b61de2a982 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "066nsm8b5785r2zaajihf8g6x9hc4n8kpk3j2n1slp5alnhx93mx"; + sha256 = "0v1imwjp851gz86p9m3x1dd8bi649gr8j99xz6ask1pbkxvji73c"; inherit name; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.4.1"; + version = "0.6.0"; maintainers = [ maintainers.dochang ]; }; diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index ea4fc519b18b..8f335d7cf586 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-navigation-tools-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; rev = "v${version}"; - sha256 = "1akkmjxv04rfqpx49hdwfwjp2842xpk0q7w5ymywzl0w4ldm2lmc"; + sha256 = "1xj1jakcrf0sfkiq6l1drg6vzylhkk0kmhs7nz08dv18pgx9jy36"; }; dontBuild = true; |