diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/tools/misc | |
parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
parent | a26357eefe017964448b5bb464163646b927a267 (diff) |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/tools/misc')
35 files changed, 209 insertions, 185 deletions
diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index d8f53a032af80..cdfb57fc5f0e5 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "abduco-0.5"; + name = "abduco-0.6"; meta = { homepage = http://brain-dump.org/projects/abduco; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; - sha256 = "11phry5wnvwm9ckij5gxbrjfgdz3x38vpnm505q5ldc88im248mz"; + sha256 = "1x1m58ckwsprljgmdy93mvgjyg9x3cqrzdf3mysp0mx97zhhj2f9"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index ab00d52c7779b..f9f9f06eb5181 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/misc/colord-kde/0.5.nix b/pkgs/tools/misc/colord-kde/0.5.nix new file mode 100644 index 0000000000000..9df8ace38f665 --- /dev/null +++ b/pkgs/tools/misc/colord-kde/0.5.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchgit +, extra-cmake-modules, ki18n +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils +, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem +, kitemviews, lcms2, libXrandr, qtx11extras +}: + +stdenv.mkDerivation { + name = "colord-kde-0.5.0.20160224"; + src = fetchgit { + url = "git://anongit.kde.org/colord-kde"; + rev = "3729d1348c57902b74283bc8280ffb5561b221db"; + sha256 = "03ww8nskgxl38dwkbb39by18gxvrcm6w2zg9s7q05i76rpl6kkkw"; + }; + + nativeBuildInputs = [ extra-cmake-modules ki18n ]; + + buildInputs = [ + kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes + kcmutils kio knotifications plasma-framework kwidgetsaddons + kwindowsystem kitemviews lcms2 libXrandr qtx11extras + ]; + + meta = with lib; { + homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 606595f46057e..52e1845b300f5 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation { buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ]; + patches = [ ./fix_check_include_files.patch ]; + patchFlags = [ "-p0" ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch new file mode 100644 index 0000000000000..16d14a6a647ad --- /dev/null +++ b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch @@ -0,0 +1,9 @@ +--- CMakeLists.txt.orig 2013-05-01 05:04:34.000000000 +1000 ++++ CMakeLists.txt 2015-12-10 20:43:51.351800988 +1100 +@@ -9,6 +9,7 @@ + include(FindPkgConfig) + include(KDE4Defaults) ++include(CheckIncludeFiles) + include(ConfigureChecks.cmake) + + message(STATUS "X randr is required, found: " ${XRANDR_1_3_FOUND}) \ No newline at end of file diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 3ba5a138e5a77..7e6c3f30784e2 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, fetchgit, bashCompletion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus , automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms -, libgudev }: +, libgudev, sane-backends }: stdenv.mkDerivation rec { name = "colord-1.2.12"; @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - "--with-udevrulesdir=$out/lib/udev/rules.d" + "--enable-sane" + "--with-udevrulesdir=$(out)/lib/udev/rules.d" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--localstatedir=/var" "--disable-bash-completion" @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection - bashCompletion argyllcms automake autoconf libgudev ]; + bashCompletion argyllcms automake autoconf libgudev sane-backends ]; postInstall = '' mkdir -p $out/etc/bash_completion.d diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 67249161e8413..64657d7cd3b95 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "1p66v96pz3vk1khwlmc26fg2d06c001755rrkcdv5wh8zyg6wv99"; + sha256 = "0xdgz5qlx1yr3mw2h4bwlbj94y6v2ygjy334cnc87xgzxf1wgann"; }; buildInputs = [ curl jansson ]; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index dabf843fc83b9..e65cec542186f 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -1,18 +1,20 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "datamash-${version}"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "http://ftp.gnu.org/gnu/datamash/${name}.tar.gz"; - sha256 = "0154c25c45b5506b6d618ca8e18d0ef093dac47946ac0df464fb21e77b504118"; + sha256 = "0y49zaadzirghy4xfajvsv1f5x805cjp61z212ggipx5243302qs"; }; - meta = { - description = "GNU datamash"; + meta = with stdenv.lib; { + description = "A command-line program which performs basic numeric,textual and statistical operations on input textual data files"; homepage = http://www.gnu.org/software/datamash/; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index c9340e449afaa..617cd5f554813 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.16.1"; + version = "2.16.2"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "096f26b0z6kwv47qy99gak40wcc8mp24n0nvqwgifcicr18qv4rz"; + sha256 = "0qlzciiyfhq11j5wf0x6jsa18bmmf2z7f2x5psq2wkkccfi0fxc4"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e05889fdb4b22..72a8f61bf3f03 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,14 +1,13 @@ { fetchurl, stdenv, go }: -let - version = "2.7.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "direnv-${version}"; + version = "2.8.0"; + src = fetchurl { url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz"; name = "direnv-${version}.tar.gz"; - sha256 = "3cfa8f41e740c0dc09d854f3833058caec0ea0d67d19e950f97eee61106b0daf"; + sha256 = "1l1kvjgpak7cc9s37qipfw6lybb4650zwd8kcdagm409gs89mil6"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 5969c95623696..f973f3d22645d 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { homepage = http://www.brain-dump.org/projects/dvtm; license = stdenv.lib.licenses.mit; platfroms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index b587afb645c22..b32f8f43146f4 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -1,37 +1,40 @@ -{ stdenv, fetchFromGitHub, makeWrapper, tmux, vim }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "dynamic-colors-git-${version}"; - version = "2013-12-28"; + name = "dynamic-colors-${version}"; + version = "0.2.1"; src = fetchFromGitHub { - owner = "sos4nt"; + owner = "peterhoeg"; repo = "dynamic-colors"; - rev = "35325f43620c5ee11a56db776b8f828bc5ae1ddd"; - sha256 = "1xsjanqyvjlcj1fb8x4qafskxp7aa9b43ba9gyjgzr7yz8hkl4iz"; + rev = "v${version}"; + sha256 = "061lh4qjk4671hwzmj55n3gy5hsi4p3hb30hj5bg3s6glcsbjpr5"; }; - buildInputs = [ makeWrapper ]; - - patches = [ ./separate-config-and-dynamic-root-path.patch ]; + dontBuild = true; + dontStrip = true; installPhase = '' - mkdir -p $out/bin $out/etc/bash_completion.d $out/share/dynamic-colors - cp bin/dynamic-colors $out/bin/ - cp completions/dynamic-colors.bash $out/etc/bash_completion.d/ - cp -r colorschemes $out/share/dynamic-colors/ - - sed -e 's|\<tmux\>|${tmux}/bin/tmux|g' \ - -e 's|/usr/bin/vim|${vim}/bin/vim|g' \ - -i "$out/bin/dynamic-colors" - - wrapProgram $out/bin/dynamic-colors --set DYNAMIC_COLORS_ROOT "$out/share/dynamic-colors" + mkdir -p \ + $out/bin \ + $out/share/colorschemes \ + $out/share/bash-completion/completions \ + $out/share/zsh/site-packages + + install -m755 bin/dynamic-colors $out/bin/ + install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors + install -m644 completions/dynamic-colors.zsh $out/share/zsh/site-packages/_dynamic-colors + install -m644 colorschemes/* -t $out/share/colorschemes + + sed -e "s|/usr/share/dynamic-colors|$out/share|g" \ + -i $out/bin/dynamic-colors ''; meta = { - homepage = https://github.com/sos4nt/dynamic-colors; + homepage = https://github.com/peterhoeg/dynamic-colors; license = stdenv.lib.licenses.mit; description = "Change terminal colors on the fly"; platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.peterhoeg ]; }; } diff --git a/pkgs/tools/misc/dynamic-colors/separate-config-and-dynamic-root-path.patch b/pkgs/tools/misc/dynamic-colors/separate-config-and-dynamic-root-path.patch deleted file mode 100644 index 7462ed0e3afad..0000000000000 --- a/pkgs/tools/misc/dynamic-colors/separate-config-and-dynamic-root-path.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ee44b859003972275d8e469ab41b9900420295e0 Mon Sep 17 00:00:00 2001 -From: Malte Rohde <malte.rohde@flavoursys.com> -Date: Fri, 9 Jan 2015 13:10:41 +0100 -Subject: [PATCH] Store user configuration in appropriate config location. - -So that the dynamic-colors source can live somewhere else -(e.g., /usr/local/dynamic-colors) and multiple users -can use the same script. ---- - bin/dynamic-colors | 21 ++++++++++++++++----- - 1 file changed, 16 insertions(+), 5 deletions(-) - -diff --git a/bin/dynamic-colors b/bin/dynamic-colors -index a669221..5d6bce7 100755 ---- a/bin/dynamic-colors -+++ b/bin/dynamic-colors -@@ -84,16 +84,27 @@ else - fi - COLORSCHEMES="${DYNAMIC_COLORS_ROOT}/colorschemes" - -+if [ -z "${DYNAMIC_COLORS_HOME}" ]; then -+ if [ -d "${HOME}/.dynamic-colors" ] || [ -z "${XDG_CONFIG_HOME}" ]; then -+ DYNAMIC_COLORS_HOME="${HOME}/.dynamic-colors" -+ else -+ DYNAMIC_COLORS_HOME="${XDG_CONFIG_HOME}/dynamic-colors" -+ fi -+else -+ DYNAMIC_COLORS_HOME="${DYNAMIC_COLORS_HOME%/}" -+fi -+ - write_colorscheme_name () { -- echo "$1" > "${DYNAMIC_COLORS_ROOT}/colorscheme" -+ [ ! -d "${DYNAMIC_COLORS_HOME}" ] && mkdir -p "${DYNAMIC_COLORS_HOME}" -+ echo "$1" > "${DYNAMIC_COLORS_HOME}/colorscheme" - } - - load_colorscheme_name () { -- head -1 "${DYNAMIC_COLORS_ROOT}/colorscheme" -+ head -1 "${DYNAMIC_COLORS_HOME}/colorscheme" - } - - init () { -- [ ! -f "${DYNAMIC_COLORS_ROOT}/colorscheme" ] && return -+ [ ! -f "${DYNAMIC_COLORS_HOME}/colorscheme" ] && return - colorscheme_name=$(load_colorscheme_name) - load_colorscheme "$colorscheme_name" - set_colors -@@ -142,8 +153,8 @@ audit () { - } - - cycle() { -- if [ -f "${DYNAMIC_COLORS_ROOT}/colorscheme" ]; then -- current=`head -1 "${DYNAMIC_COLORS_ROOT}/colorscheme"` -+ if [ -f "${DYNAMIC_COLORS_HOME}/colorscheme" ]; then -+ current=$(load_colorscheme_name) - found=false - cd "$COLORSCHEMES" - for file in *.sh; do diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 69ddbd6dbfe78..c6bca6e9d8f66 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.2"; + version = "3.4"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "0ikigpfzyjmr8j6snwlvxzqamrjbhlv78m8w1h0h7kzczc5f1vmi"; + sha256 = "02h1drxn2lid2fwzwjpkp9p04l0g5a56v6jyj3gi3dzjsq7h0zff"; }; postPatch = '' @@ -21,12 +21,11 @@ stdenv.mkDerivation rec { checkTarget = "test"; installFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { homepage = http://entrproject.org/; description = "Run arbitrary commands when files change"; - - license = stdenv.lib.licenses.isc; - - platforms = stdenv.lib.platforms.all; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 8518a7331b954..af6f70e2f5c13 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -4,15 +4,15 @@ with rustPlatform; buildRustPackage rec { name = "exa-${version}"; - version = "2016-02-15"; + version = "2016-03-22"; - depsSha256 = "1925nhpfph82wn755zf2nmad24f1hzbxq60gpva9sic6rnap4c1x"; + depsSha256 = "18anwh235kzziq6z7md8f3rl2xl4l9d4ivsqw9grkb7yivd5j0jk"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; - rev = "252eba484476369bb966fb1af7f739732b968fc0"; - sha256 = "1smyy32z44zgmhyhlbjaxcgfnlbcwz7am9225yppqfdsiqqgdybf"; + rev = "8805ce9e3bcd4b56f8811a686dd56c47202cdbab"; + sha256 = "0dkvk0rsf068as6zcd01p7959rdjzm26mlkpid6z0j168gp4kh4q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/findutils/change_echo_path.patch b/pkgs/tools/misc/findutils/change_echo_path.patch deleted file mode 100644 index 5bbd9aea9ac34..0000000000000 --- a/pkgs/tools/misc/findutils/change_echo_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur findutils-4.2.30/xargs/xargs.c findutils-4.2.30_new/xargs/xargs.c ---- findutils-4.2.30/xargs/xargs.c 2007-02-27 11:21:08.000000000 +0100 -+++ findutils-4.2.30_new/xargs/xargs.c 2007-07-17 19:02:05.000000000 +0200 -@@ -402,7 +402,7 @@ - int show_limits = 0; /* --show-limits */ - int always_run_command = 1; - char *input_file = "-"; /* "-" is stdin */ -- char *default_cmd = "/bin/echo"; -+ char *default_cmd = "echo"; - int (*read_args) PARAMS ((void)) = read_line; - void (*act_on_init_result)(void) = noop; - int env_too_big = 0; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index c59283fb7c39c..1271aa8c98638 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,29 +1,25 @@ { stdenv, fetchurl, coreutils }: stdenv.mkDerivation rec { - name = "findutils-4.4.2"; + name = "findutils-4.6.0"; src = fetchurl { url = "mirror://gnu/findutils/${name}.tar.gz"; - sha256 = "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3"; + sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"; }; - nativeBuildInputs = [coreutils]; + nativeBuildInputs = [ coreutils ]; - patches = [ ./findutils-path.patch ./change_echo_path.patch ./disable-test-canonicalize.patch ]; + doCheck = !stdenv.isDarwin; outputs = [ "out" "info" ]; - doCheck = true; - crossAttrs = { # http://osdir.com/ml/bug-findutils-gnu/2009-08/msg00026.html configureFlags = [ "gl_cv_func_wcwidth_works=yes" ]; }; - preConfigure = if stdenv.isCygwin then '' - sed -i gnulib/lib/fpending.h -e '/include <stdio_ext.h>/d' - '' else null; + enableParallelBuilding = true; meta = { homepage = http://www.gnu.org/software/findutils/; diff --git a/pkgs/tools/misc/findutils/disable-test-canonicalize.patch b/pkgs/tools/misc/findutils/disable-test-canonicalize.patch deleted file mode 100644 index 3a8d42eb5607a..0000000000000 --- a/pkgs/tools/misc/findutils/disable-test-canonicalize.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN findutils-4.4.2/tests/test-canonicalize.sh findutils-4.4.2_edited/tests/test-canonicalize.sh ---- findutils-4.4.2/tests/test-canonicalize.sh 2008-12-23 12:50:15.000000000 +0000 -+++ findutils-4.4.2_edited/tests/test-canonicalize.sh 2015-06-14 10:51:19.000000000 +0000 -@@ -1,5 +1,8 @@ - #!/bin/sh - -+# skipped because user might not have directory listing permission for all parents of TMPDIR -+exit 77 -+ - tmpfiles="" - trap 'rm -fr $tmpfiles' 1 2 3 15 - diff --git a/pkgs/tools/misc/findutils/findutils-path.patch b/pkgs/tools/misc/findutils/findutils-path.patch deleted file mode 100644 index be8d85be3033a..0000000000000 --- a/pkgs/tools/misc/findutils/findutils-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN findutils-4.2.20/locate/updatedb.sh findutils-4.2.20.new/locate/updatedb.sh ---- findutils-4.2.20/locate/updatedb.sh 2005-01-24 17:12:35.000000000 +0100 -+++ findutils-4.2.20.new/locate/updatedb.sh 2005-08-23 14:37:10.000000000 +0200 -@@ -141,7 +141,7 @@ - : ${code:=${LIBEXECDIR}/@code@} - - --PATH=/bin:/usr/bin:${BINDIR}; export PATH -+PATH=/bin:/usr/bin:${BINDIR}:${PATH}; export PATH - - : ${PRUNEFS="nfs NFS proc afs proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs"} - diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 925ea13780ac3..13b69dad971f7 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation { ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db ''; - meta = { + meta = with stdenv.lib; { description = "Tool for displaying hard disk temperature"; homepage = https://savannah.nongnu.org/projects/hddtemp/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index e4c161b2e51c0..4346d25ca07c9 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { preConfigure = "cd src"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index feb5710282fd4..759847b897a07 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "moreutils-${version}"; - version = "0.57"; + version = "0.58"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz"; - sha256 = "078dpkwwwrv8hxnylbc901kib2d1rr3hsja37j6dlpjfcfq58z9s"; + sha256 = "02n00vqp6jxbxr5v3rdjxmzp6kxxjdkjgcclam6wrw8qamsbljww"; }; preBuild = '' diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index f7d8d1d4e69a4..ff64b65a89b8f 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { homepage = "http://live.gnome.org/OSTree/"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d4c920f4acc8b..b4e793976c7a2 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-20160222"; + name = "parallel-20160322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1sjmvinwr9j2a0jdk9y9nf2x4hhzcbl529slkwpz0vva0cwybywd"; + sha256 = "020vfcwapla6b4c9pr5ik7kg47fswszdds2mr52kc907xi4zcc34"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 0f85a47b9e1be..9cd8c28c7f076 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -15,6 +15,5 @@ stdenv.mkDerivation rec { homepage = "http://parcellite.sourceforge.net"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; } diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 6de3474d2d749..c71f2e86e1195 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "8012"; + version = "8037"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar"; - sha256 = "12l2kmp6jaz6lmcj16ljhrpb1bm7zzz5qgvihhymvk66rfjd3ybz"; + sha256 = "1mlwcaph6n2akl639x64vpyjjipv6x0mwqxv6lvy3ml58pbgl58y"; }; # It's only a .jar file and a shell wrapper diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index e21da0deca2d2..654ba4c1795cd 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -1,13 +1,13 @@ { stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }: stdenv.mkDerivation rec { - version = "0.15.2"; + version = "0.15.6"; name = "scanmem-${version}"; src = fetchFromGitHub { owner = "scanmem"; repo = "scanmem"; rev = "v${version}"; - sha256 = "0f93ac5rycf46q60flab5nl7ksadjls13axijg5j5wy1yif0k094"; + sha256 = "16cw76ji3mp0sj8q0sz5wndavk10n0si1sm6kr5zpiws4sw047ii"; }; buildInputs = [ autoconf automake intltool libtool readline ]; preConfigure = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; maintainers = [ stdenv.lib.maintainers.chattered ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix new file mode 100644 index 0000000000000..30b632f525d2d --- /dev/null +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, buildPythonApplication, makeWrapper, ffmpeg }: + +buildPythonApplication rec { + + name = "togglesg-download-git-${version}"; + version = "2016-02-08"; + + src = fetchFromGitHub { + owner = "0x776b7364"; + repo = "toggle.sg-download"; + rev = "5cac3ec039d67ad29240b2fa850a8db595264e3d"; + sha256 = "0pqw73aa5b18d5ws4zj6gcmzap6ag526jrylqq80m0yyh9yxw5hs"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + doCheck = false; + dontBuild = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin + install -m755 download_toggle_video2.py $out/bin/download_toggle_video2.py + ''; + + postInstall = stdenv.lib.optionalString (ffmpeg != null) + ''wrapProgram $out/bin/download_toggle_video2.py --prefix PATH : "${ffmpeg}/bin"''; + + meta = with stdenv.lib; { + homepage = "https://github.com/0x776b7364/toggle.sg-download"; + description = "Command-line tool to download videos from toggle.sg written in Python"; + longDescription = '' + toggle.sg requires SilverLight in order to view videos. This tool will + allow you to download the video files for viewing in your media player and + on your OS of choice. + ''; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.peterhoeg ]; + }; +} diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index d6789bf52bc52..fedfaa48aa37e 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,32 +1,35 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages, glibcLocales }: +# Packaging documentation at: +# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst pythonPackages.buildPythonApplication rec { - version = "0.9.0"; + version = "0.9.3"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz"; - sha256 = "0s9awjr9v60rr80xcpwmdhkf4v1yqnydahjmxwvxmh64565is465"; + sha256 = "1wjhzjfcvwz68j6wc5cmjsw69ggwcpfy7jp7z7q6fnwwp4dr98lc"; }; propagatedBuildInputs = with pythonPackages; [ click click-log click-threading lxml - setuptools - setuptools_scm requests_toolbelt requests2 atomicwrites ]; - # Unfortunately, checking this package seems a bit too complex - # https://github.com/NixOS/nixpkgs/pull/13098#issuecomment-185914025 - # https://github.com/untitaker/vdirsyncer/issues/334#issuecomment-185872854 - doCheck = false; + buildInputs = with pythonPackages; [hypothesis pytest pytest-localserver pytest-subtesthack setuptools_scm ] ++ [ glibcLocales ]; + + LC_ALL = "en_US.utf8"; + + checkPhase = '' + make DETERMINISTIC_TESTS=true test + ''; meta = with stdenv.lib; { - homepage = https://github.com/untitaker/vdirsyncer; + homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; maintainers = with maintainers; [ matthiasbeyer jgeerds ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix new file mode 100644 index 0000000000000..cdc2af1950116 --- /dev/null +++ b/pkgs/tools/misc/xiccd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: + +stdenv.mkDerivation rec { + name = "xiccd-${version}"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "agalakhov"; + repo = "xiccd"; + rev = "v${version}"; + sha256 = "17p3vngmmjk52r5p8y41s19nwp7w25bgff68ffd50zdlicd33rsy"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libX11 libXrandr glib colord ]; + + meta = with stdenv.lib; { + description = "X color profile daemon"; + homepage = https://github.com/agalakhov/xiccd; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index d884d48f52148..2c8660a49139f 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -13,10 +13,18 @@ stdenv.mkDerivation rec { "--enable-icon-browser" ]; + # for gcc5: c11 inline semantics breaks the build + NIX_CFLAGS_COMPILE = "-fgnu89-inline"; + buildInputs = [ gtk2 ]; nativeBuildInputs = [ pkgconfig intltool ]; + postPatch = '' + sed -i src/file.c -e '21i#include <glib/gprintf.h>' + sed -i src/form.c -e '21i#include <stdlib.h>' + ''; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index fee4d44ce6676..20c1170a80553 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.0.2"; + name = "yubico-piv-tool-1.3.0"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "1l12bkyqs38212rizda6s3mypfr4wdiap0yhqfwx86lqcp4h0yb9"; + sha256 = "0l9lkzwi2227y5y02i5g1d701bmlyaj8lffv72jks1w4mkh7q7qh"; }; buildInputs = [ pkgconfig openssl pcsclite ]; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 269219e114359..57952b80daf58 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yubikey-personalization, qt, libyubikey }: stdenv.mkDerivation rec { - name = "yubikey-personalization-gui-3.1.21"; + name = "yubikey-personalization-gui-3.1.24"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; - sha256 = "1b5mf6h3jj35f3xwzdbqsyzk171sn8rp9ym4vipmzzcg10jxyp0m"; + sha256 = "0aj8cvajswkwzig0py0mjnfw0m8xsilisdcnixpjx9xxsxz5yacq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index c109903e6ee3c..1562b9e69b8e5 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.17.2"; + version = "1.17.3"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh"; + sha256 = "034wmwinxmngji1ly8nm9q4hg194iwk164y5rw0whnf69ycc6bs8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index ae4774c0e1235..8074f78db50b9 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/zsh/site-functions/ cp n-* $out/share/zsh/site-functions/ + cp znt-* $out/share/zsh/site-functions/ ''; meta = with stdenv.lib; { |