diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-29 12:18:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-29 12:18:18 +0100 |
commit | bdfba1a95486a0941eb538a3330a217ff07d1be7 (patch) | |
tree | 84bd9237b2940b3a5a9b2718130c1c4c364616ce /pkgs/tools/misc | |
parent | f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab (diff) | |
parent | eceab20f28eda23fdb34212bc0ed5e8d947c932d (diff) | |
download | nixlib-bdfba1a95486a0941eb538a3330a217ff07d1be7.tar nixlib-bdfba1a95486a0941eb538a3330a217ff07d1be7.tar.gz nixlib-bdfba1a95486a0941eb538a3330a217ff07d1be7.tar.bz2 nixlib-bdfba1a95486a0941eb538a3330a217ff07d1be7.tar.lz nixlib-bdfba1a95486a0941eb538a3330a217ff07d1be7.tar.xz nixlib-bdfba1a95486a0941eb538a3330a217ff07d1be7.tar.zst nixlib-bdfba1a95486a0941eb538a3330a217ff07d1be7.zip |
Merge branch 'master' into update/grv-0.2.0
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/execline/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fortune/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/misc/fzf/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/logstash/6.x.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/misc/mktorrent/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/pv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/remind/default.nix | 2 |
8 files changed, 31 insertions, 19 deletions
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 6cd9623ad1c0..0b606882a5c3 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.0.3"; + version = "2.5.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "1q0izb8ajzxl36fjpy4rn63sz01055r9s33fga99jprdmkkfzz6x"; + sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn"; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 5e6db9fdc209..59c0396eebea 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -2,24 +2,25 @@ stdenv.mkDerivation { name = "fortune-mod-1.99.1"; - + src = fetchurl { url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz; sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw"; }; - + buildInputs = [ recode ]; - + preConfigure = '' - sed -i "s|/usr/|$out/|" Makefile + sed -i "s|/usr/|$out/|" Makefile ''; preBuild = '' makeFlagsArray=("CC=$CC" "REGEXDEFS=-DHAVE_REGEX_H -DPOSIX_REGEX" "LDFLAGS=") ''; - + postInstall = '' - ln -s $out/games/fortune $out/bin/fortune + mv $out/games/fortune $out/bin/fortune + rmdir $out/games ''; meta = { diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index e8e2152f7110..b85d2bffc341 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -42,8 +42,8 @@ buildGoPackage rec { cp $src/bin/fzf-tmux $bin/bin mkdir -p $man/share/man cp -r $src/man/man1 $man/share/man - mkdir -p $out/share/vim-plugins - ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} + mkdir -p $out/share/vim-plugins/${name} + cp -r $src/plugin $out/share/vim-plugins/${name} cp -R $src/shell $bin/share/fzf cat <<SCRIPT > $bin/bin/fzf-share diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 6aa3fd836965..4f15ba90d39d 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -1,12 +1,23 @@ -{ stdenv, fetchurl, elk6Version, makeWrapper, jre }: +{ elk6Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre +}: + +with stdenv.lib; stdenv.mkDerivation rec { version = elk6Version; - name = "logstash-${version}"; + name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "07j3jjg5ik4gjgvcx15qqqas9p1m3815jml82a5r1ip9l6vc4h20"; + sha256 = + if enableUnfree + then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr" + else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w"; }; dontBuild = true; @@ -35,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; homepage = https://www.elastic.co/products/logstash; - license = licenses.asl20; + license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 6f56267ebf72..da1e8be7cf49 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://mktorrent.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - maintainers = with stdenv.lib.maintainers; [viric Profpatsch]; + maintainers = with stdenv.lib.maintainers; [Profpatsch]; }; } diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index b884a23ca7bc..f92f03c4cc79 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180622"; + name = "parallel-20180722"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1n91dnnl8d8pman20hr03l9qrpc9wm5hw32ph45xjs0bgp1nmk7j"; + sha256 = "06635p9w4kl0mvqlbgglsndl1zm06f65ckzrjl9p8n4cswf443fg"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index f453199835f5..8c965da451d7 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; license = stdenv.lib.licenses.artistic2; - maintainers = with stdenv.lib.maintainers; [ viric jgeerds ]; + maintainers = with stdenv.lib.maintainers; [ jgeerds ]; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 8dcc9ef81ff6..d9933e0018f9 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric raskin kovirobi]; + maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; platforms = with stdenv.lib.platforms; linux; }; } |