diff options
Diffstat (limited to 'pkgs/tools')
187 files changed, 2420 insertions, 417 deletions
diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 8bbe1b6a52b..f33d03b6d15 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -6,7 +6,7 @@ in buildPythonApplication rec { name = "arandr-0.1.9"; src = fetchurl { - url = "http://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; + url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; sha256 = "1i3f1agixxbfy4kxikb2b241p7c2lg73cl9wqfvlwz3q6zf5faxv"; }; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 8ad1b6f6455..14fe769db6b 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { name = "bumblebee-${version}"; src = fetchurl { - url = "http://bumblebee-project.org/${name}.tar.gz"; + url = "https://bumblebee-project.org/${name}.tar.gz"; sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 23e528297ee..1e7b4e58c17 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generate X11 mouse clicks from keyboard"; - homepage = http://www.semicomplete.com/projects/keynav/; + homepage = https://www.semicomplete.com/projects/keynav/; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index a20b7d69f3d..21d7a50566d 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "vdpauinfo-1.0"; src = fetchurl { - url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; + url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvdpau ]; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~aplattner/vdpau/; + homepage = https://people.freedesktop.org/~aplattner/vdpau/; description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index 31ad524cf8f..2703379a23b 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "x2vnc-1.7.2"; src = fetchurl { - url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; + url = https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw"; }; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 1c23593bd14..e633ba4f794 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -4,7 +4,7 @@ let version = "1.8.6"; in stdenv.mkDerivation { name = "xbindkeys-${version}"; src = fetchurl { - url = "http://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; + url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"; }; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index e66b184c04c..f4112765e67 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xbrightness-0.3-mika-akk"; src = fetchurl { - url = http://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz; + url = https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz; sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e"; }; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 3e0680cac44..c72fab015d9 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xdg-user-dirs-0.17"; src = fetchurl { - url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz"; + url = "https://user-dirs.freedesktop.org/releases/${name}.tar.gz"; sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"; }; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index f69d5d80649..59ddac0eca1 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; meta = { - homepage = http://www.semicomplete.com/projects/xdotool/; + homepage = https://www.semicomplete.com/projects/xdotool/; description = "Fake keyboard/mouse input, window management, and more"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index e22338dbc71..2faa8ead071 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.4.8"; + version = "0.4.9"; doCheck = false; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "1125n5szgq7bziz3lkrhb2a2iac93ap63g2xr78ap7b9i3gxs3xh"; + sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 279b2e8321a..5ddc2432bd5 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -15,7 +15,7 @@ in buildPythonApplication rec { version = "2.3.1"; src = fetchurl { - url = "http://xpra.org/src/${name}.tar.xz"; + url = "https://xpra.org/src/${name}.tar.xz"; sha256 = "0wghjmrw77pkh6agc5rz7ynr6s8yyc68qvj9rnp0vlwa3x1fl3ry"; }; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 7e620e0c2c8..a0c2ee8f995 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { version = "2.2.5"; src = fetchurl { - url = "http://xpra.org/src/${name}.tar.xz"; + url = "https://xpra.org/src/${name}.tar.xz"; sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; }; diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 11ab58bc62f..363214129b2 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -21,7 +21,7 @@ let inherit version; src = fetchurl { - url = "http://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; + url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index cfbb90fdc30..dfe4c099beb 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl -, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, squashfsTools, iproute, iptables +, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq +, squashfsTools, iproute, iptables, ebtables }: buildGoPackage rec { @@ -26,7 +27,7 @@ buildGoPackage rec { rm $bin/bin/{deps,macaroon-identity} wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables ]} ''; diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index c39c378d221..b29d80e159b 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; - url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; + url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libxcomp ]; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 2e9d8cafdc0..782e0f461ec 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "cabextract-1.6"; src = fetchurl { - url = "http://www.cabextract.org.uk/${name}.tar.gz"; + url = "https://www.cabextract.org.uk/${name}.tar.gz"; sha256 = "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf"; }; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 77536a7ad30..68f7f02e741 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "cromfs-1.5.10.2"; src = fetchurl { - url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; + url = "https://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817"; }; diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index 715efe71992..05d6a4718de 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pxattr-2.1.0"; src = fetchurl { - url = "http://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz"; + url = "https://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz"; sha256 = "1dwcqc5z7gzma1zhis2md49bj2nq7m6jimh4zlx9szw6svisz56z"; }; diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 2505c012b26..217a8ab35a9 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p"; - url = "http://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; + url = "https://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; }; preInstall = '' diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 6d979bbf33d..9e05043d4b0 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz - http://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 46b4ada3d57..2d54c182349 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.06.13"; + version = "2018.06.23"; src = fetchzip { - url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0mmr0wfdwx9vfz17gp0arspv835l5gka78hm5hkri4h3cvxpflfy"; + url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; + sha256 = "0487dlw9v4ayb929w8bk71fs4nbcs1liyk59g6sfr4yn6dx2sl2d"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 02235f727c5..8fe6feaee0a 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,7 @@ -{stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig -, gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}: +{ stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig +, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio +, xlibsWrapper +}: stdenv.mkDerivation rec { name = "pasystray-${version}"; @@ -13,9 +15,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake makeWrapper - gnome3.defaultIconTheme - avahi gtk3 libnotify libpulseaudio xlibsWrapper ]; + buildInputs = [ + autoconf automake makeWrapper + gnome3.defaultIconTheme + avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper + ]; preConfigure = '' aclocal diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 958afa3f6a9..e9ae7354786 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.26.1"; src = fetchurl { - url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; + url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz"; sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp"; }; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 91d12a568a4..3ab1eba5b6f 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "chunksync-${version}"; src = fetchurl { - url = "http://chunksync.florz.de/chunksync_${version}.tar.gz"; + url = "https://chunksync.florz.de/chunksync_${version}.tar.gz"; sha256 = "1gwqp1kjwhcmwhynilakhzpzgc0c6kk8c9vkpi30gwwrwpz3cf00"; }; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index ecd6a3209f4..6d761354b6a 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "httrack-${version}"; src = fetchurl { - url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; + url = "https://mirror.httrack.com/httrack-${version}.tar.gz"; sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; }; diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 758146fcc00..021f783e0fd 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition. ''; - homepage = http://partclone.org; + homepage = https://partclone.org; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 9f9714e6d99..a7f90b3b303 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.9.0"; + version = "0.9.1"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "09520ggr98w7nn6kl3yx0nrx4f79q4vhg4q1hiv2nlwxd0jz1p6y"; + sha256 = "116dc86fjmflmk0n2nywvv2f6z1jig3czqxz0cx0z77n8rmj9npv"; }; buildPhase = '' diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 095bd5f7d9a..617d86e7f1e 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = "http://www.daemonology.net/bsdiff/${name}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${name}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 91f7637e1bc..c9ec557ab1f 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec { version = "7.1"; src = fetchurl { - url = "http://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz"; + url = "https://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz"; sha256 = "15yf4n27zbhvv0byfv3i89wl5zn6jc2wbc69lk5a3m6rx54gx6hw"; }; diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 72be1d28d24..00eb5f265aa 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "lzop-1.04"; src = fetchurl { - url = "http://www.lzop.org/download/${name}.tar.gz"; + url = "https://www.lzop.org/download/${name}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 732aa691d4a..a2668f73ceb 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { - url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz"; + url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; }; diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index ad1b8041041..8773121e646 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://rzip.samba.org/; + homepage = https://rzip.samba.org/; description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index e720634ca44..18bde25267d 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; + url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz"; sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"; }; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index e5b09cbbff3..47428e7f52e 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "chunkfs-${version}"; src = fetchurl { - url = "http://chunkfs.florz.de/chunkfs_${version}.tar.gz"; + url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz"; sha256 = "4c168fc2b265a6ba34afc565707ea738f34375325763c0596f2cfa1c9b8d40f1"; }; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index b39c51a0c88..581970e34fa 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "9"; src = fetchurl { - url = "http://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; + url = "https://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9"; }; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index ac1a7c1c148..afe51caa877 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://www.adebenham.com/files/mtp/${name}.tar.gz"; + url = "https://www.adebenham.com/files/mtp/${name}.tar.gz"; sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 2f7e80dd912..6acb034d75b 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "0.1.5.978"; src = fetchurl { - url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; + url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; sha256 = p.sha256; }; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 3283d6789f7..916b8509b0d 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.1"; src = fetchurl { - url = "http://frippery.org/uml/${name}.tgz"; + url = "https://frippery.org/uml/${name}.tgz"; sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm"; }; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix new file mode 100644 index 00000000000..e4b31f06b6e --- /dev/null +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, +eigen3_3, libpng, python, mesa_glu, qt4, openexr, openimageio, +opencolorio, xercesc, ilmbase, osl, seexpr +}: + +let boost_static = boost165.override { enableStatic = true; }; +in stdenv.mkDerivation rec { + + name = "appleseed-${version}"; + version = "1.9.0-beta"; + + src = fetchFromGitHub { + owner = "appleseedhq"; + repo = "appleseed"; + rev = "1.9.0-beta"; + sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr"; + }; + buildInputs = [ + cmake pkgconfig boost_static guile eigen3_3 libpng python + mesa_glu qt4 openexr openimageio opencolorio xercesc + osl seexpr + ]; + + NIX_CFLAGS_COMPILE = "-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR -I${openimageio.dev}/include/OpenImageIO"; + + cmakeFlags = [ + "-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON" + "-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON" + "-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON" + "-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON" + "-DWITH_PYTHON2_BINDINGS=ON" + # TODO: Look further into this if someone needs Python 3.x: + # "-DWITH_PYTHON3_BINDINGS=ON" + "-DWITH_DISNEY_MATERIAL=ON" + "-DUSE_SSE=ON" + "-DUSE_SSE42=ON" + ]; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Open source, physically-based global illumination rendering engine"; + homepage = https://appleseedhq.net/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} + +# TODO: Is the below problematic? + +# CMake Warning (dev) at /nix/store/dsyw2zla2h3ld2p0jj4cv0j3wal1bp3h-cmake-3.11.2/share/cmake-3.11/Modules/FindOpenGL.cmake:270 (message): +# Policy CMP0072 is not set: FindOpenGL prefers GLVND by default when +# available. Run "cmake --help-policy CMP0072" for policy details. Use the +# cmake_policy command to set the policy and suppress this warning. +# +# FindOpenGL found both a legacy GL library: +# +# OPENGL_gl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGL.so +# +# and GLVND libraries for OpenGL and GLX: +# +# OPENGL_opengl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libOpenGL.so +# OPENGL_glx_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGLX.so +# +# OpenGL_GL_PREFERENCE has not been set to "GLVND" or "LEGACY", so for +# compatibility with CMake 3.10 and below the legacy GL library will be used. diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index d35eae87204..7a06d9f346b 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror - url = "http://www.argyllcms.com/Argyll_V${version}_src.zip"; + url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; sha256 = "1583hspas7rw5xwrs1rb4yn1yl34wh6lfik6xyszpfv39a2axdxx"; # The argyllcms web server doesn't like curl ... diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 44ad267f9d4..dd81c3e4ecc 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dcraw-9.28.0"; src = fetchurl { - url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; + url = "https://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 47312f0f997..9ce95154cb0 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "exiftags-1.01"; src = fetchurl { - url = http://johnst.org/sw/exiftags/exiftags-1.01.tar.gz; + url = https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix new file mode 100644 index 00000000000..4e371ffd2b0 --- /dev/null +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, buildPerlPackage, makeWrapper, gawk +, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages +}: + +let + + fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + +in + +buildPerlPackage rec { + name = "feedgnuplot-${version}"; + version = "1.49"; + + src = fetchFromGitHub { + owner = "dkogan"; + repo = "feedgnuplot"; + rev = "v${version}"; + sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02"; + }; + + nativeBuildInputs = [ makeWrapper gawk ]; + + buildInputs = [ gnuplot perl ] + ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); + + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = fontsConf; + + postPatch = '' + patchShebangs . + ''; + + # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/feedgnuplot \ + --prefix "PATH" ":" "$PATH" \ + --prefix "PERL5LIB" ":" "$PERL5LIB" + install -D -m 444 -t $out/share/bash-completion/completions \ + completions/bash/feedgnuplot + install -D -m 444 -t $out/share/zsh/site-functions \ + completions/zsh/_feedgnuplot + ''; + + meta = with stdenv.lib; { + description = "General purpose pipe-oriented plotting tool"; + homepage = https://github.com/dkogan/feedgnuplot/; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.unix; + maintainers = with maintainers; [ mnacamura ]; + }; +} diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 424cf5c1bdc..a7bb616d82b 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "fgallery-1.8.2"; src = fetchurl { - url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; + url = "https://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 05ce6b6f7c9..76cb3ab199c 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.91"; src = fetchurl { - url = "http://www.lcdf.org/gifsicle/${name}.tar.gz"; + url = "https://www.lcdf.org/gifsicle/${name}.tar.gz"; sha256 = "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha"; }; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 008f9af3685..6c62e052838 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; src = fetchurl { - url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; + url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc"; }; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix new file mode 100644 index 00000000000..387c8c0595e --- /dev/null +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 +, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase +, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core +, dbus, doxygen, qt5, c-blosc, mesa_glu, gnome3, pcre +, bison, flex, libpthreadstubs, libX11 +, embree2, makeWrapper, gsettings_desktop_schemas, glib +, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp +}: + +let boost_static = boost165.override { + python = python35; + enableStatic = true; + }; + +in stdenv.mkDerivation rec { + name = "luxcorerender-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "LuxCoreRender"; + repo = "LuxCore"; + rev = "luxcorerender_v2.0"; + sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + }; + + buildInputs = + [ embree2 pkgconfig cmake zlib boost_static libjpeg + libtiff libpng ilmbase freetype openexr openimageio + tbb qt5.full c-blosc mesa_glu pcre bison + flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon + epoxy at-spi2-core dbus doxygen + # needed for GSETTINGS_SCHEMAS_PATH + gsettings_desktop_schemas glib gnome3.gtk + # needed for XDG_ICON_DIRS + gnome3.defaultIconTheme + makeWrapper + (stdenv.lib.getLib gnome3.dconf) + ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; + + cmakeFlags = [ + "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" + "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" + "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" + "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" + "-DPYTHON_LIBRARY=${python35}/lib/libpython3.so" + "-DPYTHON_INCLUDE_DIR=${python35}/include/python3.5" + "-DEMBREE_INCLUDE_PATH=${embree2}/include" + "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" + "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" + ] ++ stdenv.lib.optional withOpenCL + "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -isystem ${python35}/include/python3.5" + NIX_LDFLAGS+=" -lpython3" + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib + cp -va bin/* $out/bin + cp -va lib/* $out/lib + ''; + + preFixup = '' + wrapProgram "$out/bin/luxcoreui" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" + ''; + + meta = with stdenv.lib; { + description = "Open source, physically based, unbiased rendering engine"; + homepage = https://luxcorerender.org/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} + + +# TODO (might not be necessary): +# +# luxcoreui still gives warnings like: "failed to commit changes to +# dconf: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The +# name ca.desrt.dconf was not provided by any .service files" + +# CMake complains of the FindOpenGL/GLVND preference diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index fcd347182ec..05aa7b86636 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.77.02"; + name = "netpbm-10.82.01"; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = 2883; - sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f"; + rev = 3264; + sha256 = "17fmyjbxp1l18rma7gb0m8wd9kx2iwhqs8dd6fpalsn2cr8mf8hf"; }; postPatch = /* CVE-2005-2471, from Arch */ '' diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix new file mode 100644 index 00000000000..51343998950 --- /dev/null +++ b/pkgs/tools/graphics/rocket/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase }: + +stdenv.mkDerivation rec { + name = "rocket-${version}"; + version = "2018-06-09"; + + src = fetchFromGitHub { + owner = "rocket"; + repo = "rocket"; + rev = "7bc1e9826cad5dbc63e56371c6aa1798b2a7b50b"; + sha256 = "13bdg2dc6ypk17sz39spqdlb3wai2y085bdb36pls2as2nf22drp"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; + + configurePhase = ":"; + + installPhase = '' + mkdir -p $out/bin + cp -r editor/editor $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A tool for synchronizing music and visuals in demoscene productions"; + homepage = "https://github.com/rocket/rocket"; + license = licenses.zlib; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix new file mode 100644 index 00000000000..92a7d69aa91 --- /dev/null +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, qt4, qmake4Hook, unzip, mesa_glu, makeWrapper }: + +stdenv.mkDerivation rec { + + name = "structure-synth-${version}"; + version = "v1.5"; + + src = fetchurl { + url = mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip; + sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; + }; + + buildInputs = [ qt4 unzip mesa_glu makeWrapper ]; + nativeBuildInputs = [ qmake4Hook ]; + + # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: + patches = [ ./gcc47.patch ]; + + enableParallelBuilding = true; + + preConfigure = '' + ${qt4}/bin/qmake -project -after "CONFIG+=opengl" -after "QT+=xml opengl script" -after "unix:LIBS+=-lGLU" + ''; + + installPhase = '' + mkdir -p $out/bin; + mkdir -p $out/share/Examples $out/share/Misc; + cp "Structure Synth Source Code" $out/bin/structure-synth; + cp -r Examples/* $out/share/Examples; + cp -r Misc/* $out/share/Misc; + ''; + + # Structure Synth expects to see 'Examples' and 'Misc' directory in + # either $HOME or $PWD - so help it along by moving $PWD to 'share', + # where we just copied those two directories: + preFixup = '' + wrapProgram "$out/bin/structure-synth" --run "cd $out/share" + ''; + + meta = with stdenv.lib; { + description = "Application for generating 3D structures by specifying a design grammar"; + homepage = http://structuresynth.sourceforge.net; + maintainers = with maintainers; [ hodapp ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/structure-synth/gcc47.patch b/pkgs/tools/graphics/structure-synth/gcc47.patch new file mode 100644 index 00000000000..8726e89c830 --- /dev/null +++ b/pkgs/tools/graphics/structure-synth/gcc47.patch @@ -0,0 +1,50 @@ +diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" +*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2010-11-13 22:32:44.000000000 -0500 +--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2018-06-24 14:23:30.794296776 -0400 +*************** +*** 1,5 **** + #include <QThread> +! + + #include "RayTracer.h" + +--- 1,5 ---- + #include <QThread> +! #include <GL/glu.h> + + #include "RayTracer.h" + +diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" +*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2010-09-08 21:25:30.000000000 -0400 +--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2018-06-24 14:23:12.542868194 -0400 +*************** +*** 122,128 **** + currentT = p; + + // We do not intersect grid. +! if (!found) return false; + } + + stepX = (dir.x() > 0) ? 1 : -1; +--- 122,128 ---- + currentT = p; + + // We do not intersect grid. +! if (!found) return NULL; + } + + stepX = (dir.x() > 0) ? 1 : -1; +Only in Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer: VoxelStepper.cpp.orig +diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" +*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" 2010-08-11 15:12:22.000000000 -0400 +--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" 2018-06-24 14:23:30.793296807 -0400 +*************** +*** 2,7 **** +--- 2,8 ---- + + #include "SyntopiaCore/Math/Vector3.h" + #include "Object3D.h" ++ #include <GL/glu.h> + + namespace SyntopiaCore { + namespace GLEngine { diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix new file mode 100644 index 00000000000..4e4f5a5db4a --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, + glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + +stdenv.mkDerivation rec { + name = "vulkan-tools-${version}"; + version = "1.1.77.0"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Tools"; + rev = "sdk-${version}"; + sha256 = "1c827n0xz8d7ydqpjchd58as943acyi182a0p4aq3bdsaxlmmpkg"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake python3 vulkan-loader x11 libxcb libXrandr wayland ]; + enableParallelBuilding = true; + + cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; + + meta = with stdenv.lib; { + description = "LunarG Vulkan loader"; + homepage = "http://www.lunarg.com"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index b5b394c5b6c..b69a9ec81f6 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; + url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r"; }; diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix new file mode 100644 index 00000000000..2f9615a1fdb --- /dev/null +++ b/pkgs/tools/misc/agedu/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchgit, autoreconfHook, halibut}: +let + date = "20180522"; + rev = "5b12791"; +in +stdenv.mkDerivation { + name = "agedu-${date}.${rev}"; + # upstream provides tarballs but it seems they disappear after the next version is released + src = fetchgit { + url = https://git.tartarus.org/simon/agedu.git; + inherit rev; + sha256 = "1zyxif0i3yil4xm8y9aqk6wsdwi7b3jg682lv6ds6a6bl047fz1q"; + }; + + nativeBuildInputs = [autoreconfHook halibut]; + + meta = with stdenv.lib; { + description = "A Unix utility for tracking down wasted disk space"; + longDescription = '' + Most Unix file systems, in their default mode, helpfully record when a + file was last accessed. So if you generated a large amount of data years + ago, forgot to clean it up, and have never used it since, then it ought + in principle to be possible to use those last-access time stamps to tell + the difference between that and a large amount of data you're still + using regularly. + + agedu uses this information to tell you which files waste disk space when + you haven't used them since a long time. + ''; + homepage = https://www.chiark.greenend.org.uk/~sgtatham/agedu/; + license = licenses.mit; + maintainers = with maintainers; [ symphorien ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index 693ca27a88d..550ab4972d9 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "apparix-11-062"; src = fetchurl { - url = "http://micans.org/apparix/src/${name}.tar.gz"; + url = "https://micans.org/apparix/src/${name}.tar.gz"; sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235"; }; diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix index 54c78874dd2..7ceafe12793 100644 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ b/pkgs/tools/misc/appdata-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureScript = "./autogen.sh"; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~hughsient/appdata; + homepage = https://people.freedesktop.org/~hughsient/appdata; description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index e02359eda80..c7829239c41 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; src = fetchurl { - url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; + url = "https://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3"; }; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index a8b6d5f3c25..e8ea9117bc5 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; src = fetchurl { - url = "http://zsmith.co/archives/${name}.tar.gz"; + url = "https://zsmith.co/archives/${name}.tar.gz"; sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 74894da5418..e34eea8b10c 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.98"; src = fetchurl { - url = http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz; + url = https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz; sha256 = "1mh6hxmc9qv05hgjc11m2zh5mk9mk0kaqp59pny18ypqgfws09g9"; }; diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index 793e5c56e1f..90fc68dcc5c 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -3,17 +3,17 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "buildtorrent-${version}"; + name = "buildtorrent-${version}"; - src = fetchurl { - url = "http://mathr.co.uk/blog/code/${name}.tar.gz"; - sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; - }; + src = fetchurl { + url = "https://mathr.co.uk/blog/code/${name}.tar.gz"; + sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; + }; - meta = { - description = "A simple commandline torrent creator"; - homepage = http://mathr.co.uk/blog/torrent.html; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - }; + meta = { + description = "A simple commandline torrent creator"; + homepage = http://mathr.co.uk/blog/torrent.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + }; } diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index c26f835c0ee..38b4916e394 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "colord-gtk-0.1.26"; src = fetchurl { - url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18"; }; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 9b633014009..4461834cb74 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "colord-1.4.2"; src = fetchurl { - url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "19zc9gldz469jshl16av7na459kwr5nhvs2pz98xm5lw582xaw2c"; }; diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 253e6a50b36..52bcbde1cc1 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "convmv-2.05"; src = fetchurl { - url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; + url = "https://www.j3e.de/linux/convmv/${name}.tar.gz"; sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk"; }; diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index bb1267d62f4..747d7b26669 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "dbacl-1.14"; src = fetchurl { - url = "http://www.lbreyer.com/gpl/${name}.tar.gz"; + url = "https://www.lbreyer.com/gpl/${name}.tar.gz"; sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"; }; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 21f91691a71..715996e8f61 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.102"; + version = "1.0.103"; 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 = "1i8fnxyf073dqywcvj6n32k1crzl7bwlmn373n5342pz71rmqrq9"; + sha256 = "07qqbm50ji1j04hgv1fmy7y1jwl4rjh8q57znh9g3rr4j6fmax7q"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index e89222af74b..a6280ff4008 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "desktop-file-utils-0.23"; src = fetchurl { - url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc"; }; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 71b4ec338df..f4354ad2416 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ent-1.1"; src = fetchurl { - url = "http://www.fourmilab.ch/random/random.zip"; + url = "https://www.fourmilab.ch/random/random.zip"; sha256 = "1v39jlj3lzr5f99avzs2j2z6anqqd64bzm1pdf6q84a5n8nxckn1"; }; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 1d7c47c2c9a..729b4cef03a 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { name = "esptool-${version}"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "0gwnl6z5s2ax07l3n38h9hdyz71pn8lzn4fybcwyrii0bj2kapvc"; + sha256 = "1djlmqdvcyqjqbj225xkn4ix9qr01b8pmsdija2h4nizx77xjyng"; }; checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 1bdab1e841f..21a126b04f3 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "flashrom-${version}"; src = fetchurl { - url = "http://download.flashrom.org/releases/${name}.tar.bz2"; + url = "https://download.flashrom.org/releases/${name}.tar.bz2"; sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb"; }; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 9172c13636a..d70af6b311f 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.1"; src = fetchurl { - url = "http://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; + url = "https://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; sha256 = "1n9jyzf0a0w37hb30ip76hz73bvim76jd2fgd6131hh0shp1s4v6"; }; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index eb029d32f73..be4de738c1c 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8"; - url = "http://www.gnokii.org/download/gnokii/${name}.tar.gz"; + url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz"; }; buildInputs = [ diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 32e796966c9..9f489fee7ec 100644 --- a/pkgs/tools/misc/gnuvd/default.nix +++ b/pkgs/tools/misc/gnuvd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnuvd-1.0.12"; src = fetchurl { - url = http://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; + url = https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; }; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index e048a2800df..12c199801c7 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "goaccess-${version}"; src = fetchurl { - url = "http://tar.goaccess.io/goaccess-${version}.tar.gz"; + url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; sha256 = "051lrprg9svl5ccc3sif8fl78vfpkrgjcxgi2wngqn7a81jzdabb"; }; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 76c60023c06..6c5bac11e73 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./gringo-4.5.4-to_string.patch ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./SConstruct \ --replace \ "env['CXX'] = 'g++'" \ diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 405e19e75bf..03af224b4c0 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.14"; src = fetchurl { - url = "http://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz"; + url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz"; sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p"; }; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 3089d6cace9..033e93609ab 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 = "5"; + version = "6"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0qgvaa69xs97x42j1ikb03bzpm497z9h3qk7adbdippaqcj40s70"; + sha256 = "1wgmmz1gvphkz0rnjyvgn3860yzvxwackb1dwqbgjrqsqy8ba01z"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index c019803f903..dc33d2ece54 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "logstash-contrib-${version}"; src = fetchzip { - url = "http://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; + url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; sha256 = "1yj8sf3b526gixh3c6zhgkfpg4f0c72p1lzhfhdx8b3lw7zjkj0k"; }; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 810bc36fb72..2e364e33fc6 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "memtest86-4.3.6"; src = fetchurl { - url = http://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; + url = https://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv"; }; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 52f685b22ca..18e7281ce83 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { version = "2017.6.6"; src = fetchurl { - url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; + url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z"; }; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 47eec54e127..6913f1c11fd 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = - "http://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; + "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; }; diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 556d21ee2fc..850ed32998b 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "29.4b7"; src = fetchurl { - url = "http://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip"; + url = "https://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip"; sha256 = "0idaqm46m4yis7vl014scx57lpccvjbnyy79gmj8caxghyajws0m"; }; diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 82155eb51c7..39c9323151f 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "multitail-${version}"; src = fetchurl { - url = "http://www.vanheusden.com/multitail/${name}.tgz"; + url = "https://www.vanheusden.com/multitail/${name}.tgz"; sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg"; }; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 330210269d5..b167d0f2c47 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.13"; src = fetchurl { - url = "http://dev.yorhel.nl/download/${name}.tar.gz"; + url = "https://dev.yorhel.nl/download/${name}.tar.gz"; sha256 = "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl"; }; diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index af6c17433f1..7dbfc90fa12 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "4.0.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0c0x05ca8lp74928nix4pvd243l95lav35r21mpkbagf72z284d2"; + sha256 = "0yzyi2p0d8xp576lxyv5m9h60dl1d5dmrn40aad307872835b9rr"; }; dontBuild = true; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 3464a92fa11..10aa5d1ae99 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "osinfo-db-tools-1.1.0"; + name = "osinfo-db-tools-1.2.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; - sha256 = "0sslzrbhpb2js1vn48c11s5p0bic3yqzdnxm054dhc3wq0pwshd1"; + sha256 = "07zqbwsmdgnzqah2smm4zri04c0qm82z1jn8kzz1bnsqbfg84l1v"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index a437eba4957..98154d9d562 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,40 +1,56 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection -, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse -, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobjectIntrospection, gnome3 +, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux +, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3 }: let + version = "2018.6"; + libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "0c82203cd459a35cc3f471e3205355e9fb79160f"; - sha256 = "0xbrv7q6b2ygrbr0yr7p01zpryw45643qfwnlw0z2yv515qs7isc"; + owner = "GNOME"; + repo = "libglnx"; + rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3"; + sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc"; }; bsdiff-src = fetchFromGitHub { - owner = "mendsley"; - repo = "bsdiff"; - rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; + owner = "mendsley"; + repo = "bsdiff"; + rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; - - version = "2018.4"; in stdenv.mkDerivation { name = "ostree-${version}"; + outputs = [ "out" "dev" "man" "installedTests" ]; + src = fetchFromGitHub { - rev = "v${version}"; - owner = "ostreedev"; - repo = "ostree"; - sha256 = "00jgj6vcjpz1akfbmf82q1bcs3njrmvdgy4c2gnn24vkmh9yr0lr"; + rev = "v${version}"; + owner = "ostreedev"; + repo = "ostree"; + sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g"; }; + patches = [ + # Tests access the helper using relative path + # https://github.com/ostreedev/ostree/issues/1593 + (fetchpatch { + url = https://github.com/ostreedev/ostree/pull/1633.patch; + sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j"; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc libxslt docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ]; + buildInputs = [ + glib systemd e2fsprogs libsoup gpgme fuse libselinux libcap + libarchive bzip2 xz + utillinuxMinimal # for libmount + (python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests + ]; prePatch = '' rmdir libglnx bsdiff @@ -44,16 +60,24 @@ in stdenv.mkDerivation { preConfigure = '' env NOCONFIGURE=1 ./autogen.sh - - configureFlags+="--with-systemdsystemunitdir=$out/lib/systemd/system" ''; + configureFlags = [ + "--with-systemdsystemunitdir=$(out)/lib/systemd/system" + "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators" + "--enable-installed-tests" + ]; + + makeFlags = [ + "installed_testdir=$(installedTests)/libexec/installed-tests/libostree" + "installed_test_metadir=$(installedTests)/share/installed-tests/libostree" + ]; + meta = with stdenv.lib; { description = "Git for operating system binaries"; - homepage = https://ostree.readthedocs.io/en/latest/; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = https://ostree.readthedocs.io/en/latest/; + license = licenses.lgpl2Plus; + platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; }; } - diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index cd1e5457639..f453199835f 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pv-1.6.6"; src = fetchurl { - url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; + url = "https://www.ivarch.com/programs/sources/${name}.tar.bz2"; sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0"; }; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index dfda07fda4e..8dcc9ef81ff 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -9,7 +9,7 @@ assert tkremind -> makeWrapper != null; stdenv.mkDerivation rec { name = "remind-3.1.15"; src = fetchurl { - url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; + url = https://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla"; }; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index e9ed5c0450a..b5b5a2cfed8 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.4.0"; src = fetchurl { - url = "http://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; + url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source firmware for mp3 players"; - homepage = http://www.rockbox.org; + homepage = https://www.rockbox.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu jgeerds ]; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index ed97601e519..650ac9f660a 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2"; src = fetchurl { - url = "http://routino.org/download/${name}.tgz"; + url = "https://routino.org/download/${name}.tgz"; sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; }; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 8c2845dc8eb..75b9dd15fb7 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,40 +1,57 @@ -{ stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils, - gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: +{ stdenv, fetchpatch, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, + gobjectIntrospection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, gperf, cmake, + libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, + bubblewrap, pcre, check, python }: let libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db"; - sha256 = "1npb9zbyb4bl0nxqf0pcqankcwzs3k1x8i2wkdwhgak4qcvxvfqn"; + owner = "GNOME"; + repo = "libglnx"; + rev = "97b5c08d2f93dc93ba296a84bbd2a5ab9bd8fc97"; + sha256 = "0cz4x63f6ys7dln54g6mrr7hksvqwz78wdc8qb7zr1h2cp1azcvs"; }; libdnf-src = fetchFromGitHub { - owner = "rpm-software-management"; - repo = "libhif"; - rev = "b69552b3b3a42fd41698a925d5f5f623667bac63"; - sha256 = "0h6k09rb4imzbmsn7mspwl0js2awqdpb4ysdqq550vw2nr0dzszr"; + owner = "rpm-software-management"; + repo = "libdnf"; + rev = "b3fcc53f6f3baf4f51f836f5e1eb54eb82d5df49"; + sha256 = "15nl9x4blyc9922rvz7iq56yy8hxhpsf31cs3ag7aypqpfx3czci"; }; - version = "2016.10"; + version = "2018.5"; in stdenv.mkDerivation { name = "rpm-ostree-${version}"; + outputs = [ "out" "dev" "man" "devdoc" ]; + src = fetchFromGitHub { - rev = "v${version}"; - owner = "projectatomic"; - repo = "rpm-ostree"; - sha256 = "0a0wwklzk1kvk3bbxxfvxgk4ck5dn7a7v32shqidb674fr2d5pvb"; + rev = "v${version}"; + owner = "projectatomic"; + repo = "rpm-ostree"; + sha256 = "0y37hr8mmrsww4ka2hlqmz7wp57ibzhah4j87yg8q8dks5hxcbsx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig which autoconf automake libtool cmake gperf + gobjectIntrospection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 + ]; buildInputs = [ - which autoconf automake libtool libcap ostree rpm glib libgsystem gperf - json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 - cmake pcre check python - # FIXME: get rid of this once libarchive properly propagates this - acl + libcap ostree rpm glib systemd polkit bubblewrap + json-glib libarchive libsolv librepo + pcre check python + ]; + + patches = [ + # Use gdbus-codegen from PATH + (fetchpatch { + url = https://github.com/projectatomic/rpm-ostree/commit/315406d8cd0937e786723986e88d376c88806c60.patch; + sha256 = "073yfa62515kyf58s0sz56w0a40062lh761y2y4assqipybwxbvp"; + }) + ]; + + configureFlags = [ + "--enable-gtk-doc" + "--with-bubblewrap=${bubblewrap}/bin/bwrap" ]; dontUseCmakeConfigure = true; @@ -47,14 +64,11 @@ in stdenv.mkDerivation { # According to #cmake on freenode, libdnf should bundle the FindLibSolv.cmake module cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake libdnf/cmake/modules/ - # See https://github.com/projectatomic/rpm-ostree/issues/480 - substituteInPlace src/libpriv/rpmostree-unpacker.c --replace 'include <selinux/selinux.h>' "" - # libdnf normally wants sphinx to build its hawkey manpages, but we don't care about those manpages since we don't use hawkey substituteInPlace configure.ac --replace 'cmake \' 'cmake -DWITH_MAN=off \' # Let's not hardcode the rpm-gpg path... - substituteInPlace libdnf/libdnf/dnf-keyring.c \ + substituteInPlace libdnf/libdnf/dnf-keyring.cpp \ --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"' ''; @@ -64,10 +78,10 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; - homepage = "https://rpm-ostree.readthedocs.io/en/latest/"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = https://rpm-ostree.readthedocs.io/en/latest/; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 671dba0d548..4d826c97d29 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "rrdtool-1.7.0"; src = fetchurl { - url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; sha256 = "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr"; }; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index a9fefe446fe..668a3fd5c99 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.2.1.1"; src = fetchurl { - url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; + url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka"; }; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index a256b8e4fdb..03926b95538 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "t1utils-1.41"; src = fetchurl { - url = "http://www.lcdf.org/type/${name}.tar.gz"; + url = "https://www.lcdf.org/type/${name}.tar.gz"; sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw"; }; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 80cbf3661da..14c152236d6 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "testdisk-7.1"; src = fetchurl { - url = http://www.cgsecurity.org/testdisk-7.0.tar.bz2; + url = https://www.cgsecurity.org/testdisk-7.0.tar.bz2; sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"; }; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 91eeb6b0a51..39d3ea1c208 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced Power Management for Linux"; - homepage = http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; + homepage = https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 938092c2387..1f50eef0ed0 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.10.1"; - source.sha256 = "0rjy2glqwbz07ci0snycq19myfczd2pry2iw4g0nqsw37wclm1vi"; + version = "0.11.3"; + source.sha256 = "1l9pnfmfxjrszzqbw8w2r6akdi7g52q9iga01bxmy2nm27mbv2q1"; erubis = buildRubyGem rec { inherit ruby; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 84546985f72..978a3d541ab 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "unclutter-8"; src = fetchurl { - url = http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; + url = https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index f66f6c3642e..23e28c3c286 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "11hnp3gcmcc5kci2caxw4hs6m08h2mhqs3xzqq7iafx1ha2ggwyw"; + sha256 = "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz"; }; buildInputs = [ readline ]; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index fc8c40ea4e0..2a792669ba8 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; + url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "0bdlc7a8plvglqqx39qqampqm6y0hcdws76l9dffwl22zss4i29y"; }; diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index 1c108af27f8..90b721ad58a 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "vorbisgain-0.37"; src = fetchurl { - url = "http://sjeng.org/ftp/vorbis/${name}.tar.gz"; + url = "https://sjeng.org/ftp/vorbis/${name}.tar.gz"; sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx"; }; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 63b6cb66883..dd3cbb33c1b 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.43"; src = fetchurl { - url="http://www.jwz.org/xdaliclock/${name}.tar.gz"; + url="https://www.jwz.org/xdaliclock/${name}.tar.gz"; sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb"; }; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index e6c67ddb9bb..80a728747fe 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,5 +1,6 @@ -{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk, keyutils -, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su +{ 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 , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { @@ -90,7 +91,9 @@ stdenv.mkDerivation { ln -s @out@/lib/xfstests/$f $f done - export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH + export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils + libcap lvm2 perl procps killall quota + utillinux which xfsprogs]}:$PATH exec ./check "$@" ''; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index e3a5a58671c..6d99a5c2d1a 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "aircrack-ng-1.2"; src = fetchurl { - url = "http://download.aircrack-ng.org/${name}.tar.gz"; + url = "https://download.aircrack-ng.org/${name}.tar.gz"; sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr"; }; diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix index 657d9284f1b..13edd48e37d 100644 --- a/pkgs/tools/networking/airfield/node-packages.nix +++ b/pkgs/tools/networking/airfield/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -49,13 +49,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.6.0" = { + "aws4-1.7.0" = { name = "aws4"; packageName = "aws4"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; + sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; }; }; "bcrypt-pbkdf-1.0.1" = { @@ -67,24 +67,6 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "boom-4.3.1" = { - name = "boom"; - packageName = "boom"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; - sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; - }; - }; - "boom-5.2.0" = { - name = "boom"; - packageName = "boom"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; - }; - }; "buffer-crc32-0.1.1" = { name = "buffer-crc32"; packageName = "buffer-crc32"; @@ -184,15 +166,6 @@ let sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; }; }; - "cryptiles-3.1.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; - sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -208,7 +181,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; "delayed-stream-1.0.0" = { @@ -337,24 +310,6 @@ let sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "hawk-6.0.2" = { - name = "hawk"; - packageName = "hawk"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; - }; - }; - "hoek-4.2.1" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; - sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; - }; - }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -427,13 +382,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "lodash-4.17.5" = { + "lodash-4.17.10" = { name = "lodash"; packageName = "lodash"; - version = "4.17.5"; + version = "4.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; - sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; + sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; }; }; "methods-0.0.1" = { @@ -460,7 +415,7 @@ let version = "1.33.0"; src = fetchurl { url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; + sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; "mime-types-2.1.18" = { @@ -469,7 +424,7 @@ let version = "2.1.18"; src = fetchurl { url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; + sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; }; }; "mkdirp-0.3.3" = { @@ -535,13 +490,13 @@ let sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; }; }; - "qs-6.5.1" = { + "qs-6.5.2" = { name = "qs"; packageName = "qs"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "range-parser-0.0.4" = { @@ -559,7 +514,7 @@ let version = "2.8.0"; src = fetchurl { url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; + sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; "redis-commands-1.3.5" = { @@ -568,7 +523,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; - sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by"; + sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA=="; }; }; "redis-parser-2.6.0" = { @@ -580,13 +535,22 @@ let sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; }; }; - "safe-buffer-5.1.1" = { + "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.1"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "send-0.1.0" = { @@ -598,31 +562,13 @@ let sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; }; }; - "sntp-2.1.0" = { - name = "sntp"; - packageName = "sntp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; - }; - }; - "sshpk-1.14.1" = { + "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; - sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; + sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; }; }; "tough-cookie-2.3.4" = { @@ -631,7 +577,7 @@ let version = "2.3.4"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; + sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; }; }; "tunnel-agent-0.6.0" = { @@ -652,22 +598,22 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "underscore-1.8.3" = { + "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; - version = "1.8.3"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; - "uuid-3.2.1" = { + "uuid-3.3.0" = { name = "uuid"; packageName = "uuid"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; - sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; + sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; }; }; "verror-1.10.0" = { @@ -726,7 +672,7 @@ in sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; }; dependencies = [ - sources."underscore-1.8.3" + sources."underscore-1.9.1" ]; buildInputs = globalBuildInputs; meta = { @@ -757,7 +703,7 @@ in version = "2.8.0"; src = fetchurl { url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; + sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; dependencies = [ sources."double-ended-queue-2.1.0-0" @@ -779,7 +725,7 @@ in version = "3.3.3"; src = fetchurl { url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz"; - sha512 = "355x879l7vfnzp6m199ghns4sgl5xpx0j6nr2bqimy3xj29i168bsaxi8gwky6cqy4apvb62sp8n67rssdzq667zngf7mm4dddsr5df"; + sha512 = "rpWsW2uk1uOe/ccY/JvW+RiLrhZm7auIx8z4yR+KXemFTIhJyD58jXiJbI0E/fZCnybawpdSqOZ+6/ah6aBeyg=="; }; dependencies = [ sources."debug-3.1.0" @@ -801,13 +747,13 @@ in async = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; - sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; + url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; + sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; }; dependencies = [ - sources."lodash-4.17.5" + sources."lodash-4.17.10" ]; buildInputs = globalBuildInputs; meta = { @@ -821,10 +767,10 @@ in request = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.85.0"; + version = "2.87.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; - sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; + url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; + sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; }; dependencies = [ sources."ajv-5.5.2" @@ -832,18 +778,12 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" @@ -856,8 +796,6 @@ in sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" @@ -871,15 +809,14 @@ in sources."oauth-sign-0.8.2" sources."performance-now-2.1.0" sources."punycode-1.4.1" - sources."qs-6.5.1" - sources."safe-buffer-5.1.1" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" - sources."stringstream-0.0.5" + sources."qs-6.5.2" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sshpk-1.14.2" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.2.1" + sources."uuid-3.3.0" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 75bc6ec109c..8f3be4cc8c7 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 128ebc155b5..a06b409ca49 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "bwm-ng-${version}"; src = fetchurl { - url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; + url = "https://www.gropp.org/bwm-ng/${name}.tar.gz"; sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; }; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 1299c5eea5f..27f5ca2c7dd 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "3.3"; src = fetchurl { - url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; + url = "https://download.tuxfamily.org/chrony/${name}.tar.gz"; sha256 = "0a1ilzr88xhzx1ql3xhn36a4rvl79hvp0dvgm3az4cjhhzav47qd"; }; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 1ebf57997d0..6c7f335891f 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "4.4.1"; src = fetchurl { - url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia"; }; diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index 2599e822529..d557c0ab9ad 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0sk4sg3hn88n44dxikipf3ggfj3ixrp22asb7nry9p0bkfaqdvrj"; - url = "http://www.mavetju.org/download/dhcping-${version}.tar.gz"; + url = "https://www.mavetju.org/download/dhcping-${version}.tar.gz"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 65e5c9cd126..5e2b27c6516 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "dnstracer-${version}"; src = fetchurl { - url = "http://www.mavetju.org/download/${name}.tar.gz"; + url = "https://www.mavetju.org/download/${name}.tar.gz"; sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; }; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index b7ef3b8fa75..be2e43a8947 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dropbear-2018.76"; src = fetchurl { - url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; + url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; }; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index b76b32ec4c8..2b19c8e6a05 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "fping-4.0"; src = fetchurl { - url = "http://www.fping.org/dist/${name}.tar.gz"; + url = "https://www.fping.org/dist/${name}.tar.gz"; sha256 = "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7"; }; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index 312906f9510..d8d4353f782 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gftp-2.0.19"; src = fetchurl { - url = http://www.gftp.org/gftp-2.0.19.tar.bz2; + url = https://www.gftp.org/gftp-2.0.19.tar.bz2; sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 2317a4e2216..07676cb1871 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; + url = "https://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"; }; diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 82e105c3a3b..6fd4ab36163 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { the situation that your Internet access is firewalled, but pings are allowed. ''; - homepage = http://code.gerade.org/hans/; + homepage = https://code.gerade.org/hans/; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 69f27ff37c2..5aa0c01e848 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "iodine-0.7.0"; src = fetchurl { - url = "http://code.kryo.se/iodine/${name}.tar.gz"; + url = "https://code.kryo.se/iodine/${name}.tar.gz"; sha256 = "0gh17kcxxi37k65zm4gqsvbk3aw7yphcs3c02pn1c4s2y6n40axd"; }; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 0506c858029..00a3f7f3b6b 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l"; - url = "http://www.ip2location.com/downloads/ip2location-${version}.tar.gz"; + url = "https://www.ip2location.com/downloads/ip2location-${version}.tar.gz"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 33e9841eb05..6d26cf591ba 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.11"; + name = "iperf-2.0.12"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1lm5inayc8fkqncj55fvzl9611rkmkj212lknmby7c3bgk851mmp"; + sha256 = "0ii6sgp62x9ly2gyk00w58dy9qwcw2kvhhcfa7v16jr6n4gnazrn"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index ece7ea3c95e..ed6ca57f3da 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "iperf-3.5"; src = fetchurl { - url = "http://downloads.es.net/pub/iperf/${name}.tar.gz"; + url = "https://downloads.es.net/pub/iperf/${name}.tar.gz"; sha256 = "1m9cyycv70s8nlbgr1lqwr155ixk17np0nzqgwaw3f51vkndk6sk"; }; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 36eced80856..86d16264823 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { urls = [ "https://lftp.tech/ftp/${name}.tar.xz" "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz" - "http://lftp.yar.ru/ftp/${name}.tar.xz" + "https://lftp.yar.ru/ftp/${name}.tar.xz" ]; sha256 = "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny"; }; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index a1a2b79b86a..babfcf1db21 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { buildInputs = [ judy ]; src = fetchurl { - url = "http://www.remlab.net/files/miredo/miredo-${version}.tar.xz"; + url = "https://www.remlab.net/files/miredo/miredo-${version}.tar.xz"; sha256 = "0j9ilig570snbmj48230hf7ms8kvcwi2wblycqrmhh85lksd49ps"; }; diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index e9af9dc980e..8612808687e 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.7.990"; src = fetchurl { - url = "http://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; }; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index bbd003a6256..6b6d99e745e 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.14"; + name = "nbd-3.17"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad"; + sha256 = "12fil2hb3gkxslr3nl9kak93n4iyhfs3zdwrmx9vjcxblfqnnp6r"; }; - patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ]; - buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; diff --git a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch deleted file mode 100644 index ad0a7a6f66d..00000000000 --- a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ubr nbd-3.14-orig/Makefile.in nbd-3.14-new/Makefile.in ---- nbd-3.14-orig/Makefile.in 2016-09-19 15:37:30.904176475 +0200 -+++ nbd-3.14-new/Makefile.in 2016-09-19 15:39:43.813543062 +0200 -@@ -403,7 +403,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = . man doc tests systemd gznbd -+SUBDIRS = . man doc tests gznbd - sbin_PROGRAMS = @NBD_CLIENT_NAME@ - noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la - libcliserv_la_SOURCES = cliserv.h cliserv.c diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 56cdbd17825..619cdac9266 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ndisc6-1.0.3"; src = fetchurl { - url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; + url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g"; }; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index d84f87ed1ba..de53cfdd224 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { urls = [ "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz" - "http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" + "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" ]; sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs"; }; diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index bd5190767d1..d10125e09a6 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://mamuti.net/files/netrw/netrw-${version}.tar.bz2" + "https://mamuti.net/files/netrw/netrw-${version}.tar.bz2" "http://www.sourcefiles.org/Networking/FTP/Other/netrw-${version}.tar.bz2" ]; sha256 = "1gnl80i5zkyj2lpnb4g0q0r5npba1x6cnafl2jb3i3pzlfz1bndr"; diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 3e4d2d6e920..c63d7ac057b 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "noip-2.1.9-1"; src = fetchurl { - url = http://www.noip.com/client/linux/noip-duc-linux.tar.gz; + url = https://www.noip.com/client/linux/noip-duc-linux.tar.gz; sha256 = "82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593"; }; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 1178f5f0107..6e566d3c473 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "ntp-4.2.8p11"; src = fetchurl { - url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; + url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; sha256 = "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi"; }; diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 4775d42d7a9..bc026d6835b 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "nylon-1.21"; src = fetchurl { - url = http://monkey.org/~marius/nylon/nylon-1.21.tar.gz; + url = https://monkey.org/~marius/nylon/nylon-1.21.tar.gz; sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 8e05e49962c..5258d53a18a 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -3,18 +3,17 @@ with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "pirate-get"; - version = "0.2.13"; + version = "0.3.1"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "c5b159e02067136d3157d56061958a50e997a078510e4403bb7de40217833f3f"; + sha256 = "9d7cc4b15dd8c6a82f9e03a666372e38613ccafdc846ad4c1226ba936beea68d"; }; - propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; + propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ]; meta = with stdenv.lib; { description = "A command line interface for The Pirate Bay"; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 4651dab7e67..b2584a4f497 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -5,7 +5,7 @@ in stdenv.mkDerivation rec { name = "rp-pppoe-" + version; src = fetchurl { - url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; + url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; }; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix new file mode 100644 index 00000000000..eb2fe70cf4b --- /dev/null +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "shadowfox-${version}"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "SrKomodo"; + repo = "shadowfox-updater"; + rev = "v${version}"; + sha256 = "07695hba72q722d18q75pwa45azg9jibj6vqnhwb7mnwz2i7hkkc"; + }; + + goPackagePath = "github.com/SrKomodo/shadowfox-updater"; + goDeps = ./deps.nix; + + buildFlags = "--tags release"; + + meta = with stdenv.lib; { + description = '' + This project aims at creating a universal dark theme for Firefox while + adhering to the modern design principles set by Mozilla. + ''; + homepage = "https://overdodactyl.github.io/ShadowFox/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/tools/networking/shadowfox/deps.nix b/pkgs/tools/networking/shadowfox/deps.nix new file mode 100644 index 00000000000..f3a824af686 --- /dev/null +++ b/pkgs/tools/networking/shadowfox/deps.nix @@ -0,0 +1,75 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "b3cebc399d6f98536af845ed8a5144ab586f6759"; + sha256 = "1kbf08msh4bjbdwnj1cjmddl5jfiarswfim3q085x77bcb43l0qa"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "cec2bdc49009247305a260b082a18e802d0fe292"; + sha256 = "0d4ab6v83w5ya4rnnaymasmza4p2jl0lqf4xcgsmsk6lnnrwm5s8"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "d9cec903b20cbeda6062366e460c2c1bdc717e4d"; + sha256 = "1j8nxi71v0qplfx6alfdx8rm2dxrcfk2k27gjrh2aksa322cmryb"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; + sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + }; + } + { + goPackagePath = "github.com/rivo/tview"; + fetch = { + type = "git"; + url = "https://github.com/rivo/tview"; + rev = "306abd9cb98c97417ab6c58aa0400b2e5daac88b"; + sha256 = "00q8hymxa36a178hbzylsw3ald6a7gyg8adnki3flyv1jg3dnahx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5cec4b58c438bd98288aeb248bab2c1840713d21"; + sha256 = "19iyz2nppicvwap5lv796sbzd82glk2jn4yn5w6z6zymwnykfzds"; + }; + } +] diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix new file mode 100644 index 00000000000..ce2a8cf6a7f --- /dev/null +++ b/pkgs/tools/networking/skydive/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl +, go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: + +buildGoPackage rec { + name = "skydive-${version}"; + version = "0.17.0"; + goPackagePath = "github.com/skydive-project/skydive"; + + src = fetchFromGitHub { + owner = "skydive-project"; + repo = "skydive"; + rev = "v${version}"; + sha256 = "03y26imiib2v9icrgwlamzsrx3ph6vn582051vdk1x9ar80xp4dv"; + }; + + patchPhase = '' + substituteInPlace Makefile \ + --replace ".proto: builddep" ".proto: " \ + --replace ".bindata: builddep" ".bindata: " + ''; + + buildInputs = [ perl go-bindata go-protobuf libxml2 protobuf3_1 libpcap pkgconfig ]; + goDeps = ./deps.nix; + + preBuild = '' + make -C go/src/github.com/skydive-project/skydive genlocalfiles VERSION=${version} + ''; + + preInstall = '' + mkdir -p $out/share/skydive + cp go/src/github.com/skydive-project/skydive/etc/skydive.yml.default $out/share/skydive/ + ''; + + postInstall = '' + rm $bin/bin/snort + ''; + + meta = { + homepage = http://skydive.network; + description = "A real-time network analyzer"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ lib.maintainers.lewo ]; + }; +} diff --git a/pkgs/tools/networking/skydive/deps.nix b/pkgs/tools/networking/skydive/deps.nix new file mode 100644 index 00000000000..c573a7231bb --- /dev/null +++ b/pkgs/tools/networking/skydive/deps.nix @@ -0,0 +1,1335 @@ +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +[ + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "fff283ad5116362ca252298cfc9b95828956d85d"; + sha256 = "0kfd6477rndcdl5c4dg9k64kxxp2667qqlbp4ccl7xk4qg9jckg9"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "fd18e053af8a4ff11039269006e8037ff374ce0e"; + sha256 = "1v62jhcq1zvnsj83z3dyqr7msndnp85rlm53l6iq78yryd54i115"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "4b6ea7319e214d98c938f12692336f7ca9348d6b"; + sha256 = "06wnl1dkkib2zpm31aavk5c4290s64h2ss68nl1vgcbxzsfbxjaq"; + }; + } + { + goPackagePath = "github.com/StackExchange/wmi"; + fetch = { + type = "git"; + url = "https://github.com/StackExchange/wmi"; + rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; + sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; + }; + } + { + goPackagePath = "github.com/abbot/go-http-auth"; + fetch = { + type = "git"; + url = "https://github.com/abbot/go-http-auth"; + rev = "ca62df34b58d26b6a064246c21c0a18f97813173"; + sha256 = "169i8549ai9ljjpvfgqjx4azclps7zjvislfszw5fndkw0qx7v1n"; + }; + } + { + goPackagePath = "github.com/araddon/gou"; + fetch = { + type = "git"; + url = "https://github.com/araddon/gou"; + rev = "0c2ab7394d785afff14c983fedce4be70ccc431f"; + sha256 = "0pppl3hm6r7mf7nnncjsfjfb8l020chzzl6n3c9g3qi02fkp3b1d"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c"; + sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/bitly/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-hostpool"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; + }; + } + { + goPackagePath = "github.com/c-bata/go-prompt"; + fetch = { + type = "git"; + url = "https://github.com/c-bata/go-prompt"; + rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0"; + sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj"; + }; + } + { + goPackagePath = "github.com/cenk/hub"; + fetch = { + type = "git"; + url = "https://github.com/cenk/hub"; + rev = "11382a9960d39b0ecda16fd01c424c11ff765a34"; + sha256 = "02f0l563niy2i5zq5cq7mqab775zzywp062pl0r12ny3gs0l8ssm"; + }; + } + { + goPackagePath = "github.com/cenk/rpc2"; + fetch = { + type = "git"; + url = "https://github.com/cenk/rpc2"; + rev = "7ab76d2e88c77ca1a715756036d8264b2886acd2"; + sha256 = "1yazkf6g370zy13fxnwjvn1n37zf7m7mcfws0jrrjflfw49fbpv8"; + }; + } + { + goPackagePath = "github.com/cnf/structhash"; + fetch = { + type = "git"; + url = "https://github.com/cnf/structhash"; + rev = "7710f1f78fb9c581deeeab57ecfb7978901b36bc"; + sha256 = "07dlpnwmqdmhj9s7w558lc0wnzvngz3i7d42a5y9rfg9k079l3fp"; + }; + } + { + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "30d10be492927e2dcae0089c374c455d42414fcb"; + sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; + }; + } + { + goPackagePath = "github.com/coreos/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/coreos/bbolt"; + rev = "32c383e75ce054674c53b5a07e55de85332aee14"; + sha256 = "0qa4434g081ksil9g479v9yk3ylhl48c9k95zki5kjq49cb0c589"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "b5abfe1858ddde05b83b96a810dc2b50cc5fcd94"; + sha256 = "0lkhc45irh2pvlnqs60s06q74q5mlym9wl8h7rk8kk4zcfxqaa8i"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31"; + sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "66fe44ad037ccb80329115cb4db0dbe8e9beb03a"; + sha256 = "1pxcwx0c6aazqdypcjvibam6zw88v1gsfhnsn5bscy33yzqmjrd4"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"; + sha256 = "02zhyimshzfzp3by2lggm2z382j4pvbrbcxx9p1wqmmmwy5yz182"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "325b0804fef3a66309d962357aac3c2ce3f4d329"; + sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "c6d412e329c85f32a4b2269b49aaa0794affcf88"; + sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"; + sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; + sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; + }; + } + { + 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 = "7524189396c68dc4b04d53852f9edc00f816b123"; + sha256 = "1rqmrxpx55kin0059k7svmcbqx2jgybc200cjdc9ysaif3rhkd73"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "f5faa72e73092639913f5833b75e1ac1d6bc7a63"; + sha256 = "1kdwvygp2g9jc9ygkr7snmk6zk6wmy7xywrf1p6q6iiwwil4xghz"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/gima/govalid"; + fetch = { + type = "git"; + url = "https://github.com/gima/govalid"; + rev = "7b486932bea218beb6e85f7ed28650d283dd6ce6"; + sha256 = "1w3gbfjl283qdfk3xj9mavhwx5wyh1v4w26d85plcdx4kcjmn6hy"; + }; + } + { + goPackagePath = "github.com/go-ole/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/go-ole/go-ole"; + rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; + sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; + }; + } + { + 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 = "7abd5745472fff5eb3685386d5fb8bf38683154d"; + sha256 = "1z9hwfzxgwr59r1syy0s4hgybs27q87n9mm1bbxl0yl5yvzw67rl"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; + sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; + }; + } + { + goPackagePath = "github.com/gobwas/httphead"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/httphead"; + rev = "01c9b01b368a438f615030bbbd5e4f9e0023e15c"; + sha256 = "0g1fig36plp3668wc3hm6w4sb7ki0ss24c311a59jpdgy9awfp56"; + }; + } + { + goPackagePath = "github.com/gobwas/pool"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/pool"; + rev = "32dbaa12caca20fad12253c30591227e04f62cdd"; + sha256 = "0iqqfi7zf6jrx1857xxk17hy4j1ln90j5w4jzyxd5x72v5jnmhxm"; + }; + } + { + goPackagePath = "github.com/gobwas/ws"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/ws"; + rev = "915eed3240022c5265584c55032ef1b8c8f84168"; + sha256 = "10r08qrssbmqkxhh26h1s7vvf1lpp7j5b5a4rn0cbr38gv4zwmx9"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "2adc21fd136931e0388e278825291678e1d98309"; + sha256 = "0z6lxahhq3d16w4ff3swrggly08yavzrjsjmmchfq7wcxxdrc9s6"; + }; + } + { + 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 = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "cc6329d4279e3f025a53a83c397d2339b5705c45"; + sha256 = "1aqvcqr0c7z3sgj272n5f9g8g6cy4361697a0f240amqdvj0ax9v"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + }; + } + { + goPackagePath = "github.com/google/gopacket"; + fetch = { + type = "git"; + url = "https://github.com/google/gopacket"; + rev = "67a21c4470a0598531a769727aef40b870ffa128"; + sha256 = "1clxrcabrdrkrgwbal852w3cynvzdwbpl4gc0f5yyzncmaazxmhq"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "41d03372f44f2bc18a72c97615a669fb60e7452a"; + sha256 = "04l6384y7riya4wrc7s7ry7c8dil4sdyks1psqavw85bgy9q1iql"; + }; + } + { + goPackagePath = "github.com/gophercloud/gophercloud"; + fetch = { + type = "git"; + url = "https://github.com/gophercloud/gophercloud"; + rev = "849a2e71dd64dbfa2bd4be110ace68881802414b"; + sha256 = "12xn9gph7hg6sfyqd5z9advsx1s776pm5ji9qnarnq1781k7gzh2"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/handlers"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/handlers"; + rev = "90663712d74cb411cbef281bc1e08c19d1a76145"; + sha256 = "03h5ygjcwama9kr9k7nbg0spv5c7hdlw2ydaclj969i820aq3dpz"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "5ab525f4fb1678e197ae59401e9050fa0b6cb5fd"; + sha256 = "0d8rbiz2ykn43knf75arnm545jfxgw0zf5yx8ncjmfm9iimzj20i"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "cdedf21e585dae942951e34d6defc3215b4280fa"; + sha256 = "1kb7phyvvyl67pdsnd80sgpq3a6gv8lkr8ylppb1i6xwi25yppiv"; + }; + } + { + goPackagePath = "github.com/gosuri/uitable"; + fetch = { + type = "git"; + url = "https://github.com/gosuri/uitable"; + rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42"; + sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil"; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229"; + sha256 = "1qx04bqbd4cwkakzq8ahz1jq6pq8435h5zcapwn8k8a0f1bgfrnz"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "6b7015e65d366bf3f19b2b2a000a831940f0f7e0"; + sha256 = "039l2c5jsqrhm0g9bngrd3kry89kkai9v97kbd4mayqb619jcdxs"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "8cc3a55af3bcf171a1c23a90c4df9cf591706104"; + sha256 = "1pfxxskhihz7ijdfj2vinadx05iljqim9h7g19jzgvrl34p8bhix"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/hydrogen18/stoppableListener"; + fetch = { + type = "git"; + url = "https://github.com/hydrogen18/stoppableListener"; + rev = "dadc9ccc400c712e5a316107a5c462863919e579"; + sha256 = "0yf2a9641v5zscw8sj52aky21nm35cj5d946sbvhrjsr4vzzbbm7"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "e3000cb3d28c72b837601cac94debd91032d19fe"; + sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/intel-go/yanff"; + fetch = { + type = "git"; + url = "https://github.com/intel-go/yanff"; + rev = "35804adce65005f76409327527e4e256569cacc6"; + sha256 = "0rank8ij0ky9ryfw23aqk4mk72lznycqqbs5wr7y71d0pl9ljrgh"; + }; + } + { + goPackagePath = "github.com/iovisor/gobpf"; + fetch = { + type = "git"; + url = "https://github.com/iovisor/gobpf"; + rev = "dd767a9fd5f868874ed117811461410100cea403"; + sha256 = "0kj7g5iz81j9qmz57m5b2a9mfpapmwpp3ad9h5rz58r6wzm5anc3"; + }; + } + { + goPackagePath = "github.com/jbowtie/gokogiri"; + fetch = { + type = "git"; + url = "https://github.com/jbowtie/gokogiri"; + rev = "e2644e49d5b4a4d2382d1a4b28dfbb313a4ffb0c"; + sha256 = "1skbfr0w438xip7p58dkv6806yvm22f1wixqppb2yszgxril0j29"; + }; + } + { + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "ed104f61ea4877bea08af6f759805674861e968d"; + sha256 = "04ari17wr4pabjf607jcr7cf13r83dlxlspy8yvfh7hlr0xb16z2"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "ff2b70c1dbffdd98567bd8c2f9449d97c0d04c88"; + sha256 = "1flbh2qg16445md5vcsqvbq538icj5l25k5ygyjf86lxdfkh5kr0"; + }; + } + { + goPackagePath = "github.com/juju/loggo"; + fetch = { + type = "git"; + url = "https://github.com/juju/loggo"; + rev = "8232ab8918d91c72af1a9fb94d3edbe31d88b790"; + sha256 = "11y5gk41g1i5q6aqn6jpgm06nsq2mf7fdmkzwqrqagnajgb0h1s1"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "5b9ff866471762aa2ab2dced63c9fb6f53921342"; + sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k"; + }; + } + { + goPackagePath = "github.com/juju/webbrowser"; + fetch = { + type = "git"; + url = "https://github.com/juju/webbrowser"; + rev = "54b8c57083b4afb7dc75da7f13e2967b2606a507"; + sha256 = "0ngj27f0kgpc4m6jr2hz04kigv6p9z8hviddijgpb9srjzkl7dhz"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "d1898390779332322e6b5ca5011da4bf249bb056"; + sha256 = "19r684s93b7pxqkpxa7p3pba9dw3xf547z05biykil39xk7rgyfa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "c2c54e542fb797ad986b31721e1baedf214ca413"; + sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "95d05c1eef33a45bd58676b6ce28d105839b8d0b"; + sha256 = "0lyvs0g2pq0hdblfnpcgvp399j13xy4fzbr24l9zh5vbiw7d1lwc"; + }; + } + { + goPackagePath = "github.com/lxc/lxd"; + fetch = { + type = "git"; + url = "https://github.com/lxc/lxd"; + rev = "9907f3a64b6b8ec9144e8be02d633b951439c0f6"; + sha256 = "0qn0v2facxvg0w5vnasa28nxhvfdy817vkmvsnfqzgcnh60k3z20"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c81f9d71af8f8cba1466501d30326b99a4e56c19"; + sha256 = "1000zi161vzrk2fskjna31j9r9hd6m82i7r7wz76f88421i1xlx5"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "2a92e673c9a6302dd05c3a691ae1f24aef46457d"; + sha256 = "1k0c952c60zcbly9gzi48jyzwphgawnq9f70bgniciyp4jb8hfv3"; + }; + } + { + goPackagePath = "github.com/mattbaird/elastigo"; + fetch = { + type = "git"; + url = "https://github.com/safchain/elastigo"; + rev = "441c1531dca50a19990385930149f6785f78fe59"; + sha256 = "0dmsswm5zkr0054zrvq8h3naddnx4mygsd76fnjqxs25zf88v7ir"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/mattn/go-tty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-tty"; + rev = "931426f7535ac39720c8909d70ece5a41a2502a6"; + sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; + sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "756f7b183b7ab78acdbbee5c7f392838ed459dda"; + sha256 = "0yd3682x22lqrfq4h0q16c4swcfn3lmds05ijynm2fk1gcbnwiqn"; + }; + } + { + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "ab25296c0f51f1022f01cd99dfb45f1775de8799"; + sha256 = "1k21xr0x7k03hbkh72xbdi8gz8fk3wdlcbfpy7l90rxvi21jzz0f"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "github.com/nlewo/contrail-introspect-cli"; + fetch = { + type = "git"; + url = "https://github.com/nlewo/contrail-introspect-cli"; + rev = "e4df28ccf9801abbe32edd5ddaba31a7a62b61b6"; + sha256 = "0wf3s9gqy8pvv5gzngz30j9p7fa4mv5qyr9gnlf5ps85xpnlngbq"; + }; + } + { + goPackagePath = "github.com/nu7hatch/gouuid"; + fetch = { + type = "git"; + url = "https://github.com/nu7hatch/gouuid"; + rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; + sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; + }; + } + { + goPackagePath = "github.com/op/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/op/go-logging"; + rev = "970db520ece77730c7e4724c61121037378659d9"; + sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; + }; + } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "8fa5343b0058459296399a89bc532aa5508de28d"; + sha256 = "15wbnj19fbprgsrf0k7hpmpxrkh2vzrm71qn3gya05p908k81v03"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943"; + sha256 = "0ma7fwsyl0qflvhbb6qfc5h3yi81iy5lpc6wkdyd1sdafvrzpbb8"; + }; + } + { + 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 = "2973218375c3d13162e1d3afe1708aaee318ef3f"; + sha256 = "10jbkxyxilv5hixm4dww4qfn01cnb5fr8mgxvwigq5jcb85mrxig"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "8975875355a81d612fafb9f5a6037bdcc2d9b073"; + sha256 = "17l7p6lxhlnna1w1drgh7g8afxcxxd5j472givm2g7l9v8yg4f17"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "ff09b135c25aae272398c51a07235b90a75aa4f0"; + sha256 = "0pwl6v3hmc22zp32gkyqykl4kg69xk1mlp0vmhgd1f44difd5fvz"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5"; + sha256 = "1gkmk60lskyrn5751rgb9pxn41wi7y29wsn8psrfb16bg4flcvrq"; + }; + } + { + goPackagePath = "github.com/pkg/term"; + fetch = { + type = "git"; + url = "https://github.com/pkg/term"; + rev = "cda20d4ac917ad418d86e151eff439648b06185b"; + sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp"; + }; + } + { + goPackagePath = "github.com/pmylund/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/pmylund/go-cache"; + rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; + sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "5cec1d0429b02e4323e042eb04dafdb079ddf568"; + sha256 = "1cgd5pcxf4zgcafq284yf2i711m3kddpb05prxy51li5p1l5cbq0"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "23070236b1ebff452f494ae831569545c2b61d26"; + sha256 = "111vqp3lqsdli7z5rnkrpcfv6yri0qjikyl70whwxzcvkqp9k42s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; + sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011"; + sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17"; + }; + } + { + goPackagePath = "github.com/rogpeppe/fastuuid"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/fastuuid"; + rev = "6724a57986aff9bff1a1770e9347036def7c89f6"; + sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz"; + }; + } + { + goPackagePath = "github.com/safchain/ethtool"; + fetch = { + type = "git"; + url = "https://github.com/safchain/ethtool"; + rev = "e01512671ed4c2248daf0c5e974ecf88a4947335"; + sha256 = "11wk834aas1jj3bag3rwr0sb5alhd40si3fcqkvs0fsg6wjmwxyc"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "6a368fb7cd1221fa6ea90facc9447c9a2234c255"; + sha256 = "0vjf2jwkpb1fls997w3pvw5sg25yjygx0nv1i5pwcfrnpvnw9zxk"; + }; + } + { + goPackagePath = "github.com/skydive-project/dede"; + fetch = { + type = "git"; + url = "https://github.com/skydive-project/dede"; + rev = "d95b69cd1f75137aab3bcc01d6facf2aa7a43b80"; + sha256 = "16qgpxb24zq2js7ril8xf71yz927ly7fsadys23is8jzkgsx56mf"; + }; + } + { + goPackagePath = "github.com/socketplane/libovsdb"; + fetch = { + type = "git"; + url = "https://github.com/socketplane/libovsdb"; + rev = "5113f8fb4d9d374417ab4ce35424fbea1aad7272"; + sha256 = "1b4yz6jvsi2gz8ha9y42hy105q6ylf7516pd59wgg42r6n627w4g"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "a80ea588265c05730645be8342eeafeaa72b2923"; + sha256 = "1i2z4l3a335jz0jg8xzwfdcp0dlf77h8rb6nd88mnd1nbmbd58w4"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; + sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "d00654080cddbd2b082acaa74007cb94a2b40866"; + sha256 = "06zv87v7m0zgx9zy3w283008fmlx0v41xyldkql7qmp7l5l4vcpw"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; + sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/lebauce/viper"; + rev = "54676d0dbb12f9b6febb2f8210e9590d81d4b5e3"; + sha256 = "1dm01151hn6mywv6hm0nbqsr8qgwp393l4xz9p9jrd8asynpdpsb"; + }; + } + { + goPackagePath = "github.com/tchap/zapext"; + fetch = { + type = "git"; + url = "https://github.com/tchap/zapext"; + rev = "e61c0c8823393722ae09ce0faee42fa177088a4b"; + sha256 = "16xw01phxkndhsn8l9n587vdpmr0kh9xg0vxlk0l6ywkp31583cr"; + }; + } + { + goPackagePath = "github.com/tebeka/selenium"; + fetch = { + type = "git"; + url = "https://github.com/tebeka/selenium"; + rev = "657e45ec600f26e76da253936c1f2adb6978ff72"; + sha256 = "1gqhmlqcq4y5pxw7inqd987xwyrnd5zsmj8blmb5vizhan7liw99"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"; + sha256 = "04iwqjj049q4dldf1wpqymf1y9kdppxp3y0ywsqzaw21bi8b3zcc"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "016ba6f67a12c03708643150afcfb1509be7747a"; + sha256 = "08z5g217nynq6nrdls8hj1761wwl9skhwfz2fad9di8ziy8mk7w4"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "604eaf189ee867d8c147fafc28def2394e878d25"; + sha256 = "0zii8dyy6qb2dh649syz3ablabw78k038w8a7fwnsk3x482p59s7"; + }; + } + { + goPackagePath = "github.com/weaveworks/tcptracer-bpf"; + fetch = { + type = "git"; + url = "https://github.com/weaveworks/tcptracer-bpf"; + rev = "e080bd747dc6b62d4ed3ed2b7f0be4801bef8faf"; + sha256 = "1ijqpzj4nmymi8gh3pl9rnwjzm5q89d1585iwj1s190cxcp1ix81"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "6fe8760cad3569743d51ddbb243b26f8456742dc"; + sha256 = "1b1flqamhzfi5lc4lbh8iw4s3lix0vxyrq0adpx0znx7lkkxhjvz"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "e02fc20de94c78484cd5ffb007f8af96be030a45"; + sha256 = "195in5zr3bhb3r1iins2h610kz339naj284b3839xmrhc15wqxzq"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "702b404897d4364af44dc8dcabc9815947942325"; + sha256 = "1lby7iar87q2kjqvcbx2jql4p2ggjq9ml114x7hlb3966447ayfr"; + }; + } + { + goPackagePath = "github.com/xiang90/probing"; + fetch = { + type = "git"; + url = "https://github.com/xiang90/probing"; + rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; + sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a775f18c7cfe02273500ae307b61218"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "0506d69f5564c56e25797bf7183c28921d4c6360"; + sha256 = "0b1b0iz6jwk5f77mwsggsvkywmxwwn1b4a6n63xd5czl23vi7a6q"; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a"; + sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; + }; + } + { + goPackagePath = "go.uber.org/zap"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/zap"; + rev = "35aad584952c3e7020db7b839f6b102de6271f89"; + sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a6577fac2d73be281a500b310739095313165611"; + sha256 = "00wks377dp0ws47dvc9f6y4sin1mwdk649v5jfz047ik1jh1nq5h"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "810d7000345868fc619eb81f46307107118f4ae1"; + sha256 = "07lm9h86l29dd45ca3vjsi06xpwg36899hf1ns7qwabflzgm0nxy"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a"; + sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "2b5a72b8730b0b16380010cfe5286c42108d88e7"; + sha256 = "0i69x08kg5yqwaz5grxbfhg2hjdkdhaqbc1v4x4l91232kw5nd38"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e"; + sha256 = "1sf3fvphz16pf7jbm86n07rip9m5fh40wjcc2j2d5zpka36xvjw4"; + }; + } + { + goPackagePath = "gopkg.in/errgo.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/errgo.v1"; + rev = "442357a80af5c6bf9b6d51ae791a39c3421004f3"; + sha256 = "0gg7vqkfh2bpn2z9xfdahrxdkvn365mdb63zs8s5v5cbm2glfq56"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify/fsnotify.v1"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/httprequest.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/httprequest.v1"; + rev = "93f8fee4081f01ea23d258bdbbcdd319f668d718"; + sha256 = "1lgicrb355m2vb31ly4ly997ral1zvqk9fy89x4qkxals1zfqi3q"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "gopkg.in/macaroon-bakery.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaroon-bakery.v2"; + rev = "22c04a94d902625448265ef041bb53e715452a40"; + sha256 = "1iaisvljir95m7jh02k98jv2j68bs38fdlis4pnjbpj8mbarllw4"; + }; + } + { + goPackagePath = "gopkg.in/macaroon.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaroon.v2"; + rev = "bed2a428da6e56d950bed5b41fcbae3141e5b0d0"; + sha256 = "199dcdl38vjj078aq56kpfzni0sm7j3062nxd8yyj1bd67x0xmsi"; + }; + } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "eef8f47ab679652a7d3a4ee34c34314d255d2536"; + sha256 = "0ahmw49lswks636vz49vb33r4rq0g3rrkqwsh8fn0kmhp94c9w40"; + }; + } + { + goPackagePath = "gopkg.in/urfave/cli.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/urfave/cli.v2"; + rev = "b2bf3c5abeb90da407891aecd1df2c5a1f6170c1"; + sha256 = "1x90qcnjcicq1d933bd9mdyjkwd0h9hdxgva45z85gqr7lavs5h3"; + }; + } + { + goPackagePath = "gopkg.in/validator.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/validator.v2"; + rev = "3e4f037f12a1221a0864cf0dd2e81c452ab22448"; + sha256 = "1294nz3wi4avn1nwyr8cdcx8jqjvlzadlnswarpwrq41mhlmhjfs"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "bef53efd0c76e49e6de55ead051f886bea7e9420"; + sha256 = "0df5gr2qyflh1vmb1i2jbkc46dc3mqmdbc53vbyrzw0ilzhzh0si"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "4df58c811fe2e65feb879227b2b245e4dc26e7ad"; + sha256 = "14pxzm1gqh4pa1179c8hfcbi5rqy9fx2cvpns8pwlyqz807rg2vl"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "019ae5ada31de202164b118aee88ee2d14075c31"; + sha256 = "1l1przxkbid3sfn80n60w2z883yad99cl89k4zwb9i7wcydk85w1"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "35ccd4336052e7d73018b1382413534936f34eee"; + sha256 = "1sp0v60xpy6lsdzsqq7lzcqkmqds100ziqzj2fip68svcysgqg9g"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"; + sha256 = "08b5yx07saj5vzzic50hlzw68p2fd7xc118x1liq4wqrikxmv8wa"; + }; + } +] diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 2172efc63e3..cca6d630fc1 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "smokeping-${version}"; version = "2.6.11"; src = fetchurl { - url = "http://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; + url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; sha256 = "1p9hpa2zs33p7hzrds80kwrm5255s0869v3s3qmsyx2sx63c7czj"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index b50d619b437..ad2d88e4a98 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.0"; src = fetchurl { - url = "http://www.tarsnap.com/spiped/${name}.tgz"; + url = "https://www.tarsnap.com/spiped/${name}.tgz"; sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj"; }; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 9ceb08ad72e..74405a472f8 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "5.6.3"; src = fetchurl { - url = "http://download.strongswan.org/${name}.tar.bz2"; + url = "https://download.strongswan.org/${name}.tar.bz2"; sha256 = "095zg7h7qwsc456sqgwb1lhhk29ac3mk5z9gm6xja1pl061driy3"; }; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 1b121335ac7..be807e30771 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20170101.0"; src = fetchurl { - url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; + url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; sha256 = "0pli4mlhasnqqxmmxalwyg3x7n2vhcbgsnp2xgddamjavv82vrl4"; }; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 9ef5ff2a4f0..bf039b653cc 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; src = fetchurl { - url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; + url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0"; }; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 52bb418fc0d..f6c88bb66b7 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "trickle-1.07"; src = fetchurl { - url = "http://monkey.org/~marius/trickle/${name}.tar.gz"; + url = "https://monkey.org/~marius/trickle/${name}.tar.gz"; sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; }; diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix index fc46c6a15bc..8a3b292ad81 100644 --- a/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/pkgs/tools/networking/ucspi-tcp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ucspi-tcp-0.88"; src = fetchurl { - url = "http://cr.yp.to/ucspi-tcp/${name}.tar.gz"; + url = "https://cr.yp.to/ucspi-tcp/${name}.tar.gz"; sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja"; }; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index d7ef54a2497..a009e76d9e0 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "13b210hd200xxvaffyzqb4g58knv1sfigph70ai74lrcb3pqbq2n"; + sha256 = "c11de115d928a6b48b2165e0214402a7a7da313cd479203a7ce7a8b62cba602d"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # get rid of runtime dependencies on $dev outputs + ''substituteInPlace "$lib/lib/libunbound.la" '' + stdenv.lib.concatMapStrings - (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' ") + (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") buildInputs; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index e8f8b425872..4d4a9446b45 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.20180613"; + version = "0.0.20180625"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0xndf5qxc4s0gsidzm0v4ivara6k2shjbr74xfcdpc0apfgyk2fz"; + sha256 = "1z7iibydj59nzx0jcxabb9k7b6djjz6yi032n66mqr98dh4dlkb7"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix new file mode 100644 index 00000000000..f6c4c25559e --- /dev/null +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -0,0 +1,146 @@ +{ stdenv, writeScript, buildFHSUserEnv, coreutils +, extraPkgs ? pkgs: [] }: + +buildFHSUserEnv { + name = "appimage-run"; + + # Most of the packages were taken from the Steam chroot + targetPkgs = pkgs: with pkgs; [ + gtk3 + bashInteractive + gnome3.zenity + python2 + xorg.xrandr + which + perl + xdg_utils + iana-etc + ] ++ extraPkgs pkgs; + + multiPkgs = pkgs: with pkgs; [ + desktop-file-utils + xorg.libXcomposite + xorg.libXtst + xorg.libXrandr + xorg.libXext + xorg.libX11 + xorg.libXfixes + libGL + + gst_all_1.gstreamer + gst_all_1.gst-plugins-ugly + libdrm + xorg.xkeyboardconfig + xorg.libpciaccess + + glib + gtk2 + bzip2 + zlib + gdk_pixbuf + + xorg.libXinerama + xorg.libXdamage + xorg.libXcursor + xorg.libXrender + xorg.libXScrnSaver + xorg.libXxf86vm + xorg.libXi + xorg.libSM + xorg.libICE + gnome2.GConf + freetype + (curl.override { gnutlsSupport = true; sslSupport = false; }) + nspr + nss + fontconfig + cairo + pango + expat + dbus + cups + libcap + SDL2 + libusb1 + dbus-glib + libav + atk + libudev0-shim + networkmanager098 + + xorg.libXt + xorg.libXmu + xorg.libxcb + libGLU + libuuid + libogg + libvorbis + SDL + SDL2_image + glew110 + openssl + libidn + tbb + wayland + mesa_noglu + libxkbcommon + + flac + freeglut + libjpeg + libpng12 + libsamplerate + libmikmod + libtheora + libtiff + pixman + speex + SDL_image + SDL_ttf + SDL_mixer + SDL2_ttf + SDL2_mixer + gstreamer + gst-plugins-base + libappindicator-gtk2 + libcaca + libcanberra + libgcrypt + libvpx + librsvg + xorg.libXft + libvdpau + alsaLib + strace + ]; + + runScript = writeScript "appimage-exec" '' + #!${stdenv.shell} + APPIMAGE="$(realpath "$1")" + + if [ ! -x "$APPIMAGE" ]; then + echo "fatal: $APPIMAGE is not executable" + exit 1 + fi + + SHA256="$(${coreutils}/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)" + SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/" + mkdir -p "$SQUASHFS_ROOT" + + export APPDIR="$SQUASHFS_ROOT/squashfs-root" + if [ ! -x "$APPDIR" ]; then + cd "$SQUASHFS_ROOT" + "$APPIMAGE" --appimage-extract 2>/dev/null + fi + + cd "$APPDIR" + export PATH="$PATH:$PWD/usr/bin" + export APPIMAGE_SILENT_INSTALL=1 + + if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then + exec "$APPIMAGE_DEBUG_EXEC" + fi + + exec ./AppRun + ''; +} diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index a9c1a1a33b3..5ac13fc42cf 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "cargo-tree-${version}"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "0lq14w11a4zl0rvv7rsd79k51dwk3w78fbsi6klkqknad02qmx3r"; + sha256 = "16vsw392qs3ag2brvcan19km7ds0s9s7505p3hnfjvjrzgdliir3"; }; - cargoSha256 = "0zi4qbadlx4l6zhb0f892ic3mdmyjjjzrirks18pl6qrn3dgny1x"; + cargoSha256 = "0g6afhqqdf76axbcs5wj9gydsabd3d5ja8qd8z8y6wbp7n0y4h6a"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 8eb266a9e65..44b67ae4dcc 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2017-12-7"; + version = "2018-06-14"; src = fetchFromGitHub{ owner = "rycee"; repo = "home-manager"; - rev = "0be32c9d42e3a8739263ae7886dc2448c833c19c"; - sha256 = "06lmnzlf5fmiicbgai27ad9m3bj980xf8ifdpc5lzbsy77pfcfap"; + rev = "5641ee3f942e700de35b28fc879b0d8a10a7a1fe"; + sha256 = "0bqzwczbr5c2y3ms7m7ly0as9zsnqwljq61ci2y2gbqzw3md1x2j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 75bc6ec109c..8f3be4cc8c7 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index b532039ede1..846e9bcfc12 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -58,13 +58,13 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; - "underscore-1.8.3" = { + "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; - version = "1.8.3"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; }; @@ -81,7 +81,11 @@ in }; dependencies = [ sources."async-0.2.10" - sources."binary-search-tree-0.2.4" + (sources."binary-search-tree-0.2.4" // { + dependencies = [ + sources."underscore-1.4.4" + ]; + }) sources."isnumber-1.0.0" sources."mkdirp-0.3.5" (sources."nedb-1.0.2" // { @@ -89,7 +93,7 @@ in sources."underscore-1.4.4" ]; }) - sources."underscore-1.8.3" + sources."underscore-1.9.1" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 440f91a6d64..677dbda7b49 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.6"; name = "opkg-${version}"; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; + url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; sha256 = "02ykhjpyxmh0qrqvc1s3vlhnr6wyxkcwqb8dplxqmkz83gkg01zn"; }; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 53ce183d4af..9f334b4a960 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { - sha256 = "0jsa1jl51kz8i8dpi3664a7y3bhypr3ipk1srzxfkk6aph4a5cdf"; + sha256 = "1h90iz4l85drchpkmhlsvg7f9abhw6890fdr9x5n5ir3kxikwcdm"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 52bc59abb4c..287fc3e899c 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.8.0"; src = fetchurl { - url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; + url = "https://people.freedesktop.org/~hadess/${name}.tar.xz"; sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k"; }; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 2d7f8b86f00..25102fd0730 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -26,6 +26,9 @@ 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/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index e9929cb2e6f..c095b77129c 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.5"; src = fetchurl { - url = "http://www.vanheusden.com/gpgstats/${name}.tgz"; + url = "https://www.vanheusden.com/gpgstats/${name}.tgz"; sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy"; }; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 5eb659f40c3..d858ed3fd6d 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { The package is based on the debian package libacr38u. ''; - homepage = http://www.acs.com.hk; + homepage = https://www.acs.com.hk; license = licenses.lgpl2Plus; maintainers = with maintainers; [ berce ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix index fb078674ea7..84b738a2109 100644 --- a/pkgs/tools/security/nasty/default.nix +++ b/pkgs/tools/security/nasty/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6"; src = fetchurl { - url = "http://www.vanheusden.com/nasty/${name}.tgz"; + url = "https://www.vanheusden.com/nasty/${name}.tgz"; sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn"; }; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 37efbd80fbb..c7e9267dde7 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -33,7 +33,7 @@ let name = "password-store-${version}"; src = fetchurl { - url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; + url = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; sha256 = "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27"; }; diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 82b7110189c..b74905b6e7e 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "REINER SCT cyberJack USB chipcard reader user space driver"; - homepage = http://www.reiner-sct.com/; + homepage = https://www.reiner-sct.com/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ aszlig ]; diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 866e1f41028..688521e1401 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; - url = "http://www.ucolick.org/~will/RUE/super/${name}-tar.gz"; + url = "https://www.ucolick.org/~will/RUE/super/${name}-tar.gz"; sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy"; }; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index b64124b3c54..086c82faa4c 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { name = "volatility-${version}"; src = fetchurl { - url = "http://downloads.volatilityfoundation.org/releases/${version}/${name}.zip"; + url = "https://downloads.volatilityfoundation.org/releases/${version}/${name}.zip"; sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv"; }; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 2e4133124c1..3f618301a86 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.1"; + version = "1.2.2"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "1dgc31l5d20i0v78c51xga4lr78b5x8dz6yzsvbhlgs0abi0nynx"; + sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g"; }; # Disable fstype test, tries to read /etc/mtab diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index bb9fa2dd877..39f6f17debf 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { name = "collectd-${version}"; src = fetchurl { - url = "http://collectd.org/files/${name}.tar.bz2"; + url = "https://collectd.org/files/${name}.tar.bz2"; sha256 = "1j8mxgfq8039js2bscphd6cnriy35hk4jrxfjz5k6mghpdvg8vxh"; }; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 80d6f6a42f8..4b6ead9667d 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dfc-3.0.5"; src = fetchurl { - url = "http://projects.gw-computing.net/attachments/download/467/${name}.tar.gz"; + url = "https://projects.gw-computing.net/attachments/download/467/${name}.tar.gz"; sha256 = "0yl5dl1nydinji71zz37c7myg3vg9jzxq89rcjqlfcy5dcfpm51w"; }; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 6c0bcb40621..8f1367d3fdc 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "35"; + version = "36"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "0hc7l5z0hw5472bm6p4d9n24bbggv9lgw7px1hqrdkfjghqfnlxh"; + sha256 = "0r39kx6sqgpk8rz19g1sil4dp7r82d5g1wlkbw1czwas95s50y7n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 57e3e63ca89..5a6b1c22288 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.3-4"; src = fetchurl { - url = "http://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; + url = "https://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2"; }; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 974a95bc0fa..68c6ef3c3ef 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; src = fetchurl { - url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; + url = "https://hisham.hm/htop/releases/${version}/${name}.tar.gz"; sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; }; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 839be268b5b..73adb082802 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.53"; + version = "21.55"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1hrazksr95pxl5p0r0x3cdph1ps98cls2v9avg0qs0qf9y18hady"; + sha256 = "005xf5j2bbalsi6z2j9q9r4zf80a04f7mz0bd2jyb8rh3lnac6w8"; }; patchPhase = '' diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix index 34a48bd3053..d7c1f89a786 100644 --- a/pkgs/tools/system/iops/default.nix +++ b/pkgs/tools/system/iops/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1"; src = fetchurl { - url = "http://www.vanheusden.com/iops/${name}.tgz"; + url = "https://www.vanheusden.com/iops/${name}.tgz"; sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz"; }; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index f6e09b6816f..d57b6518975 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "B.${numVersion}"; src = fetchurl { - url = "http://ezix.org/software/files/lshw-${version}.tar.gz"; + url = "https://ezix.org/software/files/lshw-${version}.tar.gz"; sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf"; }; diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix index 4525343dcc1..234aacbbfde 100644 --- a/pkgs/tools/system/psensor/default.nix +++ b/pkgs/tools/system/psensor/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.2.0"; src = fetchurl { - url = "http://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; + url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; sha256 = "1smbidbby4rh14jnh9kn7y64qf486aqnmyxcgacjvkz27cqqnw4r"; }; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index a6999942e0c..81e929382b2 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "rsyslog-8.21.0"; src = fetchurl { - url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; + url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx"; }; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.rsyslog.com/; + homepage = https://www.rsyslog.com/; description = "Enhanced syslog implementation"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 5a4734328ff..1595e8347e1 100644 --- a/pkgs/tools/system/stress/default.nix +++ b/pkgs/tools/system/stress/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "stress-1.0.4"; src = fetchurl { - url = "http://people.seas.harvard.edu/~apw/stress/${name}.tar.gz"; + url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz"; sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5"; }; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index b47f5c98c4d..4f3795cf54c 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.15.1"; + version = "3.16.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "1vzrg6s30wc2as2s42h7a1qvyxqx26nq895r9y75aasfcwlbvnm2"; + sha256 = "0a9snxvs3fsv0gm5q9xkrcg0hwgs3c8q1rb434cnzn4qbqfnzvn7"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index a8c27a42b1d..c30a7b14e89 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "http://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz"; sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd"; }; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index c46f9624155..46fdf29ad46 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://www.colordiff.org/${name}.tar.gz" + "https://www.colordiff.org/${name}.tar.gz" "http://www.colordiff.org/archive/${name}.tar.gz" ]; sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9"; diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index dea8e15b540..7404c887a46 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.04"; src = fetchurl { - url = "http://www.jwz.org/dadadodo/${name}.tar.gz"; + url = "https://www.jwz.org/dadadodo/${name}.tar.gz"; sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if"; }; diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index f1899b42b86..098eee7cf72 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.19"; src = fetchurl { - url = "http://dl.cihar.com/enca/${name}.tar.xz"; + url = "https://dl.cihar.com/enca/${name}.tar.xz"; sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s"; }; diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 47e6766d21f..4ebe62ef9a5 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "mpage-2.5.6"; src = fetchurl { - url = "http://www.libGLU_combined.nl/pub/mpage/${name}.tgz"; + url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; sha256 = "016w9sm06sn1d2lim4p8fzl6wbmad3wigxhflsybzi7p4zy6vrjg"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = "liberal"; # a non-copyleft license, see `Copyright' file - homepage = http://www.libGLU_combined.nl/pub/mpage/; + homepage = http://www.mesa.nl/pub/mpage/; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index 2f09c4dfbe3..8f998e3a26d 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qprint-1.1"; src = fetchurl { - url = "http://www.fourmilab.ch/webtools/qprint/${name}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/qprint/${name}.tar.gz"; sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz"; }; diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index 8db3d4eea2b..8aadbb0b806 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -4,11 +4,11 @@ pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "rst2html5"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1js90asy7s0278b4p28inkkp0r7ajr5fk5pcdgcdw628a30vl3i6"; + sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73"; }; propagatedBuildInputs = with pythonPackages; diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index 9eebb830db1..ccf17695f6c 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "uni2ascii-4.18"; src = fetchurl { - url = "http://billposer.org/Software/Downloads/${name}.tar.gz"; + url = "https://billposer.org/Software/Downloads/${name}.tar.gz"; sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index f681ae62aea..8851b8a2725 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "7.7"; src = fetchurl { - url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; + url = "https://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr"; }; diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix index d1f01ccd867..7fe0396ae44 100644 --- a/pkgs/tools/typesetting/xml2rfc/default.nix +++ b/pkgs/tools/typesetting/xml2rfc/default.nix @@ -4,14 +4,14 @@ with python.pkgs; buildPythonPackage rec { pname = "xml2rfc"; - version = "2.9.6"; + version = "2.9.8"; buildInputs = [ intervaltree lxml requests pyflakes ]; propagatedBuildInputs = [ intervaltree lxml requests six ]; src = fetchPypi { inherit pname version; - sha256 = "1wr161lx6f1b3fq14ddr3y4jl0myrcmqs1s3fzsighvlmqfdihj7"; + sha256 = "b50ce2f98bc431cadbcef0523213497049b78c2829ee81c399976f1e4832afc6"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 5e0c13f9d95..893d4f2aec2 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.timkay.com/aws/; + homepage = https://www.timkay.com/aws/; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index edb3d6add16..674673f260c 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip"; + url = "https://s3.amazonaws.com/ec2-downloads/${name}.zip"; sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias"; }; |