diff options
Diffstat (limited to 'pkgs/tools')
326 files changed, 1644 insertions, 703 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 14fe769db6be..0d764a4cbd10 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -18,15 +18,14 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd -, libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau -, nvidia_x11, virtualgl, libglvnd, primusLib +, libX11, xorgserver, kmod, xf86videonouveau +, nvidia_x11, virtualgl, libglvnd , automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? , nvidia_x11_i686 ? null , libglvnd_i686 ? null -, primusLib_i686 ? null , useDisplayDevice ? false , extraNvidiaDeviceOptions ? "" , extraNouveauDeviceOptions ? "" @@ -36,11 +35,6 @@ let version = "3.2.1"; - primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; - primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; - - primusLibs = lib.makeLibraryPath ([ primus ] ++ lib.optional (primusLib_i686 != null) primus_i686); - nvidia_x11s = [ nvidia_x11 ] ++ lib.optional nvidia_x11.useGLVND libglvnd ++ lib.optionals (nvidia_x11_i686 != null) diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index aeb4546ff4d3..189dc56975f3 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, xorg, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, xorg, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-sct-${version}"; diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index d130c9bac7cc..669cb4b4844a 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -6,7 +6,6 @@ { stdenv , stdenv_i686 , lib -, bumblebee , primusLib , writeScriptBin , primusLib_i686 ? null diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index 669da86621fd..45cb1966a4ff 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libX11, imlib2 +{ stdenv, fetchFromGitHub, libX11, imlib2 , enableXinerama ? true, libXinerama ? null }: diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 21d7a50566db..153ff45d2a70 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, libvdpau }: +{ stdenv, fetchurl, pkgconfig, libvdpau }: stdenv.mkDerivation rec { name = "vdpauinfo-1.0"; diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index e3d9ecd5953e..987293878d82 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, gtk, pkgconfig, procps, makeWrapper, ... }: +{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }: stdenv.mkDerivation rec { name = "xbindkeys-config-${version}"; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 28839891aa55..d8ae32c6ee4c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto -, w3m, which, gnugrep, gnused, coreutils, xset +, w3m, gnugrep, gnused, coreutils, xset , mimiSupport ? false, gawk ? null }: assert mimiSupport -> gawk != null; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 2faa8ead0716..b96235341401 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }: +{ lib, stdenv, rustPlatform, fetchFromGitHub +, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; @@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8"; - buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ]; + buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ]; nativeBuildInputs = [ pkgconfig patchelf ]; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 7523bab2e8c3..55ab34228261 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,15 +1,15 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf +, makeWrapper, xorgserver, getopt, xauth, utillinux, which , ffmpeg, x264, libvpx, libwebp , libfakeXinerama -, gst_all_1, pulseaudioLight, gobjectIntrospection +, gst_all_1, pulseaudio, gobjectIntrospection , pam }: with lib; let - inherit (python2Packages) python cython buildPythonApplication; + inherit (python2Packages) cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; version = "2.3.2"; @@ -61,7 +61,7 @@ in buildPythonApplication rec { --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]} ''; preCheck = "exit 0"; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index a0c2ee8f995f..16693b08e110 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPythonApplication , python, cython, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf +, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama, pam }: diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix new file mode 100644 index 000000000000..176b9fa0068a --- /dev/null +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, libX11, libXcomposite, libXft, pam, apacheHttpd, imagemagick +, pamtester, xscreensaver }: + +stdenv.mkDerivation rec { + name = "xsecurelock-git-2018-07-10"; + + src = fetchFromGitHub { + owner = "google"; + repo = "xsecurelock"; + rev = "0fa0d7dd87a4cc4bdb402323f95c3fcacc6f5049"; + sha256 = "071b3gslszql1mgabs53r82jgbk9mn263m5v6adskfxbkamks8g0"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ + libX11 libXcomposite libXft pam + apacheHttpd imagemagick pamtester + ]; + + configureFlags = [ + "--with-pam-service-name=login" + "--with-xscreensaver=${xscreensaver}/libexec/xscreensaver" + ]; + + meta = with lib; { + description = "X11 screen lock utility with security in mind"; + homepage = https://github.com/google/xsecurelock; + license = licenses.asl20; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index 6ea24ad2c6aa..cc2eb50ce1fd 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchbzr, x11 }: +{ stdenv, fetchbzr, xlibsWrapper }: let version = "4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ - x11 + xlibsWrapper ]; buildPhase = if stdenv.system == "x86_64-linux" then '' diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 363214129b28..d18fe4eafd34 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,21 +1,8 @@ -{ stdenv, fetchurl, fetchFromGitHub, python2 +{ stdenv, fetchurl, python2 , windowsSupport ? false }: let - oldJinja = python2.override { - packageOverrides = self: super: { - jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { - version = "2.8.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; - }; - doCheck = false; - }); - }; - }; - generic = { version, sha256, py ? python2 }: py.pkgs.buildPythonPackage rec { pname = "ansible"; inherit version; diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix new file mode 100644 index 000000000000..cffb67e7d6ca --- /dev/null +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "aws-rotate-key-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/Fullscreen/aws-rotate-key"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "Fullscreen"; + repo = "aws-rotate-key"; + sha256 = "13q7rns65cj8b4i0s75dbswijpra9z74b462zribwfjdm29by5k1"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Easily rotate your AWS key"; + homepage = https://github.com/Fullscreen/aws-rotate-key; + license = licenses.mit; + maintainers = [maintainers.mbode]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/admin/aws-rotate-key/deps.nix b/pkgs/tools/admin/aws-rotate-key/deps.nix new file mode 100644 index 000000000000..680a18e7e2d3 --- /dev/null +++ b/pkgs/tools/admin/aws-rotate-key/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "af26abd521cd7697481572fdbc4a53cbea3dde1b"; + sha256 = "1yribbqy9i4i70dfg3yrjhkn3n0fywpr3kismn2mvi882mm01pxz"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "f844700ba2a387dfee7ab3679e7544b5dbd6d394"; + sha256 = "0s9100bzqj58nnax3dxfgi5qr4rbaa53cb0cj3s58k9jc9z6270m"; + }; + } +] diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index b7d41ac7a960..331a4bffb814 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.15.49"; + version = "1.15.58"; src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1rn1d274vg2zq93cswh6w5ybgqw6gk2pgiqxhsyd04f2v4smr98i"; + sha256 = "19wnr498q2mwbp8l978ahy9y7p7icahx53898fki6sbhd9pn2miq"; }; # No tests included diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix index 2c24728fab9f..7ae54aab4b9d 100644 --- a/pkgs/tools/admin/bluemix-cli/default.nix +++ b/pkgs/tools/admin/bluemix-cli/default.nix @@ -2,16 +2,30 @@ stdenv.mkDerivation rec { name = "bluemix-cli-${version}"; - version = "0.6.6"; + version = "0.8.0"; - src = fetchurl { - name = "linux64.tar.gz"; - url = "https://clis.ng.bluemix.net/download/bluemix-cli/${version}/linux64"; - sha256 = "1swjawc4szqrl0wgjcb4na1hbxylaqp2mp53lxsbfbk1db0c3y85"; - }; + src = + if stdenv.system == "i686-linux" then + fetchurl { + name = "linux32-${version}.tar.gz"; + url = "https://clis.ng.bluemix.net/download/bluemix-cli/${version}/linux32"; + sha256 = "1ryngbjlw59x33rfd32bcz49r93a1q1g92jh7xmi9vydgqnzsifh"; + } + else + fetchurl { + name = "linux64-${version}.tar.gz"; + url = "https://clis.ng.bluemix.net/download/bluemix-cli/${version}/linux64"; + sha256 = "056zbaca430ldcn0s86vy40m5abvwpfrmvqybbr6fjwfv9zngywx"; + } + ; installPhase = '' - install -m755 -D --target $out/bin bin/bluemix bin/bluemix-analytics bin/cfcli/cf + install -m755 -D -t $out/bin bin/ibmcloud bin/ibmcloud-analytics + install -m755 -D -t $out/bin/cfcli bin/cfcli/cf + ln -sv $out/bin/ibmcloud $out/bin/bx + ln -sv $out/bin/ibmcloud $out/bin/bluemix + install -D -t "$out/etc/bash_completion.d" bx/bash_autocomplete + install -D -t "$out/share/zsh/site-functions" bx/zsh_autocomplete ''; meta = with lib; { @@ -19,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://console.bluemix.net/docs/cli/index.html"; downloadPage = "https://console.bluemix.net/docs/cli/reference/bluemix_cli/download_cli.html#download_install"; license = licenses.unfree; - maintainers = [ maintainers.tazjin ]; - platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.tazjin maintainers.jensbin ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index a5e0186fa2dc..a037a2e42aaa 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bubblewrap-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1qhzwgpfsw66hcv5kqc7i4dbzhxr8drrqn3md4grcp7dn02wif2l"; + sha256 = "0b5gkr5xiqnr9cz5padkkkhm74ia9cb06pkpfi8j642anmq2irf8"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index 38b70d1b5d07..c9c879becaa0 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: +{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: let pkgName = "dehydrated"; version = "0.6.2"; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 59a5ec8d4dad..cd6cf90a5aa5 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gobjectIntrospection -, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, gnutls, cairo, libtool, glib, pkgconfig , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio -, kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_32 +, libgcrypt, gtk3, vala_0_32 , libogg, libgpgerror, pythonPackages }: let diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 2b663cd3bcee..780eb4e9aa52 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , openssl, zeromq, czmq, pkgconfig, cmake, zlib }: with rustPlatform; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 759230c6a293..2a02873a8b5c 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , openssl, zeromq, czmq, pkgconfig, cmake, zlib }: with rustPlatform; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index a4ac74e9f2da..fef0e50cd5b1 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , openssl, zeromq, czmq, pkgconfig, cmake, zlib }: with rustPlatform; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index dfe4c099bebb..2fbfff287cb9 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl +{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables }: diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix index 590f6ea55ca7..25b8bdb65856 100644 --- a/pkgs/tools/admin/oxidized/default.nix +++ b/pkgs/tools/admin/oxidized/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ruby, git, bundlerApp }: +{ lib, ruby, bundlerApp }: bundlerApp rec { pname = "oxidized"; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 47bf848578d9..ca0e16c1185a 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, bash }: +{ stdenv, pythonPackages, bash }: pythonPackages.buildPythonApplication rec { pname = "simp_le-client"; diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index 8d30307af2d3..f8e893078157 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , fetchFromGitHub , makeWrapper , openssl diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 14b128d15c7a..dc9796cc9e3a 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, doxygen, makeWrapper, python +{ stdenv, fetchurl, cmake, makeWrapper, python , boost, lzma , withGog ? false, unar ? null }: diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index c9ce6ac4d10b..8d4d5fd8dddd 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, substituteAll }: +{ stdenv, rpm, cpio, substituteAll }: stdenv.mkDerivation rec { name = "rpmextract"; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index 7583663ebf0a..79c8e2f20ecc 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }: +{ stdenv, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }: stdenv.mkDerivation rec { name = "unp-${version}"; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 3004c7e2132c..0d60e7962460 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip -, buildPlatform, hostPlatform +, hostPlatform }: let diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index b8f39a03083c..d2a7358ff8fd 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "playerctl-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "1sxy87syrfk485f2x556rl567j6rph4ss0xahf04bv26bzj3mqrp"; + sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 691568673df3..e93b02e062e2 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex +{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb , sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 315ef7272838..99c0bd4a34ca 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,27 +3,37 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.5.14"; + version = "2.5.15"; name = "dar-${version}"; src = fetchurl { - url = "mirror://sourceforge/dar/${name}-bis.tar.gz"; - sha256 = "1sbd7n5mfqkwxy5rz2v8575y21j94ypwrpinizr3l2yy9pq49rx5"; + url = "mirror://sourceforge/dar/${name}.tar.gz"; + sha256 = "1h700i2k524w5rf5gr9yxl50ca5jwzqlkifay4ffcbhbkqln1n2q"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] ++ optionals stdenv.isLinux [ attr e2fsprogs ]; - configureFlags = [ "--disable-dar-static" ]; + configureFlags = [ + "--disable-birthtime" + "--disable-upx" + "--disable-dar-static" + "--disable-build-html" + "--enable-threadar" + ]; + + postInstall = '' + rm -r "$out"/share/dar # Disable html help + ''; enableParallelBuilding = true; hardeningDisable = [ "format" ]; meta = { - homepage = http://dar.linux.free.fr/; + homepage = http://dar.linux.free.fr; description = "Disk ARchiver, allows backing up files into indexed archives"; - maintainers = [ maintainers.viric ]; + maintainers = with maintainers; [ viric ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index eac589813f47..ce65ef4eb80b 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python, protobuf, roundup }: +{ lib, buildPythonApplication, fetchFromGitHub, protobuf, roundup }: buildPythonApplication rec { pname = "ddar"; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index c902802abce2..8781c2d2cada 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -1,5 +1,4 @@ {stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang -, automake, autoconf, libtool, gettext }: stdenv.mkDerivation { name = "partimage-0.6.9"; diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index 6899ba88a22c..712d0af29a95 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -1,41 +1,40 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, boost, bison, curl, ncurses, openssl, readline, xxd +, boost, bison, curl, ncurses, openssl, xxd , libaio, libev, libgcrypt, libgpgerror, libtool, zlib }: stdenv.mkDerivation rec { name = "percona-xtrabackup-${version}"; - version = "2.4.9"; + version = "2.4.12"; src = fetchFromGitHub { owner = "percona"; repo = "percona-xtrabackup"; rev = name; - sha256 = "11w87wj2jasrnygzjg3b59q9x0m6lhyg1wzdvclmgbmqsk9bvqv4"; + sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - boost bison curl ncurses openssl readline xxd + boost bison curl ncurses openssl xxd libaio libev libgcrypt libgpgerror libtool zlib ]; cmakeFlags = [ "-DBUILD_CONFIG=xtrabackup_release" "-DINSTALL_MYSQLTESTDIR=OFF" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DWITH_BOOST=system" "-DWITH_SSL=system" "-DWITH_ZLIB=system" - "-DWITH_MECAB=system" - "-DWITH_EXTRA_CHARSETS=all" - "-DWITH_INNODB_MEMCACHED=1" "-DWITH_MAN_PAGES=OFF" - "-DWITH_HTML_DOCS=OFF" - "-DWITH_LATEX_DOCS=OFF" - "-DWITH_PDF_DOCS=OFF" + "-DCMAKE_CXX_FLAGS=-std=gnu++03" ]; + postInstall = '' + rm -r "$out"/lib/plugin/debug + ''; + meta = with stdenv.lib; { description = "Non-blocking backup tool for MySQL"; homepage = http://www.percona.com/software/percona-xtrabackup; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 77f5951d39e2..6abd7002f8d7 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger }: +{ fetchurl, stdenv, perl, openssh, rsync, logger }: stdenv.mkDerivation rec { name = "rsnapshot-1.4.2"; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix index 00651806a10a..8f93474f8f16 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -1,6 +1,6 @@ { pkgs, stdenv, eggDerivation, fetchegg }: let - eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; }; + eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { pname = "ugarit-manifest-maker"; version = "0.1"; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix index 0af5dd5bfff1..889d698188e2 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, eggDerivation, fetchegg }: +{ eggDerivation, fetchegg }: rec { blob-utils = eggDerivation { name = "blob-utils-1.0.3"; diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix index 56da9a810208..e8f0ea22df10 100644 --- a/pkgs/tools/backup/ugarit/default.nix +++ b/pkgs/tools/backup/ugarit/default.nix @@ -1,6 +1,6 @@ { pkgs, stdenv, eggDerivation, fetchegg }: let - eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; }; + eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { pname = "ugarit"; version = "2.0"; diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/tools/backup/ugarit/eggs.nix index 9329618887fb..fe958cb55cc6 100644 --- a/pkgs/tools/backup/ugarit/eggs.nix +++ b/pkgs/tools/backup/ugarit/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, eggDerivation, fetchegg }: +{ eggDerivation, fetchegg }: rec { aes = eggDerivation { name = "aes-1.5"; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index f78c300afd0a..bc57215c0c4b 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: +{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }: let # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 394f3fe5b980..da562fde1603 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 +{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index ffc7ee192c90..5c272e3dbafc 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus_libs }: - +{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }: + stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; - + src = fetchurl { url = "http://tadas.dailyda.com/software/${name}.tar.gz"; sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb glib dbus-glib bluez openobex dbus_libs ]; + buildInputs = [ libusb glib dbus-glib bluez openobex dbus ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; preConfigure = '' addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig - export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ''; meta = { diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 80add316094c..674bb5b552b9 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gnu-efi }: +{ stdenv, fetchurl, gnu-efi }: let archids = { diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 8223ba2be4bb..9587416a96af 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra-gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs +, libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs , vcdimager, wrapGAppsHook, hicolor-icon-theme }: # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 1a42ba03d464..a63721466dbc 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "0n5snycxgwqj2v8sgxiqxq4zqh5ydx70dr7qa4ygizs02ms69n1i"; + sha256 = "0ssj7mnhpdpk7qnwr49qfd4gxhkmvbli5mhs274pz55cx1xp7xja"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 3a06a39dcad7..0d2e63c7d59d 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , linkStatic ? (stdenv.system == "i686-cygwin") }: diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index c39216f1e0cc..09065ede6827 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, xz }: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { name = "gzip-${version}"; diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix index a38e0a67b282..df7700d41cb8 100644 --- a/pkgs/tools/compression/lzbench/default.nix +++ b/pkgs/tools/compression/lzbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glibc }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "lzbench-20170208"; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index 2a5250a95aca..7eca80f8400c 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,6 +1,6 @@ -{ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig - , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xml_xslt + , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl , libarchive, lzma }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake libtool asciidoc libxslt libxml2 - docbook_xml_dtd_45 docbook_xml_xslt + docbook_xml_dtd_45 docbook_xsl libarchive lzma ]; preBuild = '' diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 213d98a1ec12..ea363ae8cc2a 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl }: +{ stdenv, fetchurl, ucl, zlib, perl }: stdenv.mkDerivation rec { name = "upx-${version}"; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 37c0c6d1c7e8..0ff349e96e80 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, enableStatic ? false }: stdenv.mkDerivation rec { name = "xz-5.2.4"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; + configureFlags = stdenv.lib.optional enableStatic "--disable-shared"; + doCheck = true; preCheck = '' diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index c2e13b75daa9..1fafe7412d87 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium +{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium , keyutils, liburcu, zlib, libaio, zstd }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 4325a9355366..14fedd6610e1 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -2,14 +2,14 @@ , which, git , boost, python2Packages , libxml2, zlib -, openldap, lttngUst +, openldap, lttng-ust , babeltrace, gperf , cunit, snappy , rocksdb, makeWrapper # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null -, curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null +, curl ? null, fuse ? null , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null , libs3 ? null @@ -25,7 +25,7 @@ , zfs ? null # Version specific arguments -, version, src, patches ? [], buildInputs ? [] +, version, src ? [], buildInputs ? [] , ... }: @@ -44,8 +44,6 @@ let optExpat = shouldUsePkg expat; optCurl = shouldUsePkg curl; optFuse = shouldUsePkg fuse; - optLibibverbs = shouldUsePkg libibverbs; - optLibrdmacm = shouldUsePkg librdmacm; optLibedit = shouldUsePkg libedit; optLibatomic_ops = shouldUsePkg libatomic_ops; optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client; @@ -62,9 +60,6 @@ let optLibxfs = shouldUsePkg libxfs; optZfs = shouldUsePkg zfs; - hasMon = true; - hasMds = true; - hasOsd = true; hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; @@ -84,11 +79,11 @@ let none = [ ]; }; - ceph-python-env = python2Packages.python.withPackages (ps: [ + ceph-python-env = python2Packages.python.withPackages (ps: [ ps.sphinx ps.flask ps.argparse - ps.cython + ps.cython ps.setuptools ps.pip # Libraries needed by the python tools @@ -97,7 +92,7 @@ let ps.prettytable ps.webob ps.cherrypy - ]); + ]); in stdenv.mkDerivation { @@ -105,9 +100,9 @@ stdenv.mkDerivation { inherit src; - patches = [ - # ./ceph-patch-cmake-path.patch - ./0001-kv-RocksDBStore-API-break-additional.patch + patches = [ + # ./ceph-patch-cmake-path.patch + ./0001-kv-RocksDBStore-API-break-additional.patch ] ++ optionals stdenv.isLinux [ ./0002-fix-absolute-include-path.patch ]; @@ -117,10 +112,10 @@ stdenv.mkDerivation { pkgconfig which git python2Packages.wrapPython makeWrapper (ensureNewerSourcesHook { year = "1980"; }) ]; - + buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ - boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 - malloc zlib openldap lttngUst babeltrace gperf cunit + boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 + malloc zlib openldap lttng-ust babeltrace gperf cunit snappy rocksdb ] ++ optionals stdenv.isLinux [ linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs @@ -130,28 +125,28 @@ stdenv.mkDerivation { optKinetic-cpp-client ]; - + preConfigure ='' # rip off submodule that interfer with system libs rm -rf src/boost rm -rf src/rocksdb - + # require LD_LIBRARY_PATH for cython to find internal dep export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" - + # requires setuptools due to embedded in-cmake setup.py usage export PYTHONPATH="${python2Packages.setuptools}/lib/python2.7/site-packages/:$PYTHONPATH" ''; - cmakeFlags = [ + cmakeFlags = [ "-DENABLE_GIT_VERSION=OFF" "-DWITH_SYSTEM_BOOST=ON" "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_LEVELDB=OFF" - + # enforce shared lib "-DBUILD_SHARED_LIBS=ON" - + # disable cephfs, cmake build broken for now "-DWITH_CEPHFS=OFF" "-DWITH_LIBCEPHFS=OFF" @@ -163,7 +158,7 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; - + outputs = [ "dev" "lib" "out" "doc" ]; meta = { diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index fe713556577d..8af745ed436e 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, devicemapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { name = "convoy-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1"; }; - buildInputs = [devicemapper]; + buildInputs = [lvm2]; meta = with stdenv.lib; { homepage = https://github.com/rancher/convoy; diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index f929f354766c..9af14b051261 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, parted, substituteAll, utillinux }: +{ stdenv, fetchurl, parted, utillinux }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 494fd7036e29..beb046cdbdb7 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, - liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, python2Packages, + liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, rsync, glibc }: diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 028aef6024b1..0438b9c38e4b 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, libusb1, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, pkgconfig, libusb1, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-mtpfs-${version}"; diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index f4bb5592abdb..4f7c2248a8ed 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: +{ stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: stdenv.mkDerivation rec { version = "0.5.0"; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index c2066f95ef5a..24a88349bf43 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, fetchurl, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: with stdenv; diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix new file mode 100644 index 000000000000..01f0de25a900 --- /dev/null +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, coreutils, makeWrapper +, rsync, python3, pythonPackages }: + +stdenv.mkDerivation rec { + name = "mergerfs-tools-${version}"; + version = "20171221"; + + src = fetchFromGitHub { + owner = "trapexit"; + repo = "mergerfs-tools"; + rev = "9b4fe0097b5b51e1a7411a26eb344a24cc8ce1b4"; + sha256 = "0qrixh3j58gzkmc8r2sgzgy56gm8bmhakwlc2gjb0yrpa1213na1"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + + makeFlags = [ + "INSTALL=${coreutils}/bin/install" + "PREFIX=$(out)" + ]; + + postInstall = with stdenv.lib; '' + wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${makeBinPath [ rsync ]} + wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${makeBinPath [ rsync ]} + wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ pythonPackages.xattr ]} + ''; + + meta = with stdenv.lib; { + description = "Optional tools to help manage data in a mergerfs pool"; + homepage = https://github.com/trapexit/mergerfs-tools; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 24eec2f0dc46..b0c33212edb3 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +{ stdenv, fetchurl, lvm2, libgcrypt, libuuid, pkgconfig, popt , enablePython ? true, python ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ devicemapper libgcrypt libuuid popt ] + buildInputs = [ lvm2 libgcrypt libuuid popt ] ++ stdenv.lib.optional enablePython python; meta = { diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 5ae32093e7f7..758e130e4adf 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, python, buildPythonApplication # Propagated to blivet , useNixUdev ? true -# No longer needed, but kept for backwards-compatibility with older NixOps. -, udevSoMajor ? null # Propagated dependencies , pkgs, urlgrabber }: @@ -18,13 +16,11 @@ let cryptsetup = import ./cryptsetup.nix { inherit stdenv fetchurl python; - inherit (pkgs) pkgconfig libgcrypt libuuid popt; - devicemapper = lvm2; + inherit (pkgs) pkgconfig libgcrypt libuuid popt lvm2; }; dmraid = import ./dmraid.nix { - inherit stdenv fetchurl; - devicemapper = lvm2; + inherit stdenv fetchurl lvm2; }; lvm2 = import ./lvm2.nix { @@ -39,8 +35,7 @@ let parted = import ./parted.nix { inherit stdenv fetchurl; - inherit (pkgs) utillinux readline libuuid gettext check; - devicemapper = lvm2; + inherit (pkgs) utillinux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index defdf6702ea7..a4dcb408e058 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper }: +{ stdenv, fetchurl, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc15"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "cd */"; - buildInputs = [ devicemapper ]; + buildInputs = [ lvm2 ]; meta = { description = "Old-style RAID configuration utility"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 04859020e36e..3f43fdc0c395 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline +{ stdenv, fetchurl, lvm2, libuuid, gettext, readline , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (lvm2 != null) lvm2 ++ stdenv.lib.optional (hurd != null) hurd ++ stdenv.lib.optional doCheck check; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; doCheck = true; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 11d836e66bcc..4d71d501b3c1 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "s3fs-fuse-${version}"; - version = "1.83"; + version = "1.84"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "0rh0lkvjjy19lixqq07hjp4k9mhahmwc0pbp5cr3m59qbwwcprvx"; + sha256 = "1iafzlrqrjyphd1p74q5xzhgacc4gzijq8f6mdkvikbdsibch871"; }; buildInputs = [ curl openssl libxml2 fuse ]; diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 341b025b0791..b3d8d70f0e29 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, automake, autoreconfHook, libtool, fuse, - pkgconfig, pcre, lz4, xz, zlib, lzo, zstd }: +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, + pkgconfig, lz4, xz, zlib, lzo, zstd }: with stdenv.lib; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index e9325e9b18d5..6d95d5ee12b5 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -2,9 +2,7 @@ , docutils }: -let - inherit (stdenv.lib) optional; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "3.4.0"; name = "sshfs-fuse-${version}"; diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index d563f4380209..b22f7e07a464 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig -, asciidoc, docbook_xml_xslt, fuse, libuuid, libxslt }: +, asciidoc, docbook_xsl, fuse, libuuid, libxslt }: stdenv.mkDerivation rec { name = "vmfs-tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4"; }; - nativeBuildInputs = [ asciidoc docbook_xml_xslt fuse libuuid libxslt pkgconfig ]; + nativeBuildInputs = [ asciidoc docbook_xsl fuse libuuid libxslt pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 2a85adb60b56..4c0c2343dd2a 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,5 +1,5 @@ { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python -, fetchurl, lib, valgrind, makeWrapper, fetchFromGitHub }: +, lib, valgrind, makeWrapper, fetchFromGitHub }: stdenv.mkDerivation rec { src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 9dfb2deeaee3..66e6690bc6a7 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, zookeeper, zookeeper_mt, fuse, pkgconfig, autoreconfHook, log4cxx, boost, tree }: +{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }: stdenv.mkDerivation rec { name = "zkfuse-${version}"; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 7a06d9f346b8..a3b259703517 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText -, libXdmcp, libXau, lib, openssl, zlib }: +, libXdmcp, libXau, lib, openssl }: let version = "2.0.0"; in diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 0a48e947a48e..cc899ab104f9 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, patchelf, imagemagick }: +{ stdenv, fetchurl, cmake, imagemagick }: stdenv.mkDerivation rec { name = "cuneiform-${version}"; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 43da52634e68..14972fc5e56f 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, - python27, wayland, libudev, mesa_noglu }: + python27, wayland, udev, mesa_noglu }: stdenv.mkDerivation rec { name = "glmark2-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland libudev mesa_noglu + libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu ]; buildPhase = '' diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 6c62e0528386..c267695dd784 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig +{ stdenv, fetchurl, cmake, ninja, pkgconfig , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng , withGimpPlugin ? true, gimp ? null}: diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 0a4ebf495b24..d50adaa387fa 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -2,7 +2,6 @@ , cairo, gd, libcerf, pango, readline, zlib , withTeXLive ? false, texlive , withLua ? false, lua -, emacs ? null , libX11 ? null , libXt ? null , libXpm ? null diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 2fa4bb90a8ea..68ff84c7495a 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -7,7 +7,7 @@ assert stdenv.isDarwin -> ApplicationServices != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index dc703cf02f75..48d40ac49652 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp -, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib +, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { autoconf automake autoreconfHook gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core - dbus libdbusmenu-glib + dbus libdbusmenu ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/tools/graphics/ibniz/default.nix new file mode 100644 index 000000000000..11fad25b85ae --- /dev/null +++ b/pkgs/tools/graphics/ibniz/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, SDL }: + +stdenv.mkDerivation rec { + name = "ibniz-${version}"; + version = "1.18"; + + src = fetchurl { + url = "http://www.pelulamu.net/ibniz/${name}.tar.gz"; + sha256 = "10b4dka8zx7y84m1a58z9j2vly8mz9aw9wn8z9vx9av739j95wp2"; + }; + + buildInputs = [ SDL ]; + + installPhase = '' + mkdir -p $out/bin + cp ibniz $out/bin + ''; + + meta = with stdenv.lib; { + description = "Virtual machine designed for extremely compact low-level audiovisual programs"; + homepage = "http://www.pelulamu.net/ibniz/"; + license = licenses.zlib; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index 0bb0bb00efa5..393c18d38529 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: +{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { name = "jbig2enc-0.28"; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 08d5ff851407..85713a300ec6 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -3,13 +3,14 @@ , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre , bison, flex, libpthreadstubs, libX11 -, embree2, makeWrapper, gsettings_desktop_schemas, glib +, embree2, makeWrapper, gsettings-desktop-schemas, glib , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp }: let boost_static = boost165.override { python = python35; enableStatic = true; + enablePython = true; }; in stdenv.mkDerivation rec { @@ -30,7 +31,7 @@ in stdenv.mkDerivation rec { flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gnome3.gtk + gsettings-desktop-schemas glib gnome3.gtk # needed for XDG_ICON_DIRS gnome3.defaultIconTheme makeWrapper diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 217a85f266ab..76829b6b7271 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, boost -, zlib, libpng, libjpeg, libtiff, x11, SDL +, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff x11 SDL ]; + buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff xlibsWrapper SDL ]; # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ]; enableParallelBuilding = true; - + preInstall = '' mkdir "$TMP/bin" for i in chown chgrp; do diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 623415a314b5..4f3e5271183d 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "147jkgvm9n6mbkl6ndqnm9x74x5y9agbxkfwj0jrw6yxyhxx2cdd"; }; + # + # Turn on "-rdb" option (REALLYDELAYBIND) by default to ensure compatibility with gs-9.22 + # + patches = [ ./pstoedit-gs-9.22-compat.patch ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] diff --git a/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch b/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch new file mode 100644 index 000000000000..64fe805d5015 --- /dev/null +++ b/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch @@ -0,0 +1,13 @@ +diff --git a/src/pstoeditoptions.h b/src/pstoeditoptions.h +index 7846883..0fb6a6f 100755 +--- a/src/pstoeditoptions.h ++++ b/src/pstoeditoptions.h +@@ -453,7 +453,7 @@ private: + "Later versions of Ghostscript will probably support -dDELAYBIND again. " + "But also in that case the security risk remains. So be careful with what " + "files you process with pstoedit and Ghostscript.", +- false), // ++ true), // + #endif + pagetoextract (true, "-page","page number",g_t,"extract a specific page: 0 means all pages", + "Select a single page from a multi-page PostScript or PDF file.", diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix index 95f7c547b559..a83bc845eb9e 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/tools/graphics/pywal/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }: +{ lib, python3Packages, imagemagick, feh }: python3Packages.buildPythonApplication rec { pname = "pywal"; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index da63cb58a55f..18699f412847 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, expat, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, - python27, libpng, matio ? null, cfitsio ? null, libwebp ? null + python27, libpng ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 778a12341540..e44021bad5d1 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, - glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { name = "vulkan-tools-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 vulkan-loader x11 libxcb libXrandr wayland ]; + buildInputs = [ cmake python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index a0de144d907e..7321128a6b5a 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "yafaray-core-${version}"; - version = "v3.3.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "YafaRay"; repo = "Core"; - rev = "${version}"; + rev = "v${version}"; sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index 7f09b488c289..a3f12d648d55 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-anthy-${version}"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz"; - sha256 = "0ayrzfx95670k86y19bzl6i6w98haaln3x8dxpb39a5dwgz59pf8"; + sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index 361355d1d688..e2d58c564989 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-chewing-${version}"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz"; - sha256 = "0l548xdx2fvjya1ixp37pn382yak0m4kwfh9lgh7l3y2sblqw9zs"; + sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index ebb6627dccae..f7bb7126bef0 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-cloudpinyin-${version}"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz"; - sha256 = "143x9gbswzfngvgfy77zskrzrpywj8qg2d19kisgfwfisk7yhcf1"; + sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index 41560227bca0..32c9ecff9bd8 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-hangul-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz"; - sha256 = "1jq78nczliw6pnhfac8hspffybrry6syk17y0wwcq05j3r3nd2lp"; + sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index c0c921f7b18d..292d2dbb57f5 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-m17n-${version}"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz"; - sha256 = "0ffyhsg7bc6525k94kfhnja1h6ajlfprq72d286dp54cksnakyc4"; + sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 170ac4c6a26f..d74c7608bc90 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, - python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, + python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, fcitx, gettext }: let japanese_usage_dictionary = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index b69a9ec81f69..7943903d6f7c 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }: stdenv.mkDerivation rec { - name = "fcitx-configtool-0.4.9"; + name = "fcitx-configtool-0.4.10"; meta = with stdenv.lib; { description = "GTK-based config tool for Fcitx"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; - sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r"; + sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 50ab7d85c5ac..166fd16811ab 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules +{ stdenv, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules , fetchpatch }: diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index c7d0eecb763c..ab8a7bdb34de 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -2,7 +2,7 @@ , libxml2, enchant, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules -, xkeyboard_config, pcre, libuuid, curl, cacert +, xkeyboard_config, pcre, libuuid , withPinyin ? true , fetchFromGitHub }: diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix index 1dfe6b245061..28a08e39b225 100644 --- a/pkgs/tools/inputmethods/fcitx/wrapper.nix +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }: +{ symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }: symlinkJoin { name = "fcitx-with-plugins-${fcitx.version}"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index f70c7d02e9f0..cb2076cd21c7 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig -, gtk3, ibus, libhangul, librsvg, python3 +, gtk3, ibus, libhangul, python3 }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index fd924cdd2a2b..01b092ef2a61 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf -, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }: +, ibus, gtk2, zinnia, qt5, libxcb }: let japanese_usage_dictionary = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index d3507b57cbd0..540779477e35 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig -, vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 +, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 33fea9705acd..a6aed47d964c 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp, - libevdev, libudev }: +{ stdenv, fetchurl, pkgconfig, cmake, libyamlcpp, + libevdev, udev }: let version = "0.1.1"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libevdev libudev libyamlcpp ]; + buildInputs = [ libevdev udev libyamlcpp ]; prePatch = '' substituteInPlace CMakeLists.txt --replace \ diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix index 0051be14ee7c..7311b09008b9 100644 --- a/pkgs/tools/inputmethods/libkkc/default.nix +++ b/pkgs/tools/inputmethods/libkkc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , vala, gobjectIntrospection, intltool, python2Packages, glib , pkgconfig -, libgee, json_glib, marisa, libkkc-data +, libgee, json-glib, marisa, libkkc-data }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ marisa libkkc-data ]; enableParallelBuilding = true; - propagatedBuildInputs = [ libgee json_glib ]; + propagatedBuildInputs = [ libgee json-glib ]; postInstall = '' ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix new file mode 100644 index 000000000000..719d86b3a389 --- /dev/null +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "triggerhappy-${version}"; + version = "0.5.0"; + + src = fetchurl { + url = "https://github.com/wertarbyte/triggerhappy/archive/release/${version}.tar.gz"; + sha256 = "af0fc196202f2d35153be401769a9ad9107b5b6387146cfa8895ae9cafad631c"; + }; + + buildInputs = [ perl ]; + installFlags = [ "DESTDIR=$(out)" ]; + + postPatch = '' + substituteInPlace Makefile --replace "/usr/" "/" + substituteInPlace Makefile --replace "/sbin/" "/bin/" + ''; + + postInstall = '' + install -D -m 644 -t "$out/etc/triggerhappy/triggers.d" "triggerhappy.conf.examples" + install -D -m 644 -t "$out/usr/lib/systemd/system" "systemd/triggerhappy.service" "systemd/triggerhappy.socket" + install -D -m 644 -t "$out/usr/lib/udev/rules.d" "udev/triggerhappy-udev.rules" + ''; + + meta = with stdenv.lib; { + description = "A lightweight hotkey daemon"; + longDescription = '' + Triggerhappy is a hotkey daemon developed with small and embedded systems in + mind, e.g. linux based routers. It attaches to the input device files and + interprets the event data received and executes scripts configured in its + configuration. + ''; + homepage = https://github.com/wertarbyte/triggerhappy/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.taha ]; + }; +} diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index ff146e609232..1044c0acc0a8 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.3"; diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index fcdd9a81d720..5ead0e1020cb 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "azure-vhd-utils-${version}"; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 41a50eecd84b..d0434ebe28b4 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "bibutils-${version}"; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index c5ebe7cf32ee..026c626ff77e 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, python, perl, textual-window-manager }: +{ stdenv, fetchurl, python, perl, textual-window-manager }: stdenv.mkDerivation rec { version = "5.125"; diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix index 0af90ae2bf22..57be1b89e469 100644 --- a/pkgs/tools/misc/ckb/default.nix +++ b/pkgs/tools/misc/ckb/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, substituteAll, libudev, pkgconfig, qtbase, qmake, zlib, kmod }: +{ stdenv, fetchFromGitHub, substituteAll, udev +, pkgconfig, qtbase, qmake, zlib, kmod }: stdenv.mkDerivation rec { version = "0.2.9"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libudev + udev qtbase zlib ]; diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix new file mode 100644 index 000000000000..6bd0f8be2fa6 --- /dev/null +++ b/pkgs/tools/misc/clipnotify/default.nix @@ -0,0 +1,26 @@ +{ libX11, libXfixes, stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "clipnotify-${version}"; + version = "git-2018-02-20"; + + src = fetchFromGitHub { + owner = "cdown"; + repo = "clipnotify"; + rev = "9cb223fbe494c5b71678a9eae704c21a97e3bddd"; + sha256 = "1x9avjq0fgw0svcbw6b6873qnsqxbacls9sipmcv86xia4bxh8dn"; + }; + + buildInputs = [ libX11 libXfixes ]; + + installPhase = '' + mkdir -p $out/bin + cp clipnotify $out/bin + ''; + + meta = with stdenv.lib; { + description = "Notify on new X clipboard events"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 2181e1cb916f..bffcc597ea0a 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "0bj7fk19z3c29vxm3mcp3s7vggkigmz3hrn4pcsqgfh96i5i5203"; + sha256 = "0v1412zdkps21i5bw1p7jdv5ydnbw9dcr02318qr5mvk8lwdmsgw"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 4461834cb74d..a5d71a9487cc 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus , gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40 -, libgudev, sane-backends, udev, gnome3, makeWrapper }: +, libgudev, sane-backends, gnome3, makeWrapper }: stdenv.mkDerivation rec { name = "colord-1.4.2"; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 673e5c4c321f..a8a878b1998d 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "dashing-unstable-${version}"; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index e68aaff1ddfb..b3a654be04e4 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: +{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.105"; + version = "1.0.106"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "0m4630q8smn45pmck1azk5sv6cgdzza2r001paqvmasqa6qxbjq3"; + sha256 = "0vn2camhwf6h2ja78km9ihi8df4pfzvm9hnppv6vq32lfwjd3z2g"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index e2e2f66f558b..80e0cde7e54a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, fetchgit, python3Packages, docutils, help2man , acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc -, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar -, gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite +, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg1, gnutar +, gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite , squashfsTools, tcpdump, unoconv, unzip, xxd, xz , enableBloat ? false }: +# Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "95"; + version = "99"; src = fetchgit { url = "https://anonscm.debian.org/git/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "1x06krs3lp41x5w2l8ck8g47il3qzlclyphw9a2wv71sqkb5zxzi"; + sha256 = "04a2sqv43g002b7s0crk9gnpdvf90j8j8p01b6shinxh6an8prs2"; }; patches = [ @@ -23,18 +24,24 @@ python3Packages.buildPythonApplication rec { postPatch = '' # Upstream doesn't provide a PKG-INFO file sed -i setup.py -e "/'rpm-python',/d" + + # When generating manpage, use the installed version + substituteInPlace doc/Makefile --replace "../bin" "$out/bin" ''; nativeBuildInputs = [ docutils help2man ]; + # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. + # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh + # # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip - libarchive libcaca pgpdump sng sqlite squashfsTools unzip xxd xz + libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz ] ++ lib.optionals enableBloat [ - apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick + apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 gnumeric imagemagick llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv ]; diff --git a/pkgs/tools/misc/diffoscope/list-tools.sh b/pkgs/tools/misc/diffoscope/list-missing-tools.sh index 9af7f0e38899..5f4d118cfed7 100755 --- a/pkgs/tools/misc/diffoscope/list-tools.sh +++ b/pkgs/tools/misc/diffoscope/list-missing-tools.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# This script lists all the optional command-line tools that diffoscope can use +# (i.e. `diffoscope --list-tools`) but are missing from the Nix expression. + diffoscope=$(nix-build --no-out-link -E 'with import ./. {}; diffoscope.override { enableBloat = true; }')/bin/diffoscope required=$($diffoscope --list-tools | \ diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e22bce7c6989..508fc77a9a03 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash, writeText}: +{ stdenv, fetchFromGitHub, buildGoPackage, bash}: buildGoPackage rec { name = "direnv-${version}"; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index f34d05758cf4..aa23b51f4b89 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cargo, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { name = "dust-${version}"; diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix index c1678f3907fb..9d3b796c8796 100644 --- a/pkgs/tools/misc/esptool-ck/default.nix +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "esptool-ck-${version}"; - version = "0.4.11"; + version = "0.4.13"; src = fetchFromGitHub { owner = "igrr"; repo = "esptool-ck"; - rev = "0.4.11"; - sha256 = "086x68jza24xkaap8nici18kj78id2p2lzbasin98wilvpjc8d7f"; + rev = "0.4.13"; + sha256 = "1cb81b30a71r7i0gmkh2qagfx9lhq0myq5i37fk881bq6g7i5n2k"; }; makeFlags = [ "VERSION=${version}" ]; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 729b4cef03a4..abb0b4edc17e 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3, openssl }: python3.pkgs.buildPythonApplication rec { - name = "esptool-${version}"; - version = "2.4.1"; + pname = "esptool"; + version = "2.5.0"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1djlmqdvcyqjqbj225xkn4ix9qr01b8pmsdija2h4nizx77xjyng"; + sha256 = "0cvxapcln1xcz8hy0hidw6g8q61s5j3q03j3wrviagbh0zip8jdx"; }; checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index aeb43d7c1151..485f46d03144 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, zlib }: +{ stdenv, fetchurl, file, zlib, libgnurx }: stdenv.mkDerivation rec { name = "file-${version}"; @@ -13,10 +13,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx; doCheck = true; + makeFlags = if stdenv.hostPlatform.isWindows then "FILE_COMPILE=file" + else null; meta = with stdenv.lib; { homepage = http://darwinsys.com/file; diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 260151f5bd29..f761c1ec4c53 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fam }: +{ stdenv, fetchurl, gamin }: stdenv.mkDerivation rec { name = "fileschanged-0.6.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc"; }; - buildInputs = [ fam ]; + buildInputs = [ gamin ]; patches = [./unused-variables.debian.patch]; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index f79720289bf5..66b7ef4c2919 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -3,8 +3,6 @@ , buildPlatform, hostPlatform }: -let inherit (stdenv.lib) optionals; in - stdenv.mkDerivation rec { name = "findutils-4.6.0"; diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index 8219d110f2ef..c9ee511ff830 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby, curl }: +{ lib, bundlerEnv, ruby }: bundlerEnv { inherit ruby; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 0f6fb38ef3bc..04717974a8b3 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, lib +{ stdenv, fetchFromGitHub, lib , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango , withSpiro ? false, libspiro diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 77ec5bcb86bb..be86f6496f00 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "14a3bd84bnnxdrf1x80w860mhm3x4cy9jp9sf9643svq4bky4i41"; + sha256 = "16v5s9xwdsii7pcphrb0a7aib2zprrw6n4fyc8w8c11gbkg27r4d"; }; doCheck = true; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index ba85c5376db1..e8e2152f7110 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, writeText }: +{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText }: buildGoPackage rec { name = "fzf-${version}"; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 84d3239729f5..990282b2d584 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, lib, file, licenseFile, optgamsFile}: +{ stdenv, fetchurl, unzip, file, licenseFile, optgamsFile}: assert licenseFile != null; diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 7c944ceaab3f..c187b09624ad 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: with builtins; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index 24841a2bac79..a5871d2bc33e 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: let goPackagePath = "github.com/github/gh-ost"; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 1c1fb05050f1..d7c10220f4b7 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gosu-${version}"; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 21a624c9d256..3f476cfea941 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, unzip, graylog }: +{ pkgs, stdenv, fetchurl, unzip, graylog }: with pkgs.lib; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 84c06a49f843..63511782f00b 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig +{ stdenv, fetchurl, flex, bison, python +, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex python pkgconfig ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper fuse ] + buildInputs = [ ncurses libusb freetype gettext lvm2 fuse ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 2bf7e3dcf43b..63a73658e0ac 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper +, gettext, ncurses, libusb, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper ] + buildInputs = [ ncurses libusb freetype gettext lvm2 ] ++ optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 1946cbeb3f01..d0bbd10d1e51 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { name = "hdf-${version}"; - version = "4.2.13"; + version = "4.2.14"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; - sha256 = "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm"; + sha256 = "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l"; }; buildInputs = [ diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix index 14c8ca234331..17b48ad8741a 100644 --- a/pkgs/tools/misc/hdf5/1_8.nix +++ b/pkgs/tools/misc/hdf5/1_8.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, gcc , removeReferencesTo , cpp ? false , gfortran ? null diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 494616d2b485..31813c0b880a 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, gcc , removeReferencesTo , cpp ? false , gfortran ? null diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 03af224b4c05..82801da322c6 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ant, javac, hdf_java }: +{ stdenv, fetchurl, ant, javac, hdf_java }: stdenv.mkDerivation rec { name = "hdfview-${version}"; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index 52e7793d9744..7035f2ecedff 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "i3cat-${version}"; diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index decc4afde0b9..141fc968a2d4 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "ical2org-${version}"; - version="v.1.1.5"; + version="1.1.5"; goPackagePath = "github.com/rjhorniii/ical2org"; src = fetchFromGitHub { owner = "rjhorniii"; repo = "ical2org"; - rev = "${version}"; + rev = "v.${version}"; sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm"; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 033e93609ab2..6ec9729438c8 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "6"; + version = "7"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1wgmmz1gvphkz0rnjyvgn3860yzvxwackb1dwqbgjrqsqy8ba01z"; + sha256 = "11n5svxhc2781ss7v15w40ac81mchhcvkszhb2r70zry7sa15li1"; }; goPackagePath = "github.com/gokcehan/lf"; @@ -28,6 +28,10 @@ buildGoPackage rec { runHook postBuild ''; + postInstall = '' + install -D --mode=444 lf.1 $out/share/man/man1/lf.1 + ''; + meta = with stdenv.lib; { description = "A terminal file manager written in Go and heavily inspired by ranger"; longDescription = '' diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 8d55b2cdc00e..eb3b6aa11e6a 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index e49614834ae3..d0395ecbd7f0 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index c17c99980a88..cb9e2cbf1e84 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, zeromq }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index fbfcfc100740..2c13927dfad8 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index f8910f83ec57..18177c0a7e30 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, secp256k1 }: let diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix index 085e6f41a091..e2ff4868c9ea 100644 --- a/pkgs/tools/misc/massren/default.nix +++ b/pkgs/tools/misc/massren/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "massren-${version}"; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index ce8ad76ba829..1d3a355dd950 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mmake-${version}"; @@ -17,7 +17,13 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://github.com/tj/mmake; - description = "Mmake is a small program which wraps make to provide additional functionality, such as user-friendly help output, remote includes, and eventually more. It otherwise acts as a pass-through to standard make."; + description = "A small program which wraps make to provide additional functionality"; + longDescription = '' + Mmake is a small program which wraps make to provide additional + functionality, such as user-friendly help output, remote + includes, and eventually more. It otherwise acts as a + pass-through to standard make. + ''; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.gabesoft ]; diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 7657b072aa89..26fcea669c22 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { - version = "2.17.4"; + version = "2.17.7"; name = "mrtg-${version}"; src = fetchurl { url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; - sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy"; + sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v"; }; buildInputs = [ diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 7dbfc90fa125..a076a405ce78 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "neofetch-${version}"; diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index c4a304e0d284..6211c863bd49 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -4,7 +4,7 @@ coreutils, # mktemp grub2, # grub-mount and grub-probe cryptsetup, # cryptsetup libuuid, # blkid and blockdev -libudev, # udevadm udevinfo +udev, # udevadm udevinfo ntfs3g # ntfs3g }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 libudev coreutils cryptsetup libuuid ntfs3g ]} \ + --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 267b458cccc6..be96dd9d3d35 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, glib, gettext, readline, pkgconfig }: +{stdenv, fetchurl, glib, gettext, readline, pkgconfig }: stdenv.mkDerivation rec { name = "pal-0.4.3"; diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 260d96a981f3..52e704eb52e1 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, fetchFromGitHub, bashInteractive +{ lib, fetchFromGitHub, bashInteractive , python3, vim }: diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 0a0cece4fce6..6649db4c48da 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, devicemapper, libuuid, gettext, readline, perl, python2 +{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline, perl, python2 , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b"; sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q"; + }) + ++ stdenv.lib.optional (lvm2 == null) + (fetchpatch { + url = https://git.savannah.gnu.org/cgit/parted.git/patch/?id=7e87ca3c531228d35e13e802d2622006138b104c; + sha256 = "0i29lfg8cwj342q5s7qwqhncz2bkifj5rjc7cx6jd4zqb6ykkndj"; }); postPatch = stdenv.lib.optionalString doCheck '' @@ -25,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (lvm2 != null) lvm2 ++ stdenv.lib.optional (hurd != null) hurd ++ stdenv.lib.optionals doCheck [ check perl python2 ]; @@ -33,7 +38,7 @@ stdenv.mkDerivation rec { (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; # Tests were previously failing due to Hydra running builds as uid 0. diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index 38cab5cf8623..69b60ae0997e 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchFromGitHub, fetchurl, lib, + mkDerivation, fetchFromGitHub, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework }: diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index f39ee734d81d..c320f8ef5f6a 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, perl, wineStaging +{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wineStaging }: let diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 670f70677654..c1b99b315677 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rsync, glibc, gawk }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { version = "5.53"; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index c6fdf0a5120e..a43335626acf 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: +{ stdenv, fetchurl, qtbase, qttools, qmake }: let inherit (stdenv.lib) getDev; in diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index db68fab75ab1..11ac0fc14199 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rcm-${version}"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"; - sha256 = "9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f"; + sha256 = "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck"; }; patches = [ ./fix-rcmlib-path.patch ]; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index f1712a43c3be..a1fa7dee0836 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, emacs, curl, check, bc }: +{ fetchurl, stdenv, emacs, curl, check, bc }: stdenv.mkDerivation rec { name = "recutils-1.7"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 668a3fd5c996..082eb6879c41 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, skalibs, gcc }: +{ stdenv, fetchurl, skalibs }: with stdenv.lib; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 52a57629cd10..563232dbe53d 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 -, acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2 +, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, utillinux }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { docbook_xsl libxslt docbook_xml_dtd_45 ]; buildInputs = [ - acl attr boost btrfs-progs dbus_libs diffutils e2fsprogs libxml2 + acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 lvm2 pam python utillinux ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index f0abb38706b0..9ba61221684a 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip -, rtmpdump, substituteAll }: +, rtmpdump }: let inherit (pythonPackages) python nose pycrypto requests mock; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 9d12fa254d47..a58eb3156384 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook -, makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl +, docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify , gobjectIntrospection, libsecret , cups-filters , pythonPackages -, withGUI ? true }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index b9c93c639549..0ad683bd652c 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "t-3.1.0"; diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index 475d444c6007..6e17ce26e0de 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tio-${version}"; - version = "1.30"; + version = "1.31"; src = fetchzip { url = "https://github.com/tio/tio/archive/v${version}.tar.gz"; - sha256 = "1cyjy1jg2s32h1jkb99qb79sxkxh92niiyig0vysr14m4xnw01mr"; + sha256 = "1164ida1vxvm0z76nmkk2d5y9i3wj8rni9sl1mid6c09gi4k2slk"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 1f50eef0ed00..be6a5070d611 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -1,4 +1,4 @@ -{ lib, buildRubyGem, makeWrapper, ruby }: +{ lib, buildRubyGem, ruby }: # Cannot use bundleEnv because bundleEnv create stub with # BUNDLE_FROZEN='1' environment variable set, which broke everything diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 3932e06192ed..dd0fb4de702e 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, python }: with python.pkgs; diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 2b240e022d81..2729f6f88594 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libcaca, figlet }: +{ stdenv, fetchurl, pkgconfig, libcaca }: stdenv.mkDerivation rec { name = "toilet-${version}"; @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libcaca ]; - meta = { + meta = with stdenv.lib; { description = "Display large colourful characters in text mode"; homepage = http://caca.zoy.org/wiki/toilet; - license = stdenv.lib.licenses.wtfpl; - platforms = stdenv.lib.platforms.all; + license = licenses.wtfpl; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 113c7e127d4f..7ae871afc783 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, coreutils -, python3, python3Packages, substituteAll }: +, python3Packages, substituteAll }: python3Packages.buildPythonApplication rec { name = "trash-cli-${version}"; diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index ff8e7873839b..7751e03df193 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 25687a3dbe1e..48edb601a43f 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison +{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison , flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline , python3 , svfSupport ? false diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 2b801bb74a42..b1704c3b46c6 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub }: with rustPlatform; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 80a728747fef..e03f84355cad 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,6 +1,6 @@ { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs , fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool -, libuuid, libxfs, lvm2, openssl, perl, procps, quota, su +, libuuid, libxfs, lvm2, openssl, perl, procps, quota , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 80135f4ab447..c4cfc00308e9 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt +{ stdenv, fetchurl, makeWrapper, xorgserver, getopt , xauth, utillinux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { diff --git a/pkgs/tools/misc/xxd/default.nix b/pkgs/tools/misc/xxd/default.nix deleted file mode 100644 index a4cfd4321ba0..000000000000 --- a/pkgs/tools/misc/xxd/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, vim }: - -stdenv.mkDerivation rec { - name = "xxd-${version}"; - inherit (vim) version; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/{bin,share/man/man1} - install -m755 ${stdenv.lib.getBin vim}/bin/xxd $out/bin/xxd - install -m644 ${stdenv.lib.getBin vim}/share/man/man1/xxd.1.gz $out/share/man/man1/xxd.1.gz - ''; - meta = with stdenv.lib; { - description = "Make a hexdump or do the reverse."; - inherit (vim.meta) homepage license maintainers platforms; - }; -} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7e503f326fd5..be6bacd3b214 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPlatform, fetchurl, buildPythonPackage +{ lib, fetchurl, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the @@ -12,20 +12,19 @@ , hlsEncryptedSupport ? true , makeWrapper }: -with stdenv.lib; buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.05.18"; + version = "2018.07.10"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "11r0hv6885w8k4m307kvf9545vr5a3ym9bf7szghvbcgmgc8lm5w"; + sha256 = "1rigah941k2drzx5qz937lk68gw9jrizj5lgd9f9znp0bgi2d0xd"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ zip ] ++ optional generateManPage pandoc; - propagatedBuildInputs = optional hlsEncryptedSupport pycryptodome; + buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; + propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP @@ -33,10 +32,10 @@ buildPythonPackage rec { makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] - ++ optional ffmpegSupport ffmpeg - ++ optional rtmpSupport rtmpdump - ++ optional phantomjsSupport phantomjs2; - in [ ''--prefix PATH : "${makeBinPath packagesToBinPath}"'' ]; + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional rtmpSupport rtmpdump + ++ lib.optional phantomjsSupport phantomjs2; + in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; postInstall = '' mkdir -p $out/share/zsh/site-functions @@ -46,7 +45,7 @@ buildPythonPackage rec { # Requires network doCheck = false; - meta = { + meta = with lib; { homepage = https://rg3.github.io/youtube-dl/; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; @@ -58,6 +57,6 @@ buildPythonPackage rec { ''; license = licenses.publicDomain; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz ]; + maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz enzime ]; }; } diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix index 528f9aecb54f..acc0bac04ff6 100644 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python27Packages +{ stdenv, fetchurl, python27Packages , libykneomgr, yubikey-personalization, libu2f-host }: python27Packages.buildPythonPackage rec { diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 492b72a176ed..589e6717c7dc 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "zsh-autoenv-${version}"; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index 93535e935dc8..6f6009c107ba 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, python, utillinux +{ stdenv, fetchFromGitHub , pkgs, makeWrapper, buildEnv , nodejs }: diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index e5c2aace4006..8b9d1e3b704c 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, - pkgconfig, procps, which, wget, lsof, net_snmp, bash, perl }: + pkgconfig, procps, which, wget, lsof, net_snmp, perl }: stdenv.mkDerivation rec { pname = "argus"; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 7af7a8f551d1..7904ffb0d04e 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: buildGoPackage rec { name = "assh-${version}"; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 1d9e2e1677fd..e20d62d1f077 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, libX11 }: +{ stdenv, fetchFromGitHub, qmake, qtbase }: stdenv.mkDerivation rec { name = "cmst-${version}"; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index f6e0608ca7f8..e960f8c3a848 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, openconnect, file, gawk, +{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk, openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, wpa_supplicant, readline6, pptp, ppp }: diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index ab293a869d05..2ebae0b0c17f 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -63,6 +63,10 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback + # to nss-cacert from the default profile. + "--without-ca-bundle" + "--without-ca-path" "--with-ca-fallback" "--disable-manual" ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 1038882573bc..ff4a24fb7810 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages -, sysstat, unzip, makeWrapper }: +, unzip, makeWrapper }: let inherit (pythonPackages) python; docker_1_10 = pythonPackages.buildPythonPackage rec { diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index 91232b4ffa74..af4b03ab700b 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; - homepage = http://packages.ubuntu.com/ru/lucid/dhcpdump; + homepage = https://packages.ubuntu.com/ru/lucid/dhcpdump; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix index dc4e4b93b1dd..cdf9c778838f 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - description = "A tool that provides secure DNS resolution."; + description = "A tool that provides secure DNS resolution"; license = licenses.isc; homepage = https://dnscrypt.info/; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 6205934084e8..9adb95d1d3fb 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack, fetchpatch }: +{ stdenv, fetchurl, pkgconfig, dbus, nettle +, libidn, libnetfilter_conntrack }: with stdenv.lib; let @@ -11,23 +12,13 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.78"; + name = "dnsmasq-2.79"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549"; + sha256 = "07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-15107.patch"; - url = "http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=4fe6744a220eddd3f1749b40cac3dfc510787de6"; - sha256 = "0r8grhh1q46z8v6manx1vvfpf2vmchfzsg7l1djh63b1fy1mbjkk"; - # changelog does not apply cleanly but its safe to skip - excludes = [ "CHANGELOG" ]; - }) - ]; - preBuild = '' makeFlagsArray=("COPTS=${copts}") ''; @@ -72,7 +63,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nettle libidn ] - ++ optionals stdenv.isLinux [ dbus_libs libnetfilter_conntrack ]; + ++ optionals stdenv.isLinux [ dbus libnetfilter_conntrack ]; meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 732051d8ec78..e440d35e8210 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 7521a9a13bc2..dac3b616a9c8 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -2,14 +2,14 @@ pythonPackages.buildPythonApplication rec { pname = "http-prompt"; - version = "0.11.1"; + version = "0.11.2"; name = "${pname}-${version}"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0gi76wcn6lxkd74ljpbyhr7ylhq6sm8z7h66dnfmpsw4nhw49178"; + sha256 = "130w3wkb5jbiwm5w0b470nd50gf30vrknmf3knhlgdxdmfb30zjz"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index e2049967e889..55abeb4f583d 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.34"; + name = "i2p-0.9.35"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1b3qw096b9i55izvrh2793sbg0ikvihfi6k15sz2pzmjn30hy37l"; + sha256 = "02p76vn1777lgv4zs27r6i9s4yk7b2x61b25i8dqmn6j60y3fa4g"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index c7d7b5ec6dfd..12f68af7d0a6 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , boost, zlib, openssl , upnpSupport ? true, miniupnpc ? null , aesniSupport ? false diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 9d588f6fa5e1..2bd76188a638 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , gnutls, libite, libconfuse }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index f28c75774db5..c66218c48986 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, getopt, ip2location-c, openssl, perl -, geoip ? null, geolite-legacy ? null -, ip2location-database ? null }: +, geoip ? null, geolite-legacy ? null }: stdenv.mkDerivation rec { name = "ipv6calc-${version}"; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix new file mode 100644 index 000000000000..1444c398e20c --- /dev/null +++ b/pkgs/tools/networking/kail/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kail-${version}"; + version = "0.6.0"; + + goPackagePath = "github.com/boz/kail"; + + src = fetchFromGitHub { + owner = "boz"; + repo = "kail"; + rev = "v${version}"; + sha256 = "17ybcncdjssil4bn3n2jp1asfcpl8vj560afb2mry9032qrryvx9"; + }; + + # regenerate deps.nix using following steps: + # + # go get -u github.com/boz/kail + # cd $GOPATH/src/github.com/boz/kail + # git checkout <version> + # dep init + # dep2nix + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Kubernetes log viewer"; + homepage = https://github.com/boz/kail; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/tools/networking/kail/deps.nix b/pkgs/tools/networking/kail/deps.nix new file mode 100644 index 000000000000..b7b4bfb38560 --- /dev/null +++ b/pkgs/tools/networking/kail/deps.nix @@ -0,0 +1,489 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "06f11fffc537c4aef126d9fd3a92e2d7968f118f"; + sha256 = "1zhr1pyzk44zb95r2bcs4kkngvmzdr5bac55315nnzl3adx4y4dn"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "f6be1abbb5abd0517522f850dd785990d373da7e"; + sha256 = "1dgmvvp2lk5z2mc9f6wg5jgi2szgljy02k69lqbym8zqlph3h01n"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "7cf257f0a33260797b0febf39f95fccd86aab2a3"; + sha256 = "1j4dcv8ryqxwpmb6k12ilkgkjwa0viymygfa3ilvfw0149jh0syk"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/boz/go-lifecycle"; + fetch = { + type = "git"; + url = "https://github.com/boz/go-lifecycle"; + rev = "c39961a5a0ce6b046f15d62bcbed79701666a9e0"; + sha256 = "12xzjzgi0pspb28xrcmp4v33jij2bbg609z1kpq1pql9mxs6h31k"; + }; + } + { + goPackagePath = "github.com/boz/go-logutil"; + fetch = { + type = "git"; + url = "https://github.com/boz/go-logutil"; + rev = "9d21a9e4757dbc497f947fe5253f9570c34562fa"; + sha256 = "0rhhyvvz1lvjalv3hx4yvyh90jqfia27nzx9m54m0i7d0znrwpbj"; + }; + } + { + goPackagePath = "github.com/boz/kcache"; + fetch = { + type = "git"; + url = "https://github.com/boz/kcache"; + rev = "fb1338d323013e9456687dc080038aa0bb211783"; + sha256 = "05y7j3sxpa9nhpq53af9ad42fvwx7l3cpjm69nminrlqjmjs63zd"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "adab96458c51a58dc1783b3335dcce5461522e75"; + sha256 = "1y743w875aqqwggrh4lwlmqyx7ls5m1bnw5y4vr3zps4ib3gb4n5"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "a539ee1a749a2b895533f979515ac7e6e0f5b650"; + sha256 = "1kxvm6zyawisl3w4pcycqjld4r0x6hqpfh9jwqsg5y9pi330n5z9"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40"; + sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful-swagger12"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful-swagger12"; + rev = "dcef7f55730566d41eae5db10e7d6981829720f6"; + sha256 = "0zz1f6n1qfbyrp592mgyrkyfhki3r0ksic6ja9lxisg8br1ibrvq"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "67c513e5729f918f5e69786686770c27141a4490"; + sha256 = "045i2y2h1a6ml7fm1b3if4692320kjgg3cpxn7chlmpq7z1bmrrn"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "779f45308c19820f1a69e9a4cd965f496e0da10f"; + sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "36d33bfe519efae5632669801b180bf1a245da3b"; + sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "3faa0055dbbf2110abc1f3b4e3adbb22721e96e7"; + sha256 = "1a3q073zaq5d10kzgba7a85l4g389r5qgbpwk4nkbawpdzm8svaz"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; + sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9"; + sha256 = "0h9vkfy3ydz0d6x72853yg49r9k54cgjnlv6a7v12gzqw47p941i"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1909bc2f63dc92bb931deace8b8312c4db72d12f"; + sha256 = "0d4pknkgp5qlbfpw8xp81dqgrfm0na1pfi2ll559nwvjz5vc90g5"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "316fb6d3f031ae8f4d457c6c5186b9e3ded70435"; + sha256 = "1fyj10cy2d37mpfk73hjfjwpsgpnmdzf2mrkkvzyx0d41sf46xfd"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "57b0290873708074edf87ad921eccec8bef5f8ec"; + sha256 = "14raxxsx2bww4f0am0yygv64h950avkswm7bdvq6k4d4lry6dgg8"; + }; + } + { + goPackagePath = "github.com/gophercloud/gophercloud"; + fetch = { + type = "git"; + url = "https://github.com/gophercloud/gophercloud"; + rev = "b4c2377fa77951a0e08163f52dc9b3e206355194"; + sha256 = "00j9ny59zlf3ajwydf2k41n3l92kl2hf0ljx9x73jcfkdkn2xv5k"; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "c1f8028e62adb3d518b823a2f8e6a95c38bdd3aa"; + sha256 = "1v7fb4ix2xg0plx5p1f7xd1srvimyss7v7ppn3j7py9ycl560qhr"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "e3000cb3d28c72b837601cac94debd91032d19fe"; + sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "abe3c4016bd3f50fa9c5b0e909641e2b8370b0cf"; + sha256 = "18v04mxgssjw2wivrbrfm8v7k617szjjdndgink00pla03pga0cc"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "5b9ff866471762aa2ab2dced63c9fb6f53921342"; + sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"; + sha256 = "0d9m8kyhbawa452vnwn255xxnh6pkp3im0d2310rw1k14nh3yh1p"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "6df6d4d004b64986bbb0d1b25945f42b44787e90"; + sha256 = "0ha2biq708is9i3hqc30vihcpajak3qawn0rnacb9k1gyxsxwb60"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; + sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; + }; + } + { + goPackagePath = "github.com/petar/GoLLRB"; + fetch = { + type = "git"; + url = "https://github.com/petar/GoLLRB"; + rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; + sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/diskv"; + rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; + sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb"; + sha256 = "07fd392kqyaj7fnl4sgzy7fcs0sw4jx3mx2khhgk64n9j9i37l59"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "181d419aa9e2223811b824e8f0b4af96f9ba9302"; + sha256 = "08ff47w4clnkym3l0v4hhhfq21zvvwzpljvs0qvki5k0azv7siyc"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; + sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"; + sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "b176d7def5d71bdd214203491f89843ed217f420"; + sha256 = "1ayi4iagsxhf193rx93j6y2rb48730hgm2qbahiq9lawm5g3vc14"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; + sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "9a379c6b3e95a790ffc43293c2a78dee0d7b6e20"; + sha256 = "156wff8s9g3sxni2z80wky4v688pvdgfzxbpfp5rmqjvgqnifxkf"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "2d3e384235de683634e9080b58f757466840aa48"; + sha256 = "1w8zrcjv4sfi3skchdbvbixgwzp5n1g0vny8r20dlapnqbazah0x"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; + sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "d9a072cfa7b9736e44311ef77b3e09d804bfa599"; + sha256 = "07x7s65q9pydpaniga6zf259kw7qs40q6554wb22inq423wcs0nb"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; + sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; + sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "218912509d74a117d05a718bb926d0948e531c20"; + sha256 = "076jca9c4rsg2kwjwv4kr6qgpbj4w1z0xprkxz5f5glxjnffdifk"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "18a564baac720819100827c16fdebcadb05b2d0d"; + sha256 = "0x6sxr79rmnjyk0m53n66xr58xb8mza716jdn9f0djjwd10d1p1i"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "82aa063804cf055e16e8911250f888bc216e8b61"; + sha256 = "1l8dakfsawgxhiaqq0k9360gl13vr44sbjdxf7sbg3pl2csmi6pf"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "abfc5fbe1cf87ee697db107fdfd24c32fe4397a8"; + sha256 = "1hvrdbpf8w6jr533pa3cqws42plasl5vzcr8fj89gxdbhga6b10j"; + }; + } +] diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 67428664556a..f35ceeae8640 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "kea"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "14f32lsdd1824cx9a4l4pfbhq1d4jik6l6hxd911ihi64nzwvpvf"; + sha256 = "0a0inchisrjry59z14w4ha210q2ffl31gjbhp5dgrbap6swyry60"; }; patches = [ ./dont-create-var.patch ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--with-dhcp-pgsql=${postgresql}/bin/pg_config" - "--with-dhcp-mysql=${mysql.connector-c}/bin/mysql_config" + "--with-pgsql=${postgresql}/bin/pg_config" + "--with-mysql=${mysql.connector-c}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/tools/networking/kea/dont-create-var.patch index 595942673c68..385113d160f6 100644 --- a/pkgs/tools/networking/kea/dont-create-var.patch +++ b/pkgs/tools/networking/kea/dont-create-var.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.am b/Makefile.am -index 897be34..b146729 100644 +index 2c0733c..974bb5e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -103,11 +103,6 @@ cppcheck: +@@ -135,11 +135,6 @@ cppcheck: --template '{file}:{line}: check_fail: {message} ({severity},{id})' \ src @@ -15,14 +15,12 @@ index 897be34..b146729 100644 EXTRA_DIST += tools/mk_cfgrpt.sh diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am -index 066b410..16d3135 100755 +index 564f623..7cea9f2 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am -@@ -210,7 +210,3 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox - # Specification file - EXTRA_DIST += logging.spec +@@ -352,5 +352,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ + parsers/simple_parser6.h + -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir) -- -- diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 0b585d10316c..2e045ad8de91 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -9,14 +9,14 @@ let else throwSystem; throwSystem = throw "Unsupported system: ${stdenv.system}"; sha256 = - if stdenv.system == "x86_64-linux" then "011xg1frhjavv6zj1y3da0yh7rl6v1ax6xy2g8fk3sry9bi2p4j3" + if stdenv.system == "x86_64-linux" then "11mxa4kls5xjj3462ycrfvfxb1xkk23p5m9iirvwsi0zdmhpnwm8" else if stdenv.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62" else throwSystem; libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { name = "logmein-hamachi-${version}"; - version = "2.1.0.174"; + version = "2.1.0.198"; src = fetchurl { url = "https://www.vpn.net/installers/${name}-${arch}.tgz"; diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index 425e531419e4..a7648fd59c35 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gcc, glibc +{ stdenv, fetchFromGitHub, cmake, pkgconfig, glibc , bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 07112d1497af..0c546ff91090 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, iptables, libuuid, pkgconfig }: stdenv.mkDerivation rec { - name = "miniupnpd-2.1"; + name = "miniupnpd-2.1.20180706"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m"; + sha256 = "01mhv3lgpj2shs3666zwlhvfiv1mpf4h9mv35g8gihyq8k82ybgw"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch deleted file mode 100644 index 4850d93716de..000000000000 --- a/pkgs/tools/networking/network-manager/PppdPath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- NetworkManager-1.6.2.org/src/ppp/nm-ppp-manager.c 2017-02-15 13:10:27.000000000 +0100 -+++ NetworkManager-1.6.2/./src/ppp/nm-ppp-manager.c 2017-04-03 11:45:39.891653216 +0200 -@@ -724,7 +724,7 @@ - - g_return_val_if_fail (setting != NULL, NULL); - -- pppd_binary = nm_utils_find_helper ("pppd", NULL, err); -+ pppd_binary = nm_utils_find_helper ("pppd", PPPD_PATH, err); - if (!pppd_binary) - return NULL; - diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index ecd10a139766..98b9b0aef4d6 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 +{ stdenv, fetchurl, fetchpatch, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection @@ -6,18 +6,25 @@ let pname = "network-manager-applet"; - version = "1.8.10"; + version = "1.8.14"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a"; + sha256 = "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya"; }; + patches = [ + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch; + sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk"; + }) + ]; + mesonFlags = [ "-Dselinux=false" - "-Dappindicator=true" + "-Dappindicator=yes" "-Dgcr=${if withGnome then "true" else "false"}" ]; @@ -34,7 +41,6 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ hicolor-icon-theme - gnome3.gnome-keyring # See https://github.com/NixOS/nixpkgs/issues/38967 ]; NIX_CFLAGS = [ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 9a129f522134..62c9e7b63d16 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib, gnome3 -, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables +{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus-glib, gnome3 +, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt -, python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }: +, ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt +, python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }: let - pname = "NetworkManager"; - version = "1.10.6"; + pname = "NetworkManager"; in stdenv.mkDerivation rec { - name = "network-manager-${version}"; + name = "network-manager-${version}"; + version = "1.12.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xmc3x41dbcaxjm85wfv405xq1a1n3xw8m8zg645ywm3avlb3w3a"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "15bzjkrfa7sw5p5hkdha4a67y1zfnzh1s6za11sh8s1yxmyvkziq"; }; outputs = [ "out" "dev" ]; @@ -25,11 +25,6 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file - substituteInPlace src/devices/nm-device.c \ - --replace /usr/bin/ping ${inetutils}/bin/ping \ - --replace /usr/bin/ping6 ${inetutils}/bin/ping - substituteInPlace src/devices/nm-arping-manager.c \ - --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);' substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ @@ -38,10 +33,6 @@ in stdenv.mkDerivation rec { --replace /bin/sed ${gnused}/bin/sed substituteInPlace data/NetworkManager.service.in \ --replace /bin/kill ${coreutils}/bin/kill - substituteInPlace clients/common/nm-vpn-helpers.c \ - --subst-var-by openconnect ${openconnect} - substituteInPlace src/nm-core-utils.c \ - --subst-var-by modprobeBinPath ${kmod}/bin/modprobe # to enable link-local connections configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" @@ -70,16 +61,32 @@ in stdenv.mkDerivation rec { "--with-modem-manager-1" "--with-nmtui" "--disable-gtk-doc" + "--with-libnm-glib" # legacy library, TODO: remove + "--disable-tests" ]; patches = [ - ./PppdPath.patch - ./openconnect_helper_path.patch - ./modprobe.patch + # https://bugzilla.gnome.org/show_bug.cgi?id=796752 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=372955; + sha256 = "17rl19lprnsz4wjmp54c1qw6a3pf8x97bhd69xavwy7cx6z84b3n"; + }) + # https://bugzilla.gnome.org/show_bug.cgi?id=796751 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=372953; + sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a"; + }) + (substituteAll { + src = ./fix-paths.patch; + inherit inetutils kmod openconnect; + }) + ]; - buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl - bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; + buildInputs = [ + systemd libuuid polkit ppp libndp curl + bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson + ]; propagatedBuildInputs = [ dbus-glib gnutls libgcrypt python3Packages.pygobject3 ]; @@ -114,10 +121,10 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/NetworkManager; + homepage = https://wiki.gnome.org/Projects/NetworkManager; description = "Network configuration and management tool"; - license = licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix index 82810e714d52..93827eebb571 100644 --- a/pkgs/tools/networking/network-manager/dmenu.nix +++ b/pkgs/tools/networking/network-manager/dmenu.nix @@ -1,5 +1,5 @@ { stdenv, glib, fetchFromGitHub, networkmanager, python3Packages -, gobjectIntrospection, dmenu }: +, gobjectIntrospection }: let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch index b735da28dca1..5deaa2026d0f 100644 --- a/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/pkgs/tools/networking/network-manager/fix-paths.patch @@ -1,34 +1,41 @@ ---- a/properties/nm-openvpn-editor.c -+++ b/properties/nm-openvpn-editor.c -@@ -775,8 +775,7 @@ - nm_find_openvpn (void) - { - static const char *openvpn_binary_paths[] = { -- "/usr/sbin/openvpn", -- "/sbin/openvpn", -+ "@openvpn@/bin/openvpn", - NULL - }; - const char **openvpn_binary = openvpn_binary_paths; ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c -@@ -522,9 +522,7 @@ - openvpn_binary_find_exepath (void) - { - static const char *paths[] = { -- "/usr/sbin/openvpn", -- "/sbin/openvpn", -- "/usr/local/sbin/openvpn", -+ "@openvpn@/bin/openvpn", - }; - int i; +--- a/clients/common/nm-vpn-helpers.c ++++ b/clients/common/nm-vpn-helpers.c +@@ -205,7 +205,7 @@ + char *argv[4]; + const char *path; -@@ -2326,7 +2324,7 @@ - _LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting..."); +- path = nm_utils_find_helper ("openconnect", "/usr/sbin/openconnect", error); ++ path = "@openconnect@/bin/openconnect"; + if (!path) + return FALSE; - if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS) -- && (system ("/sbin/modprobe tun") == -1)) -+ && (system ("@kmod@/bin/modprobe tun") == -1)) - return EXIT_FAILURE; +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -11828,14 +11828,14 @@ + gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); + if (gw) { + nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); +- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL); ++ ping_binary = "@inetutils@/bin/ping"; + log_domain = LOGD_IP4; + } + } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) { + gw = nm_ip6_config_best_default_route_get (priv->ip_config_6); + if (gw) { + nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); +- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL); ++ ping_binary = "@inetutils@/bin/ping"; + log_domain = LOGD_IP6; + } + } +--- a/src/nm-core-utils.c ++++ b/src/nm-core-utils.c +@@ -428,7 +428,7 @@ - plugin = nm_openvpn_plugin_new (bus_name); + /* construct the argument list */ + argv = g_ptr_array_sized_new (4); +- g_ptr_array_add (argv, "/sbin/modprobe"); ++ g_ptr_array_add (argv, "@kmod@/bin/modprobe"); + g_ptr_array_add (argv, (char *) arg1); + + va_start (ap, arg1); diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix index 73aaea06c917..54046a23b7df 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig, -networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }: +networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let pname = "NetworkManager-fortisslvpn"; diff --git a/pkgs/tools/networking/network-manager/modprobe.patch b/pkgs/tools/networking/network-manager/modprobe.patch deleted file mode 100644 index 487c70b0165c..000000000000 --- a/pkgs/tools/networking/network-manager/modprobe.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/nm-core-utils.c 2017-02-15 13:10:27.000000000 +0100 -+++ b/src/nm-core-utils.c 2017-07-06 14:28:41.575815695 +0200 -@@ -419,7 +419,7 @@ - - /* construct the argument list */ - argv = g_ptr_array_sized_new (4); -- g_ptr_array_add (argv, "/sbin/modprobe"); -+ g_ptr_array_add (argv, "@modprobeBinPath@"); - g_ptr_array_add (argv, (char *) arg1); - - va_start (ap, arg1); diff --git a/pkgs/tools/networking/network-manager/openconnect_helper_path.patch b/pkgs/tools/networking/network-manager/openconnect_helper_path.patch deleted file mode 100644 index 597fb753e268..000000000000 --- a/pkgs/tools/networking/network-manager/openconnect_helper_path.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c -index 15611c45c..4a7444d3a 100644 ---- a/clients/common/nm-vpn-helpers.c -+++ b/clients/common/nm-vpn-helpers.c -@@ -203,23 +203,8 @@ nm_vpn_openconnect_authenticate_helper (const char *host, - gboolean ret; - char **strv = NULL, **iter; - char *argv[4]; -- const char *path; -- const char *const DEFAULT_PATHS[] = { -- "/sbin/", -- "/usr/sbin/", -- "/usr/local/sbin/", -- "/bin/", -- "/usr/bin/", -- "/usr/local/bin/", -- NULL, -- }; -- -- path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS, -- G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error); -- if (!path) -- return FALSE; - -- argv[0] = (char *) path; -+ argv[0] = "@openconnect@/bin/openconnect"; - argv[1] = "--authenticate"; - argv[2] = (char *) host; - argv[3] = NULL; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index b1ee3da1b058..28b7c873d364 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, kmod }: +, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openvpn"; - version = "1.8.2"; + version = "1.8.4"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p9pjk81h1j1dk9jkkvvk17cq21wyq5kfa4j49fmx9b9yg8syqc8"; + sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"; }; patches = [ diff --git a/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch b/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch new file mode 100644 index 000000000000..b735da28dca1 --- /dev/null +++ b/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch @@ -0,0 +1,34 @@ +--- a/properties/nm-openvpn-editor.c ++++ b/properties/nm-openvpn-editor.c +@@ -775,8 +775,7 @@ + nm_find_openvpn (void) + { + static const char *openvpn_binary_paths[] = { +- "/usr/sbin/openvpn", +- "/sbin/openvpn", ++ "@openvpn@/bin/openvpn", + NULL + }; + const char **openvpn_binary = openvpn_binary_paths; +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -522,9 +522,7 @@ + openvpn_binary_find_exepath (void) + { + static const char *paths[] = { +- "/usr/sbin/openvpn", +- "/sbin/openvpn", +- "/usr/local/sbin/openvpn", ++ "@openvpn@/bin/openvpn", + }; + int i; + +@@ -2326,7 +2324,7 @@ + _LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting..."); + + if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS) +- && (system ("/sbin/modprobe tun") == -1)) ++ && (system ("@kmod@/bin/modprobe tun") == -1)) + return EXIT_FAILURE; + + plugin = nm_openvpn_plugin_new (bus_name); diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix index e354ad223b8c..26bcc8f803f1 100644 --- a/pkgs/tools/networking/ngrok-1/default.nix +++ b/pkgs/tools/networking/ngrok-1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }: +{ buildGoPackage, go-bindata, fetchFromGitHub }: buildGoPackage rec { name = "ngrok-${version}"; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index c7d153186986..647b7ed26da9 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages, - asciidoc, libxml2, libxslt, docbook_xml_xslt }: + asciidoc, libxml2, libxslt, docbook_xsl }: pythonPackages.buildPythonApplication rec { version = "7.2.1"; @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xml_xslt ]; + nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ]; propagatedBuildInputs = [ pythonPackages.six pythonPackages.kerberos ]; postInstall = '' diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 46c0ee0f2768..04a77176682d 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook +{ stdenv, fetchurl, fetchpatch, zlib, openssl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false , withKerberos ? true diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index c3d60d8e87b9..e74a3554dc29 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { name = "s3cmd-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; rev = "v${version}"; - sha256 = "198hzzplci57sb8hdan30nbakslawmijfw0j71wjvq85n3xn6qsl"; + sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk"; }; propagatedBuildInputs = with python2Packages; [ python_magic dateutil ]; diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index a13d6599ffb0..3814af60112e 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "s3gof3r-${version}"; diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix new file mode 100644 index 000000000000..20f129357dff --- /dev/null +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -0,0 +1,35 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "s4cmd"; + version = "2.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "14gfpnj4xa1sq3x3zd29drpzsygn998y32szwm069ma0w9jwjjz6"; + }; + + propagatedBuildInputs = with python3Packages; [ boto3 pytz ]; + + # The upstream package tries to install some bash shell completion scripts in /etc. + # Setuptools is bugged and doesn't handle --prefix properly: https://github.com/pypa/setuptools/issues/130 + patchPhase = '' + sed -i '/ data_files=/d' setup.py + sed -i 's|os.chmod("/etc.*|pass|' setup.py + ''; + + # Replace upstream's s4cmd wrapper script with the built-in Nix wrapper + postInstall = '' + ln -fs $out/bin/s4cmd.py $out/bin/s4cmd + ''; + + # Test suite requires an S3 bucket + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/bloomreach/s4cmd; + description = "Super S3 command line tool"; + license = licenses.asl20; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index d2e8a9a30519..09fa69dd37c4 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, cmake +{ stdenv, fetchgit, cmake , libsodium, mbedtls, libev, c-ares, pcre , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix index ce2a8cf6a7f3..e72147937445 100644 --- a/pkgs/tools/networking/skydive/default.nix +++ b/pkgs/tools/networking/skydive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl +{ lib, buildGoPackage, fetchFromGitHub, perl , go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: buildGoPackage rec { diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix new file mode 100644 index 000000000000..acda30dbfef8 --- /dev/null +++ b/pkgs/tools/networking/spoofer/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute +, withGUI ? false, qt5 }: + +let inherit (stdenv.lib) optional; +in + +stdenv.mkDerivation rec { + pname = "spoofer"; + version = "1.3.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz"; + sha256 = "05297dyyq8bdpbr3zz974l7vm766lq1bsxvzp5pa4jfpvnj7cl1g"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl protobuf libpcap traceroute ] + ++ optional withGUI qt5.qtbase ; + + meta = with stdenv.lib; { + homepage = https://www.caida.org/projects/spoofer; + description = "Assess and report on deployment of source address validation"; + longDescription = '' + Spoofer is a new client-server system for Windows, MacOS, and + UNIX-like systems that periodically tests a network's ability to + both send and receive packets with forged source IP addresses + (spoofed packets). This can be used to produce reports and + visualizations to inform operators, response teams, and policy + analysts. The system measures different types of forged + addresses, including private and neighboring addresses. The + test results allows to analyze characteristics of networks + deploying source address validation (e.g., network location, + business type). + ''; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ leenaars]; + }; +} diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index a3f08cb5a077..7d3f773b1930 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "srelay-0.4.8"; diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix new file mode 100644 index 000000000000..2a4cf3506df8 --- /dev/null +++ b/pkgs/tools/networking/subfinder/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "subfinder-git-${version}"; + version = "2018-07-15"; + + goPackagePath = "github.com/subfinder/subfinder"; + + src = fetchFromGitHub { + owner = "subfinder"; + repo = "subfinder"; + rev = "26596affed961c535676395f443acc5af95ac9e6"; + sha256 = "0m842jyrwlg4kaja1m3kca07jf20fxva0frg66b13zpsm8hdp10q"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Subdomain discovery tool"; + longDescription = '' + SubFinder is a subdomain discovery tool that discovers valid + subdomains for websites. Designed as a passive framework to be + useful for bug bounties and safe for penetration testing. + ''; + homepage = https://github.com/subfinder/subfinder; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/tools/networking/subfinder/deps.nix b/pkgs/tools/networking/subfinder/deps.nix new file mode 100644 index 000000000000..34095c814284 --- /dev/null +++ b/pkgs/tools/networking/subfinder/deps.nix @@ -0,0 +1,48 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/bogdanovich/dns_resolver"; + fetch = { + type = "git"; + url = "https://github.com/bogdanovich/dns_resolver"; + rev = "a8e42bc6a5b6c9a93be01ca204be7e17f7ba4cd2"; + sha256 = "0l1hgxxqafappw0y18sbkkk2vijclvf1b8x73b0nhi4r74wyib49"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "3e6e47bc11bc7f93f9e2f1c7bd6481ba4802808b"; + sha256 = "1vmsnv6r799z5lz5g9l2dh065m9003yfjb18w8n6c053hp8jvrfm"; + }; + } + { + goPackagePath = "github.com/subfinder/urlx"; + fetch = { + type = "git"; + url = "https://github.com/subfinder/urlx"; + rev = "8e731c8be06edbae81cab15937cd3c291c2a7680"; + sha256 = "11vrx1c0mq1h6lwpsvibd3386wy4kirzmmm8ibrlx2gj0h6pkkcb"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d0887baf81f4598189d4e12a37c6da86f0bba4d0"; + sha256 = "00dmz9a5d3myyb0256b33vf1bk8wv1khhh88kcvbmqsfd6x1n6p5"; + }; + } +] diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 59cc89ac5727..8b4850a6347c 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libpcap }: +{ stdenv, fetchurl, libpcap }: stdenv.mkDerivation rec { name = "tcpdump-${version}"; diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index 9e13cfc59c1c..cfb627e8b3b9 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv , pkgs , fetchurl, libpcap, libnet +{ stdenv , fetchurl, libpcap, libnet }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index b9abba2cd0da..bc97d5d8d6e4 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcp_wrappers }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tftp-hpa-${version}"; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index db4b6a2281d4..09c737c048ae 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { name = "tinc-${version}"; diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 5fe69ede1a7d..ea40a541a224 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn +{ stdenv, buildGoPackage, fetchgit , pkgconfig , glib, libxml2 }: diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index e644578b6642..b11d149da889 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.3.1"; + version = "5.3.2"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "1xqvcsh70590bwmy37kwlwyl0rvnlqx987km3mnij93q4kvabg5n"; + sha256 = "1sd6jl349kz3bjwm8rx9kihxyd3d35cac4swla843vwzdpczsk5f"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index fe315666a2ea..9f67dd4e2c30 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, python2Packages , wpa_supplicant, dhcp, dhcpcd, wirelesstools -, nettools, openresolv, iproute, iputils -, locale ? "C" }: +, nettools, openresolv, iproute, iputils }: let inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 4d4a9446b455..24a19b8de9db 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180625"; + version = "0.0.20180708"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1z7iibydj59nzx0jcxabb9k7b6djjz6yi032n66mqr98dh4dlkb7"; + sha256 = "04c3vynr7rfmnnw7gccbap9xcfi89ma09lq66c4bzjzxny1n2wdz"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 263a44615305..7dc0e07f9451 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, ant }: +{ stdenv, fetchFromGitHub, jdk, ant }: stdenv.mkDerivation rec { name = "zap-${version}"; diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index f6c4c25559e2..f673ba5f2d6b 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -62,6 +62,7 @@ buildFHSUserEnv { libcap SDL2 libusb1 + libudev dbus-glib libav atk diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix index 042c999be0df..67aa52f47894 100644 --- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix +++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix @@ -3,13 +3,6 @@ with pkgs; let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index df5a39d6a031..b5d66bec5cca 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,15 +4,15 @@ with rustPlatform; buildRustPackage rec { name = "nix-index-${version}"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; rev = "v${version}"; - sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5"; + sha256 = "17pms3cq3i3jan1irxgqfr3nrjy6zb21y07pwqp9v08hyrjpfqin"; }; - cargoSha256 = "0cxdrzjmqq3ywdh0f5mzkcf50hbbgd3bak4398v2ls5gy5s9fcz2"; + cargoSha256 = "0b7xwcgjds80g08sx91lqip8syb52n458si4q4xycvvsand5fa10"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl curl]; diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index a2ff38ab3004..69e978d3439d 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, buildEnv, - git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils, nix + git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix }: let mkPrefetchScript = tool: src: deps: diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index facf47ebca67..9fe6ec6e291b 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }: +{ lib, stdenv, fetchFromGitHub, nix, readline }: let rev = "a1ea85e92b067a0a42354a28355c633eac7be65c"; in diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index d03e6f614e57..660dce347a5b 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, +{ stdenv, fetchFromGitHub, bzip2, nix, perl, perlPackages, }: diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c3f1e4d8d459..07c130f1cb38 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost -, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl +, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , busybox-sandbox-shell , hostPlatform, buildPlatform , storeDir ? "/nix/store" @@ -26,7 +26,7 @@ let nativeBuildInputs = [ pkgconfig ] ++ lib.optionals (!is20) [ curl perl ] - ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ]; buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index f392e0f50ed1..105cb6d7ab0f 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -1,4 +1,4 @@ -{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh +{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh # version args , src, version }: @@ -31,7 +31,7 @@ python2Packages.buildPythonApplication { doCheck = false; postInstall = '' - make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ + make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ docdir=$out/share/doc/nixops mandir=$out/share/man mkdir -p $out/share/nix/nixops diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix index 27edfa890fcf..ce31de9f65d3 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoPackage , fetchFromGitHub }: diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 2d1e1fb326ae..6f46b39e65b1 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, nix, node_webkit, config, makeDesktopItem +{ stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem , writeScript }: let version = "0.2.1"; diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index c38ef25f3548..f0f05a4c858e 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qttools, packagekit }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, qttools, packagekit }: stdenv.mkDerivation rec { name = "packagekit-qt-${version}"; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 1ff0ad6f6b68..c61cbeb32682 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, callPackage, makeWrapper +{ stdenv, fetchurl, callPackage, makeWrapper , clang, llvm, which, libcgroup }: diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index d21500960fec..7637dcf246af 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2, zlib, pkgconfig, glib, ncurses, perl -, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +, attr, libcap, vde2, texinfo, libuuid, flex, bison, lzo, snappy , libaio, libcap_ng, gnutls, pixman, autoconf , writeText }: diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 91a5fa4bdd24..b3c256ae59bf 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "cfssl-${version}"; diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix index 859c1fdf49a0..a4afa772d10e 100644 --- a/pkgs/tools/security/cipherscan/default.nix +++ b/pkgs/tools/security/cipherscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, makeWrapper, python, coreutils }: +{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }: stdenv.mkDerivation rec { name = "cipherscan-${version}"; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index c3aa92bf4b01..825993937246 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig -, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre +{ stdenv, fetchurl, pkgconfig +, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2 +, libmspack, systemd }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.99.4"; + version = "0.100.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; - sha256 = "0q94iwi729id9pyc72w6zlllbaz37qvpi6gc51g2x3fy7ckw6anp"; + sha256 = "17x5b2gh84b167h6ip9hw05w809p009yx13i4gkps92ja5jjdq44"; }; # don't install sample config files into the absolute sysconfdir folder @@ -18,16 +19,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre + zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack + systemd ]; configureFlags = [ + "--libdir=$(out)/lib" "--sysconfdir=/etc/clamav" + "--with-systemdsystemunitdir=$(out)/lib/systemd" "--disable-llvm" # enabling breaks the build at the moment "--with-zlib=${zlib.dev}" "--with-xml=${libxml2.dev}" "--with-openssl=${openssl.dev}" "--with-libcurl=${curl.dev}" + "--with-system-libmspack" "--enable-milter" ]; diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix index 07061aa0d117..32819b603f90 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/tools/security/diceware/default.nix @@ -1,6 +1,5 @@ { lib , pythonPackages -, fetchpatch }: with pythonPackages; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index f27f9af59c68..b99087e475d2 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,7 +1,7 @@ {stdenv, system, fetchurl, dpkg, openssl, xorg , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig -, makeWrapper , makeDesktopItem, python, pythonPackages, lib +, makeWrapper , python, pythonPackages, lib , libredirect, lsof}: let diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 3a9c81df2343..9398b38cb34c 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs -, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg +, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake intltool libtool vala glib encfs gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE - wrapGAppsHook ]; + wrapGAppsHook gobjectIntrospection ]; patches = [ ./makefile-mkdir.patch ]; @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.spacefrogg ]; - broken = true; # 2018-04-10 }; } diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix index 23aec604d2d1..e71d313e20ab 100644 --- a/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "gnu-pw-mgr-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "http://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz"; - sha256 = "0x60g0syqpd107l8w4bl213imy2lspm4kz1j18yr1sh10rdxlgxd"; + sha256 = "04xh38j7l0sfnb01kp05xc908pvqfc0lph94k7n9bi46zy3qy7ma"; }; buildInputs = [ gnulib ]; diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index fdef447193d8..9404cb1d0655 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { prePatch = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i '' + stdenv.lib.optionalString stdenv.isLinux '' - sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' '' + '' diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index f28d57fa62bd..fd773da4adea 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba , libiconv, npth, gettext, texinfo, pcsclite, sqlite # Each of the dependencies below are optional. @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ./fix-libusb-include-path.patch ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' - sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 25102fd07303..88b15ebf43f5 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }: buildGoPackage rec { - version = "1.8.1"; + version = "1.8.2"; name = "gopass-${version}"; goPackagePath = "github.com/gopasspw/gopass"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - sha256 = "1b3caydxz3zf1ky6qvkx0dgidlalvpmga6cjh3gqc269n00lwh6w"; + sha256 = "0a2nnm3liilp2jcsvgyp87cjw92gspcc3azaszfvx125l63r4c9f"; }; wrapperPath = with stdenv.lib; makeBinPath ([ @@ -26,9 +26,6 @@ buildGoPackage rec { $bin/share/bash-completion/completions \ $bin/share/zsh/site-functions \ $bin/share/fish/vendor_completions.d - # by default, gopass tries to write configuration to /homeless-shelter - # during startup, which lands in stdout - export GOPASS_CONFIG=/dev/null $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass $bin/bin/gopass completion zsh > $bin/share/zsh/site-functions/_gopass $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index cbd260455d8e..df9d42211f6c 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: +{ fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: stdenv.mkDerivation rec { name = "gorilla-bin-${version}"; diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index fd78d9b2efbf..385a201d88b0 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, openssh, gnupg, unbound, libreswan }: +{ stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }: let inherit (pythonPackages) python; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 5d873885b1fd..e6c375599a92 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hologram-2018-03-19"; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index d9617e3eb2ba..62b92b7d0bdd 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeShellScriptBin, writeText }: +{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText }: let version = "1.4.0"; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index e55e97656f63..862b4a0df6e2 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 -, writeText, gcc, pythonPackages, perl, perlPackages, makeWrapper +, gcc, pythonPackages, perl, perlPackages, makeWrapper }: with stdenv.lib; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index b53860e406d2..549794b78313 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups +{ stdenv, fetchurl, alsaLib, atk, cairo, cups , dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk3 -, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }: +, libnotify, nspr, nss, pango, systemd, xorg }: let libPath = stdenv.lib.makeLibraryPath [ @@ -70,10 +70,9 @@ stdenv.mkDerivation rec { checkFailed fi - ${utillinuxMinimal}/bin/mountpoint /keybase &>/dev/null - if [ "\$?" -ne "0" ]; then - echo "Keybase is not mounted to /keybase." >&2 - echo "You might need to run: kbfsfuse /keybase" >&2 + if [ -z "\$(keybase status | grep kbfsfuse)" ]; then + echo "Could not find kbfsfuse client in keybase status." >&2 + echo "You might need to run: kbfsfuse" >&2 checkFailed fi diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index f746e8c8ffd9..3bf906fb4c12 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "libmodsecurity-${version}"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "SpiderLabs"; repo = "ModSecurity"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "1y9nxbf5vgip4zl948a27xpw4mpimqd7xmskfi40k6g0cmmsx1x1"; + sha256 = "0jhyqsvcjxq9ybndcinc08awknrg3sbkaby5w3qw03aqbfjkpywc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index f241d5816072..4b25e944510d 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.6.5"; + version = "2.6.6"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "0q8irq7hmb0nalmc8xn13d08j0qf6sxfiq2c9s7z1c0gd357gmh9"; + sha256 = "02d8nwy78gy07c32c7dk3sl93h1z0gav0h4j7xp85m6xj852lb5a"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 4407d5abbfa1..67e388d5728b 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,29 +1,42 @@ -{ stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: +{ stdenv, makeWrapper, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig +, qtbase, qttranslations, qtsvg }: stdenv.mkDerivation rec { name = "nitrokey-app-${version}"; - version = "1.2"; + version = "1.3.1"; # We use fetchgit instead of fetchFromGitHub because of necessary git submodules src = fetchgit { url = "https://github.com/Nitrokey/nitrokey-app.git"; rev = "v${version}"; - sha256 = "0mm6vlgxlmpahmmcn4awnfpx5rx5bj8m44cywhgxlmz012x73hzi"; + sha256 = "0zf2f7g5scqd5xfzvmmpvfc7d1w66rf22av0qv6s37875c61j9r9"; }; + postPatch = '' + substituteInPlace libnitrokey/CMakeLists.txt \ + --replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules' + ''; + buildInputs = [ bash-completion hidapi libusb1 - qt5.qtbase - qt5.qttranslations + qtbase + qttranslations + qtsvg ]; nativeBuildInputs = [ cmake pkgconfig + makeWrapper ]; cmakeFlags = "-DCMAKE_BUILD_TYPE=Release"; + postFixup = '' + wrapProgram $out/bin/nitrokey-app \ + --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" + ''; + meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; longDescription = '' diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix index 33d2dd1c8fa7..a89fa7238269 100644 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { dontBuild = true; patchPhase = '' - substituteInPlace data/41-nitrokey.rules --replace plugdev "${group}" + substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}" ''; installPhase = '' mkdir -p $out/etc/udev/rules.d - cp data/41-nitrokey.rules $out/etc/udev/rules.d + cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d ''; meta = { diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index a0af51186edf..98f2e56e7497 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/${appName} \ --add-flags "-cp $out/share/java/cifs-${version}.jar" \ --add-flags "-jar $out/share/java/richclient-${version}.jar" \ - --suffix LD_LIBRARY_PATH ':' ${pcsclite}/lib + --suffix LD_LIBRARY_PATH ':' ${stdenv.lib.getLib pcsclite}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 819c01a0893f..7624e6cfa39e 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" - "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so" + "--with-pcsc-provider=${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" ]; installFlags = [ diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index c7e9267dde71..007414d68a5e 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchurl, fetchFromGitHub, buildEnv +{ stdenv, lib, pkgs, fetchurl, buildEnv , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode , makeWrapper diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index bf5856aec357..84072fd2840e 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 +{ stdenv, fetchurl, pkgconfig, udev, dbus, perl, python2 , IOKit ? null }: stdenv.mkDerivation rec { name = "pcsclite-${version}"; version = "1.8.23"; + outputs = [ "bin" "out" "dev" "doc" "man" ]; + src = fetchurl { url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; @@ -28,8 +30,13 @@ stdenv.mkDerivation rec { }' config.h ''; + postInstall = '' + # pcsc-spy is a debugging utility and it drags python into the closure + moveToOutput bin/pcsc-spy "$dev" + ''; + nativeBuildInputs = [ pkgconfig perl python2 ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ] + buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 585e089b8af4..d9e68c77d25c 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite +{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus, pcsclite , wget, coreutils , perl, pcscperl, Glib, Gtk2, Pango, Cairo }: @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9"; }; - buildInputs = [ udev dbus_libs perl pcsclite ]; + buildInputs = [ udev dbus perl pcsclite ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index b198d7446a92..4acdd6cb897e 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }: +{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }: stdenv.mkDerivation rec { name = "pinentry-mac-0.9.4"; diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index 0c6d15e7d776..016017205ab4 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , cmake, ccid, qttools, qttranslations , pkgconfig, pcsclite, hicolor-icon-theme }: diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index bf5f9116f08c..047706cd8a68 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "saml2aws-${version}"; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 26faf2c730c6..bbcfc4c78907 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "sops-${version}"; diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 0a9804a743bc..50b16ad58399 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ssdeep-${version}"; diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index 6db16c95fc88..facbfcad4cfd 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.2.0"; name = "sshguard-${version}"; src = fetchurl { url = "mirror://sourceforge/sshguard/${name}.tar.gz"; - sha256 = "12h2rx40lf3p3kgazmgakkgajjk2d3sdvr2f73ghi15d6i42l991"; + sha256 = "1hjn6smd6kc3yg2xm1kvszqpm5w9a6vic6a1spzy8czcwvz0gzra"; }; doCheck = true; diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index f1bac7adba10..0c0cf29f977f 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, python2Packages, fetchFromGitHub, python2 }: +{ stdenv, makeWrapper, python2Packages, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "theHarvester"; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 3efba58ea11d..4923a9019ed3 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.3.7"; + name = "tor-0.3.3.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "036ybfvldj7yfci9ipjki8smpzyxdg8c5r12bghc9yxdqh9basza"; + sha256 = "0vyf5z0dn5jghp2qjp076aq62lsz9g32qv9jiqf08skf096nnd45"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/tor/update.nix b/pkgs/tools/security/tor/update.nix index 6a7682a8f578..c944883d4178 100644 --- a/pkgs/tools/security/tor/update.nix +++ b/pkgs/tools/security/tor/update.nix @@ -1,6 +1,5 @@ { lib , writeScript -, runCommand , common-updater-scripts , bash , coreutils diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 02c0b27a5648..2c422d516046 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,13 +9,13 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.9.5"; + version = "0.10.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1ddki3bnp6yrajc0cxxjkbdlfp0xqx407nxvvv611lsnlbr2sz5g"; + sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 70640563aa31..4f2671aeacbf 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,17 +1,22 @@ -{ stdenv, pythonPackages, fetchurl, callPackage, nix, ronn }: +{ stdenv, pythonPackages, nix, ronn }: pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.6.3"; + version = "1.7"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0ia71l0210dgcxf63bg07csx40nmpdghr4mszz91qrri7lsa5qqi"; + sha256 = "16228w0vakb515cnrk4akadh0m21abiv8rv574jarcsf7359xslj"; }; buildInputs = [ ronn ]; - checkInputs = with pythonPackages; [ freezegun pytest pytestcov pytest-flake8 ]; + checkInputs = with pythonPackages; [ + freezegun + pytest + pytestcov + pytest-flake8 + ]; propagatedBuildInputs = [ nix @@ -27,9 +32,7 @@ pythonPackages.buildPythonApplication rec { outputs = [ "out" "doc" ]; - postBuild = '' - make -C doc - ''; + postBuild = "make -C doc"; checkPhase = "py.test src/vulnix"; @@ -45,7 +48,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "NixOS vulnerability scanner"; homepage = https://github.com/flyingcircusio/vulnix; - license = licenses.bsd2; + license = licenses.bsd3; maintainers = with maintainers; [ ckauhaus plumps ]; }; } diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 3f618301a864..fd7f93d1546c 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g"; + sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn"; }; # Disable fstype test, tries to read /etc/mtab diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index f99d22becdb8..9cba7df21b7d 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }: +{stdenv, fetchurl, pkgconfig, glib, gtk2, python2Packages }: stdenv.mkDerivation rec { version = "0.14.7"; diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index ebe654d946e3..3dc2a5caeb91 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "confd-${version}"; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index e664c0ef8e2c..35c57dd8ea91 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "consul-template-${version}"; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index fc42c3b856f6..6c852efe96e5 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,10 +1,7 @@ { stdenv , fetchurl, lzip -, hostPlatform, buildPlatform }: -let inherit (stdenv.lib) optionals; in - stdenv.mkDerivation rec { name = "ddrescue-1.23"; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index b6f1af7b23fe..5a902914b37b 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages -, libevdev, linuxHeaders +, libevdev }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index 77f65de9a8d0..9eef3b064a0c 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gohai-${version}"; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index 316b94befde3..473d245618fa 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, fetchgit, pythonOlder, systemd, pytest }: +{ stdenv, buildPythonPackage, fetchurl, pythonOlder, systemd, pytest }: buildPythonPackage rec { pname = "journalwatch"; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index c2d31ccb0fbf..5b2be75e452f 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -4,7 +4,7 @@ , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen -, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, path +, gtest, sqlite, fpm, zstd, rdkafka, rapidjson }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { name = "osquery-${version}"; - version = "3.2.8"; + version = "3.2.9"; # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "facebook"; repo = "osquery"; rev = version; - sha256 = "1py5jizl7z1f9xzpg7pylbdnawvvifiyv9gpjwiim8ilgkmpaiv4"; + sha256 = "1fac0yj1701469qhbsp38ab2fmavm3jw6x278bf78yvxdi99ivai"; }; patches = [ ./misc.patch ]; diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch index 859e398616ab..129c524521de 100644 --- a/pkgs/tools/system/osquery/misc.patch +++ b/pkgs/tools/system/osquery/misc.patch @@ -1,8 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71921740..156ea6dc 100644 +index 0242fb71..5007aace 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -456,12 +456,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD) +@@ -304,7 +304,6 @@ else() + # To be safe, only include them when building 'release' outputs. + add_compile_options( + -g +- -fno-limit-debug-info + -fPIE + -fpie + -fPIC +@@ -449,12 +448,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=thin") endif() @@ -15,7 +23,7 @@ index 71921740..156ea6dc 100644 # Make sure deps were built before compiling (else show warning). execute_process( COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}" -@@ -528,6 +522,8 @@ endif() +@@ -521,6 +514,8 @@ endif() if(APPLE) LOG_PLATFORM("OS X") @@ -24,7 +32,7 @@ index 71921740..156ea6dc 100644 elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian") LOG_PLATFORM("Debian") elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu") -@@ -577,7 +573,6 @@ if(POSIX AND DEPS) +@@ -570,7 +565,6 @@ if(POSIX AND DEPS) endif() endif() @@ -32,7 +40,7 @@ index 71921740..156ea6dc 100644 include_directories("${CMAKE_SOURCE_DIR}/include") include_directories("${CMAKE_SOURCE_DIR}") -@@ -668,18 +663,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "") +@@ -661,18 +655,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "") add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0) endif() @@ -52,10 +60,10 @@ index 71921740..156ea6dc 100644 add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/linenoise-ng") endif() diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt -index c8cbac4e..a4382420 100644 +index e3842962..f405503d 100644 --- a/osquery/CMakeLists.txt +++ b/osquery/CMakeLists.txt -@@ -35,8 +35,6 @@ if(CLANG AND POSIX) +@@ -33,8 +33,6 @@ if(CLANG AND POSIX) -Wextra -pedantic -Wuseless-cast @@ -64,7 +72,7 @@ index c8cbac4e..a4382420 100644 -Wno-unused-parameter -Wno-gnu-case-range -Weffc++ -@@ -65,14 +63,7 @@ endif() +@@ -63,14 +61,7 @@ endif() # Construct a set of all object files, starting with third-party and all # of the osquery core objects (sources from ADD_CORE_LIBRARY macros). @@ -80,7 +88,7 @@ index c8cbac4e..a4382420 100644 # Add subdirectories add_subdirectory(config) -@@ -153,10 +144,11 @@ if(APPLE OR LINUX) +@@ -151,10 +142,11 @@ if(APPLE OR LINUX) ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite") elseif(FREEBSD) ADD_OSQUERY_LINK_CORE("icuuc") @@ -93,7 +101,7 @@ index c8cbac4e..a4382420 100644 if(POSIX) ADD_OSQUERY_LINK_CORE("boost_system") ADD_OSQUERY_LINK_CORE("boost_filesystem") -@@ -174,10 +166,10 @@ endif() +@@ -172,10 +164,10 @@ endif() ADD_OSQUERY_LINK_CORE("glog${WO_KEY}") if(POSIX) @@ -142,7 +150,7 @@ index ab91bd24..d8364991 100644 ADD_OSQUERY_TEST_ADDITIONAL(${OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS}) endif() diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt -index dd78084f..158758e1 100644 +index 3ecbb711..af7220d3 100644 --- a/osquery/tables/CMakeLists.txt +++ b/osquery/tables/CMakeLists.txt @@ -68,7 +68,7 @@ if(LINUX) diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index cd3c815934f3..b673c0f929a6 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "pcstat-unstable-${version}"; diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix index 3a5cb1b4965d..5414d6704232 100644 --- a/pkgs/tools/system/procodile/default.nix +++ b/pkgs/tools/system/procodile/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby, stdenv }: +{ lib, bundlerEnv, ruby }: bundlerEnv rec { name = "procodile-${version}"; diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index b5d4317eac2d..935b49f95db3 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "s-tui"; - version = "0.6.2"; + version = "0.7.5"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0fijk26sm51bnxf7plzd1fn2k4f8mdqd7j9zqc3d8zri7228vik2"; + sha256 = "01w5jh0p66jk4h3cmif4glq42zv44zhziczxjwazkd034rp8dnv9"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 27458174dc2a..a8670203775a 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus-glib, libxml2 }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool +, pkgconfig, dbus, dbus-glib, libxml2 }: stdenv.mkDerivation rec { name = "thermald-${version}"; @@ -12,12 +13,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus_libs dbus-glib libxml2 ]; + buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; preConfigure = '' - export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ./autogen.sh ''; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index d8c42a0f20d2..89319ac492f4 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/theZiz/aha; license = with licenses; [ lgpl2Plus mpl11 ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 62be30319cf8..56a8133bd3a8 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "codesearch-${version}"; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 7a395eb8905e..e54933453b3f 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python27Packages }: python27Packages.buildPythonApplication rec { - version = "2.26.0"; + version = "2.27.0"; name = "fanficfare-${version}"; nameprefix = ""; src = fetchurl { url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "1gas5x0xzkxnc0rvyi04phzxpxxd1jfmx9a7l2fhqmlw67lml4rr"; + sha256 = "02m1fr38hvxc1kby38xz9r75x5pcm8nly4d4ibnaf9i06xkg1pn0"; }; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 27581134ca34..ab0f8893bfde 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff +{ stdenv, fetchurl, perl , ghostscript #for postscript and html output , psutils, netpbm #for html output , buildPackages diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix new file mode 100644 index 000000000000..f479c221b65f --- /dev/null +++ b/pkgs/tools/text/markdown-pp/default.nix @@ -0,0 +1,24 @@ +{ fetchFromGitHub, pythonPackages, stdenv }: + +with pythonPackages; +buildPythonApplication rec { + pname = "MarkdownPP"; + version = "1.4"; + propagatedBuildInputs = [ pillow watchdog ]; + checkPhase = '' + cd test + PATH=$out/bin:$PATH ${python}/bin/${python.executable} test.py + ''; + src = fetchFromGitHub { + owner = "jreese"; + repo = "markdown-pp"; + rev = "v${version}"; + sha256 = "1xmc0cxvvf6jzr7p4f0hm8icysrd44sy2kgff9b99lr1agwkmysq"; + }; + meta = with stdenv.lib; { + description = "Preprocessor for Markdown files to generate a table of contents and other documentation needs"; + license = licenses.mit; + homepage = "https://github.com/jreese/markdown-pp"; + maintainers = with maintainers; [ zgrannan ]; + }; +} diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 30f5b6ceaba5..36368e172a29 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "mdbook-${version}"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; - rev = "ea0b835b38aba9566c1cc50ad119fbbf2c56f59d"; - sha256 = "0jkyys8dg5mchbj8b73mmzsgv0k0zp7knima9s69s5ybplmd2n8s"; + rev = "v${version}"; + sha256 = "1xmw4v19ff6mvimwk5l437wslzw5npy60zdb8r4319bjf32pw9pn"; }; - cargoSha256 = "0w3slfzm29pkyr6zhr7k9rx9mddh42asyb46bzy57j0a2qvan3k4"; + cargoSha256 = "0kcc0b2644qbalz7dnqwxsjdmw1h57k0rjrvwqh8apj2sgl64gyv"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index 7b87fd1e492c..b51f811644d1 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "peco-${version}"; - version = "0.5.2"; + version = "0.5.3"; goPackagePath = "github.com/peco/peco"; subPackages = [ "cmd/peco" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "peco"; repo = "peco"; rev = "v${version}"; - sha256 = "0cgfwbnz4jp2nvmqf2i03xf69by8g0xgd3k5k9aj46y9hps1ka92"; + sha256 = "1m3s1jrrhqccgg3frfnq6iprwwi97j13wksckpcyrg51z6y5q041"; }; goDeps = ./deps.nix; @@ -23,5 +23,6 @@ buildGoPackage rec { # peco should work on Windows or other POSIX platforms, but the go package # declares only linux and darwin. platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index c76ba8ea88d5..829d734a8f75 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "the_platinum_searcher-${version}"; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 11355bb6df1d..aa41e7b7f60a 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, asciidoc, docbook_xsl, libxslt }: +{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt }: rustPlatform.buildRustPackage rec { name = "ripgrep-${version}"; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index e87a8bc02750..b7f8bd6df381 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, gnum4 }: +{ stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { name = "jade-${version}-${debpatch}"; diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 7328cd3878a2..fe699b355900 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "shfmt-${version}"; diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index efa5e539bd14..421715f7c33c 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "sift-${version}"; diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 81b90e4925de..c3db482d271a 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wget, bash, coreutils }: +{ stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { version = "2.28"; diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index f9debaaf0615..4271bf095a14 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool -, zlib, openssl, zip, zimlib, cxxtools, tntnet +, zimlib, cxxtools, tntnet }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index 5a5757bf2f2d..085331ce0d5c 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -8,7 +8,7 @@ , file , icu -, libgumbo +, gumbo , lzma , xapian , zimlib @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ]; + buildInputs = [ file icu gumbo lzma zimlib zlib xapian ]; setSourceRoot = '' sourceRoot=$(echo */zimwriterfs) ''; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index d5da10b5cd43..efa1471f068b 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -14,7 +14,7 @@ , lilypond ? null , libxml2 ? null , docbook_xml_dtd_45 ? null -, docbook5_xsl ? null +, docbook_xsl_ns ? null , docbook_xsl ? null , fop ? null # TODO: Package this: @@ -56,7 +56,7 @@ assert enableStandardFeatures -> lilypond != null && libxml2 != null && docbook_xml_dtd_45 != null && - docbook5_xsl != null && + docbook_xsl_ns != null && docbook_xsl != null && (fop != null || !enableJava) && # TODO: Package this: @@ -238,7 +238,7 @@ stdenv.mkDerivation rec { # use it to work around an impurity in the tetex package; tetex tools # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm). # We can remove PATH= when those impurities are fixed. - sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \ + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \ -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index b1fe301775c8..1f6a7054b9e3 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerApp, ruby, curl +{ stdenv, lib, bundlerApp, ruby # Dependencies of the 'mathematical' package , cmake, bison, flex, glib, pkgconfig, cairo , pango, gdk_pixbuf, libxml2, python3, patchelf diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 8ce2a6b0aa3c..fa8af0089556 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper +{ stdenv, fetchFromGitHub, rustPlatform , darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 0566e5118705..4ee45bf4bc8f 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -207,7 +207,6 @@ rec { simpleTeXToPNG = { preamble ? null , body - , name ? baseNameOf (toString body) , packages ? [] }: @@ -227,7 +226,6 @@ rec { simpleTeXToPDF = { preamble ? null , body - , name ? baseNameOf (toString body) , packages ? [] }: diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 32894748ac46..9bc5a9b273b9 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl +{ stdenv, fetchurl , texlive -, zlib, bzip2, ncurses, libiconv, libpng, flex, bison, libX11, libICE, xproto -, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext -, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig -, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr -, xpdf, cairo, pixman, xorg, clisp, biber +, zlib, libiconv, libpng, libX11 +, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext +, perl, pkgconfig +, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr +, cairo, pixman, xorg, clisp, biber , makeWrapper }: diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index ed3dad64f16d..939615f5797c 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex, libxml2, libxslt +{ fetchurl, stdenv, libxml2, libxslt , docbook_xml_dtd_45, docbook_xsl, w3m , bash, getopt, makeWrapper }: diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index dab4bf44a6f9..975e13b65da7 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -1,4 +1,4 @@ -{ buildRubyGem, lib, ruby }: +{ buildRubyGem, ruby }: buildRubyGem rec { inherit ruby; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index bb72fd2911f7..32cf2771b51d 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "vnc2flv-20100207"; diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index 549c830e8871..ff9a13c500b3 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "awless-${version}"; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 60ccc0f4724a..5e2f84dee1d2 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchurl, kmod, systemd, cloud-utils }: +{ lib, pythonPackages, fetchurl, cloud-utils }: let version = "0.7.9"; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 83a340348c8e..2286faf4d1b8 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, buildGoPackage, fetchFromGitHub +{ stdenv, pkgconfig, buildGoPackage, fetchFromGitHub , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap }: diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index dce806cf6e34..ce628ff84b5e 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, which, python2Packages }: +{ stdenv, fetchgit, python2Packages }: let inherit (python2Packages) buildPythonApplication boto m2crypto; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 3645de88bf8a..e987bc7986b1 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , buildPythonApplication , bash -, shadow , systemd , utillinux , boto |