diff options
Diffstat (limited to 'pkgs/tools')
165 files changed, 1540 insertions, 1040 deletions
diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix new file mode 100644 index 000000000000..c8b658d4350e --- /dev/null +++ b/pkgs/tools/X11/xosview2/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, libX11 }: + +stdenv.mkDerivation rec { + name = "xosview2-${version}"; + version = "2.2.2"; + + src = fetchurl { + url = "mirror://sourceforge/xosview/${name}.tar.gz"; + sha256 = "3502e119a5305ff2396f559340132910807351c7d4e375f13b5c338404990406"; + }; + + # The software failed to buid with this enabled; it seemed tests were not implemented + doCheck = false; + + buildInputs = [ libX11 ]; + + meta = with stdenv.lib; { + description = "Lightweight program that gathers information from your operating system and displays it in graphical form"; + longDescription = '' + xosview is a lightweight program that gathers information from your + operating system and displays it in graphical form. It attempts to show + you in a quick glance an overview of how your system resources are being + utilized. + + It can be configured to be nothing more than a small strip showing a + couple of parameters on a desktop task bar. Or it can display dozens of + meters and rolling graphical charts over your entire screen. + + Since xosview renders all graphics with core X11 drawing methods, you can + run it on one machine and display it on another. This works even if your + other host is an operating system not running an X server inside a + virtual machine running on a physically different host. If you can + connect to it on a network, then you can popup an xosview instance and + monitor what is going on. + ''; + homepage = "http://xosview.sourceforge.net/index.html"; + license = licenses.gpl1; + maintainers = [ maintainers.SeanZicari ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 00f28c2c7bab..a3aa7a0aa234 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -11,11 +11,12 @@ with lib; let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { - name = "xpra-2.0.2"; - namePrefix = ""; + name = "xpra-${version}"; + version = "2.1.3"; + src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "09hzgbsj9v5qyh41rbz968ipi7016jk66b60vm6piryna9kbnha3"; + sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm"; }; nativeBuildInputs = [ pkgconfig ]; @@ -50,7 +51,7 @@ in buildPythonApplication rec { preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" - substituteInPlace xpra/server/auth/pam.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so" + substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so" ''; setupPyBuildFlags = ["--with-Xdummy" "--without-strict"]; @@ -74,6 +75,8 @@ in buildPythonApplication rec { meta = { homepage = http://xpra.org/; + downloadPage = "https://xpra.org/src/"; + downloadURLRegexp = "xpra-.*[.]tar[.]xz$"; description = "Persistent remote applications for X"; platforms = platforms.linux; maintainers = with maintainers; [ tstrobel offline ]; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 92f1827156b6..629c10f867fa 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -3,15 +3,15 @@ , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp -, libfakeXinerama }: +, libfakeXinerama, pam }: buildPythonApplication rec { - name = "xpra-0.16.2"; - namePrefix = ""; + name = "xpra-${version}"; + version = "2.1.3"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "0h55rv46byzv2g8g77bm0a0py8jpz3gbr5fhr5jy9sisyr0vk6ff"; + sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm"; }; patchPhase = '' @@ -31,6 +31,8 @@ buildPythonApplication rec { ffmpeg libvpx x264 libwebp makeWrapper + + pam ]; propagatedBuildInputs = [ @@ -39,6 +41,7 @@ buildPythonApplication rec { preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" + substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so" ''; setupPyBuildFlags = [ "--without-strict" "--with-gtk3" "--without-gtk2" "--with-Xdummy" ]; @@ -67,6 +70,8 @@ buildPythonApplication rec { meta = { homepage = http://xpra.org/; + downloadPage = "https://xpra.org/src/"; + downloadURLRegexp = "xpra-.*[.]tar[.]xz$"; description = "Persistent remote applications for X"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix index dd9c12c831c9..80bd33bc7769 100644 --- a/pkgs/tools/admin/ansible/2.4.nix +++ b/pkgs/tools/admin/ansible/2.4.nix @@ -6,12 +6,12 @@ pythonPackages.buildPythonPackage rec { pname = "ansible"; - version = "2.4.0.0"; + version = "2.4.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "0xkwnx817rygb1922gncv9ivgvb7hjg8g53r39hfdm3jgzp6y9qs"; + sha256 = "0spv0kjaicwss4q52s727b6grdizcxpa0bbsfg26pgf5kjrayqfs"; }; prePatch = '' diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix new file mode 100644 index 000000000000..6eee98269481 --- /dev/null +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, awscli +, prompt_toolkit +, boto3 +, configobj +, pygments +}: + +buildPythonPackage rec { + pname = "aws-shell"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; + }; + + # Why does it propagate packages that are used for testing? + propagatedBuildInputs = [ + awscli + prompt_toolkit + boto3 + configobj + pygments + ]; + + #Checks are failing due to missing TTY, which won't exist. + doCheck = false; + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/awslabs/aws-shell; + description = "An integrated shell for working with the AWS CLI"; + license = licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix new file mode 100644 index 000000000000..8061cbfded80 --- /dev/null +++ b/pkgs/tools/admin/awscli/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, botocore +, bcdoc +, s3transfer +, six +, colorama +, docutils +, rsa +, pyyaml +, groff +, less +}: + +let + colorama_3_7 = colorama.overrideAttrs (old: rec { + name = "${pname}-${version}"; + pname = "colorama"; + version = "0.3.7"; + src = fetchPypi { + inherit pname version; + sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; + }; + }); + +in buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "awscli"; + version = "1.11.185"; + namePrefix = ""; + + src = fetchPypi { + inherit pname version; + sha256 = "18rskl6sla456z4hkq2gmmm03fqc4rqw5pfiqdyc7a2v9kljv4ah"; + }; + + # No tests included + doCheck = false; + + propagatedBuildInputs = [ + botocore + bcdoc + s3transfer + six + colorama_3_7 + docutils + rsa + pyyaml + groff + less + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli + mkdir -p $out/share/zsh/site-functions + mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + rm $out/bin/aws.cmd + ''; + + meta = with stdenv.lib; { + homepage = https://aws.amazon.com/cli/; + description = "Unified tool to manage your AWS services"; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ muflax ]; + }; +} diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index bda3cb83cf7e..4ccdbc204f0a 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bubblewrap-${version}"; - version = "0.1.8"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1gyy7paqwdrfgxamxya991588ryj9q9c3rhdh31qldqyh9qpy72c"; + sha256 = "0ahw30ngpclk3ssa81cb7ydc6a4xc5dpqn6kmxfpc9xr30vimdnc"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 93cf658719c3..30c75f19fbf8 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.62.1) + fastlane (2.63.0) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 8e75f76ec351..8dd51a5733e6 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -137,10 +137,10 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6ci3rkrzsdk8cbxidzcjv94hbwq7ljwvm5whgxb8lcxcfl696k"; + sha256 = "1al75bb3zq0y9r1ilrbhks198zmvwykmqnn2675jd9i2ijcbxv78"; type = "gem"; }; - version = "2.62.1"; + version = "2.63.0"; }; gh_inspector = { source = { diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index f1165f6172b2..3622b981cc4f 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -5,27 +5,28 @@ let pythonInputs = [ cffi cryptography pyopenssl crcmod google-compute-engine ]; pythonPath = lib.makeSearchPath python.sitePackages pythonInputs; + sources = name: system: { + i686-linux = { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; + sha256 = "0aq938s1w9mzj60avmcc68kgll54pl7635vl2mi89f6r56n0xslp"; + }; + + x86_64-darwin = { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; + sha256 = "13k2i1svry9q800s1jgf8jss0rzfxwk6qci3hsy1wrb9b2mwlz5g"; + }; + + x86_64-linux = { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; + sha256 = "1kvaz8p1iflsi85wwi7lb6km6frj70xsricyz1ah0sw3q71zyqmc"; + }; + }.${system}; + in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "171.0.0"; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "0scp9nhd46mrnd02bw7skm5fa04i7azf68g08js8kawvjgbwq0sb"; - } - else if stdenv.system == "x86_64-darwin" then - fetchurl { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; - sha256 = "0xvrqsg0vqws9n20lvipxilb45aln5p9iy0ldjfxx8vvi0s42298"; - } - else - fetchurl { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "0b9rqhwd30hn5l82a2x10rz86jz1j03b19di7bc3bqn4x041qii5"; - }; + version = "177.0.0"; + src = fetchurl (sources name stdenv.system); buildInputs = [ python makeWrapper ]; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index a257ece48773..1c8d8367793a 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, gtk2, pkgconfig, intltool }: +{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }: stdenv.mkDerivation rec { - version = "0.5.4.7"; + version = "0.5.4.12"; name = "xarchiver-${version}"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; - rev = "${name}"; - sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4"; + rev = "${version}"; + sha256 = "13d8slcx3frz0dhl1w4llj7001n57cjjb8r7dlaw5qacaas3xfwi"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 intltool ]; + buildInputs = [ gtk3 intltool libxslt ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix new file mode 100644 index 000000000000..70ae1f846430 --- /dev/null +++ b/pkgs/tools/audio/mpdas/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }: + +stdenv.mkDerivation rec { + name = "mpdas-${version}"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "hrkfdn"; + repo = "mpdas"; + rev = version; + sha256 = "1i6i36jd582y3nm5plcrswqljf528hd23whp8zw06hwqnsgca5b6"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ mpd_clientlib curl ]; + + makeFlags = [ "CONFIG=/etc" "DESTDIR=" "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Music Player Daemon AudioScrobbler"; + homepage = http://50hz.ws/mpdas/; + license = licenses.bsd3; + maintainers = [ maintainers.taketwo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 54756a29cd6d..681999e35d07 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "partclone-${version}"; - version = "0.2.89"; + version = "0.3.11"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "0gw47pchqshhm00yf34qgxh6bh2jfryv0sm7ghwn77bv5gzwr481"; + sha256 = "0bv15i0gxym4dv48rgaavh8p94waryn1l6viis6qh5zm9cd08skg"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch new file mode 100644 index 000000000000..f78bb7178af2 --- /dev/null +++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch @@ -0,0 +1,25 @@ +--- a/bchunk.c 2017-10-30 18:03:58.658741629 +0000 ++++ b/bchunk.c 2017-10-30 19:40:25.558131619 +0000 +@@ -18,6 +18,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#define _GNU_SOURCE + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -271,11 +272,10 @@ + int16_t i; + float fl; + +- if (!(fname = malloc(strlen(bname) + 8))) { +- fprintf(stderr, "main(): malloc() failed, out of memory\n"); ++ if (asprintf(&fname, "%s%2.2d.%s", bname, track->num, track->extension) == -1) { ++ fprintf(stderr, "writetrack(): asprintf() failed, out of memory\n"); + exit(4); + } +- sprintf(fname, "%s%2.2d.%s", bname, track->num, track->extension); + + printf("%2d: %s ", track->num, fname); + + diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch new file mode 100644 index 000000000000..80930ac69bc3 --- /dev/null +++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch @@ -0,0 +1,33 @@ +diff -urNZ bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c +--- a/bchunk.c 2017-10-30 18:03:58.658741629 +0000 ++++ b/bchunk.c 2017-10-30 19:17:36.732855884 +0000 +@@ -426,11 +426,11 @@ + printf("\nTrack "); + if (!(p = strchr(p, ' '))) { + fprintf(stderr, "... ouch, no space after TRACK.\n"); +- continue; ++ exit(3); + } + p++; + if (!(t = strchr(p, ' '))) { + fprintf(stderr, "... ouch, no space after track number.\n"); +- continue; ++ exit(3); + } + *t = '\0'; + +@@ -460,12 +460,12 @@ + } else if ((p = strstr(s, "INDEX"))) { + if (!(p = strchr(p, ' '))) { + printf("... ouch, no space after INDEX.\n"); +- continue; ++ exit(3); + } + p++; + if (!(t = strchr(p, ' '))) { + printf("... ouch, no space after index number.\n"); +- continue; ++ exit(3); + } + *t = '\0'; + t++; \ No newline at end of file diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index 4b8510773a3d..ea4046f31f8c 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -8,20 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0pcbyx3689cbl23dcij497hb3q5f1wmki7cxic5nzldx71g9vp5g"; }; - preConfigure = - '' - substituteInPlace Makefile \ - --replace "-o root -g root" "" \ - --replace "-o bin -g bin" "" - ''; + patches = [ ./CVE-2017-15953.patch ./CVE-2017-15955.patch ]; - makeFlags = "PREFIX=$(out) MAN_DIR=$(out)/share/man"; + installPhase = '' + install -Dt $out/bin bchunk + install -Dt $out/share/man/man1 bchunk.1 + ''; - preInstall = "mkdir -p $out/bin $out/share/man/man1"; - - meta = { + meta = with stdenv.lib; { homepage = http://he.fi/bchunk/; - description = "A program that converts CD-ROM images in BIN/CUE format into a set of ISO and CDR tracks"; - platforms = stdenv.lib.platforms.linux; + description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 3b8040e2b917..25d94593f5ef 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lame, libvorbis, libmad, pkgconfig, libao}: +{stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: stdenv.mkDerivation { name = "cdrdao-1.2.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { makeFlags = "RM=rm LN=ln MV=mv"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lame libvorbis libmad libao ]; + buildInputs = [ libvorbis libmad libao ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 7cec791ecc5a..7d0fc5969bf2 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; meta = { - homepage = http://sourceforge.net/projects/lsdvd/; + homepage = https://sourceforge.net/projects/lsdvd/; shortDescription = "Display information about audio, video, and subtitle tracks on a DVD"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 4d6ddd546dbc..7deac71f1512 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -3,16 +3,18 @@ stdenv.mkDerivation rec { name = "unetbootin-${version}"; - version = "655"; + version = "657"; src = fetchFromGitHub { owner = "unetbootin"; repo = "unetbootin"; rev = version; - sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py"; + sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy"; }; - sourceRoot = "${name}-src/src/unetbootin"; + setSourceRoot = '' + sourceRoot=$(echo */src/unetbootin) + ''; buildInputs = [ qt4 ]; nativeBuildInputs = [ makeWrapper qmake4Hook ]; @@ -42,18 +44,17 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp unetbootin $out/bin - - mkdir -p $out/share/unetbootin - cp unetbootin_*.qm $out/share/unetbootin + runHook preInstall - mkdir -p $out/share/applications - cp unetbootin.desktop $out/share/applications + install -Dm755 -t $out/bin unetbootin + install -Dm644 -t $out/share/unetbootin unetbootin_*.qm + install -Dm644 -t $out/share/applications unetbootin.desktop wrapProgram $out/bin/unetbootin \ --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \ --set QT_X11_NO_MITSHM 1 + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 4b2f0276d78c..bc8666a26907 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. ''; - homepage = https://code.google.com/p/lz4/; + homepage = https://lz4.github.io/lz4/; license = with licenses; [ bsd2 gpl2Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 2737966b83e5..ad1b80410419 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bzip2}: +{stdenv, fetchurl, fetchpatch, bzip2}: stdenv.mkDerivation { name = "rzip-2.1"; @@ -8,6 +8,14 @@ stdenv.mkDerivation { }; buildInputs = [ bzip2 ]; + patches = [ + (fetchpatch { + name = "CVE-2017-8364-fill-buffer.patch"; + url = https://sources.debian.net/data/main/r/rzip/2.1-4.1/debian/patches/80-CVE-2017-8364-fill-buffer.patch; + sha256 = "0jcjlx9ksdvxvjyxmyzscx9ar9992iy5icw0sc3n0p09qi4d6x1r"; + }) + ]; + meta = { homepage = http://rzip.samba.org/; description = "Compression program"; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 2be3bf167dad..aad9421305eb 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { - sha256 = "1rnxfhcmg8zsagyf70hiwm32mam60hq58pzgy7jn8c3iwv24mpz5"; + sha256 = "1hwh6pw1z3y5kpwcwxrk8cwc83anigiqhy3z06ywy1jll8im57pz"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix index 5cf88e68c64b..b723c107936c 100644 --- a/pkgs/tools/compression/zstdmt/default.nix +++ b/pkgs/tools/compression/zstdmt/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { owner = "mcmilk"; }; - sourceRoot = "zstdmt-v${version}-src/unix"; + setSourceRoot = '' + sourceRoot=$(echo */unix) + ''; buildInputs = [ zstd lz4 diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index c75cc45170af..5ad54adc08ad 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "9pfs"; src = fetchFromGitHub { - owner = "spewspew"; + owner = "mischief"; repo = "9pfs"; rev = "7f4ca4cd750d650c1215b92ac3cc2a28041960e4"; sha256 = "007s2idsn6bspmfxv1qabj39ggkgvn6gwdbhczwn04lb4c6gh3xc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://github.com/spewspew/9pfs; + #homepage = https://github.com/spewspew/9pfs; # the account apparently doesn't exist description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index ce44d7d6d4ed..0551198cded3 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "disorderfs-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz"; - sha256 = "0nnxk0qqww16ra52mi5giw50zpssvan62nkig5dcxvgcvv51akik"; + url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2"; + sha256 = "0jdadb1ppd5qrnngpjv14az32gwslag2wwv1k8rs29iqlfy38cjf"; }; - sourceRoot = "."; - nativeBuildInputs = [ pkgconfig asciidoc ]; buildInputs = [ fuse attr ]; diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index f20f9aa2bab1..f929f354766c 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "The FAT16/FAT32 non-destructive resizer"; - homepage = http://sourceforge.net/projects/fatresize; + homepage = https://sourceforge.net/projects/fatresize; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 3ca468513063..8a417cfe397d 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://sourceforge.net/projects/fuseiso; + homepage = https://sourceforge.net/projects/fuseiso; description = "FUSE module to mount ISO filesystem images"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/glusterfs/default.upstream b/pkgs/tools/filesystems/glusterfs/default.upstream deleted file mode 100644 index 29494eab87b9..000000000000 --- a/pkgs/tools/filesystems/glusterfs/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -url http://download.gluster.org/pub/gluster/glusterfs/ -version_link '/[0-9.]+/$' -version_link '/[0-9.]+/$' -version_link 'glusterfs-[0-9.]+[.]tar[.]' -minimize_overwrite diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index 6d2b073d8696..ac1a7c1c1485 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://code.google.com/p/mtpfs/; + homepage = https://github.com/cjd/mtpfs; description = "FUSE Filesystem providing access to MTP devices"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 445e724e1a2a..33b473df5a22 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,21 +1,28 @@ -{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl, acl, ed, glibc }: +{ fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python +, db, libgcrypt, avahi, libiconv, pam, openssl, acl +, ed, glibc +}: stdenv.mkDerivation rec{ - name = "netatalk-3.1.7"; + name = "netatalk-3.1.11"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; - sha256 = "0wf09fyqzza024qr1s26z5x7rsvh9zb4pv598gw7gm77wjcr6174"; + sha256 = "3434472ba96d3bbe3b024274438daad83b784ced720f7662a4c1d0a1078799a6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ]; + patches = [ + ./no-suid.patch + ./omitLocalstatedirCreation.patch + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig perl python python.pkgs.wrapPython ]; - patches = ./omitLocalstatedirCreation.patch; + buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ]; configureFlags = [ "--with-bdb=${db}" - "--with-openssl=${openssl.dev}" + "--with-ssl-dir=${openssl.dev}" "--with-lockfile=/run/lock/netatalk" "--localstatedir=/var/lib" ]; @@ -36,6 +43,11 @@ stdenv.mkDerivation rec{ EOF ''; + postInstall = '' + buildPythonPath ${python.pkgs.dbus-python} + patchPythonScript $out/bin/afpstats + ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/tools/filesystems/netatalk/no-suid.patch b/pkgs/tools/filesystems/netatalk/no-suid.patch new file mode 100644 index 000000000000..194c1f5fac9f --- /dev/null +++ b/pkgs/tools/filesystems/netatalk/no-suid.patch @@ -0,0 +1,11 @@ +diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am +index 578eac1..d17aa22 100644 +--- a/bin/afppasswd/Makefile.am ++++ b/bin/afppasswd/Makefile.am +@@ -16,5 +16,5 @@ AM_CFLAGS = @SSL_CFLAGS@ -I$(top_srcdir)/sys \ + + install-exec-hook: + if HAVE_OPENSSL +- chmod u+s $(DESTDIR)$(bindir)/afppasswd ++# chmod u+s $(DESTDIR)$(bindir)/afppasswd + endif diff --git a/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch b/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch index d1a9dcb0b3bf..01c4ee9ba478 100644 --- a/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch +++ b/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch @@ -1,35 +1,19 @@ -diff -ur netatalk-3.1.7-old/config/Makefile.in netatalk-3.1.7-new/config/Makefile.in ---- netatalk-3.1.7-old/config/Makefile.in 2014-08-29 03:33:35.000000000 -0700 -+++ netatalk-3.1.7-new/config/Makefile.in 2015-08-13 20:52:35.000000000 -0700 -@@ -699,7 +699,7 @@ - - info-am: - --install-data-am: install-data-local install-dbusserviceDATA -+install-data-am: install-dbusserviceDATA - - install-dvi: install-dvi-recursive - -@@ -754,7 +754,7 @@ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ -- install-am install-data install-data-am install-data-local \ -+ install-am install-data install-data-am \ - install-dbusserviceDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ -@@ -782,12 +782,6 @@ - # install configuration files +diff --git a/config/Makefile.am b/config/Makefile.am +index c98a2ab..58b7f0a 100644 +--- a/config/Makefile.am ++++ b/config/Makefile.am +@@ -36,10 +36,10 @@ endif # --install-data-local: install-config-files + install-data-local: install-config-files - mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/ - mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/ - $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/ - $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/ -- ++# mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/ ++# mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/ ++# $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/ ++# $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/ + uninstall-local: @for f in $(CONFFILES) $(GENFILES); do \ - echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \ - diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 80a0d566edcb..977add39b94b 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libuuid, libselinux }: let sourceInfo = rec { - version = "2.2.6"; + version = "2.2.7"; url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; - sha256 = "1rjj6pv7yx5wm7b3w6hv88v6r53jqaam5nrnkw2and4ifhsprf3y"; + sha256 = "01f09bvjk2crx65pxmxiw362wkkl3v2v144dfn3i7bk5gz253xic"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; }; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 853654c0f790..b421a768b3dc 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "rdfind-${version}"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "http://rdfind.pauldreik.se/${name}.tar.gz"; - sha256 = "0zfc5whh6j5xfbxr6wvznk62qs1mkd3r7jcq72wjgnck43vv7w55"; + url = "https://rdfind.pauldreik.se/${name}.tar.gz"; + sha256 = "0i63f2lwwkiq5m8shi3wwi59i1s25r6dx6flsgqxs1jvlcg0lvn3"; }; buildInputs = [ nettle ]; - meta = { - homepage = http://rdfind.pauldreik.se/; + meta = with stdenv.lib; { + homepage = https://rdfind.pauldreik.se/; description = "Removes or hardlinks duplicate files very swiftly"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ wmertens ]; - platforms = with stdenv.lib.platforms; all; + maintainers = [ maintainers.wmertens ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index cc31a6680597..b39be214d89f 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/s3backer/; + homepage = https://github.com/archiecobbs/s3backer; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index fc504b3208de..7ff42c4d1f99 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; inherit version; - homepage = http://sourceforge.net/projects/smbnetfs/; + homepage = https://sourceforge.net/projects/smbnetfs/; }; } diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index c9f605ca69f0..597be1b0f42f 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "13v0gz22ng09gs87f7900z2sk2hg5543njl32rfn4cxxp0jncs3r"; + sha256 = "1vgyiagn6qvyyz4jkf8pzlg0w9apb6mzza97a9x03p82fav2afx0"; }; doCheck = true; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 7d251d2e00d0..eebe3076c98a 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -4,7 +4,6 @@ let inherit (stdenv.lib) optional; - rpath = stdenv.lib.makeLibraryPath [ fuse3 glib ]; in stdenv.mkDerivation rec { version = "3.3.1"; name = "sshfs-fuse-${version}"; @@ -30,10 +29,6 @@ in stdenv.mkDerivation rec { ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ''; - postFixup = '' - patchelf --set-rpath '${rpath}' "$out/bin/sshfs" - ''; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH"; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 7e639940d07e..0a48e947a48e 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + rm cuneiform_src/Kern/hhh/tigerh/h/strings.h + ''; + buildInputs = [ imagemagick ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 4404a8b6440c..7c5f9eaf5de6 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gifsicle-${version}"; - version = "1.88"; + version = "1.90"; src = fetchurl { url = "http://www.lcdf.org/gifsicle/${name}.tar.gz"; - sha256 = "4585d2e683d7f68eb8fcb15504732d71d7ede48ab5963e61915201f9e68305be"; + sha256 = "0kc35g99fygzjj7qjcy87rdb8mbgmacr2mga9ihgln1dfnbb0wrd"; }; buildInputs = optional gifview [ xproto libXt libX11 ]; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 10170b41bbe4..7594474538d0 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.0"; + name = "gnuplot-5.2.1"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "0hqyajcnlk822fk7hyl07sqk6a75n93awbdl3ydk9fd6l4jn9zkx"; + sha256 = "123yh0ysahn71nlibsz5qkq18rlf18qqfhrlkvl925ijdgxv1ikx"; }; buildInputs = diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index abebc0fc4ca6..2f18857b2a16 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { glm freetype ]; meta = with stdenv.lib; { - homepage = http://code.google.com/p/logstalgia; + homepage = http://logstalgia.io/; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index e6773e42304b..d3a8d19dfe29 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Little CMS ICC profile construction set"; - homepage = http://sourceforge.net/projects/lprof; + homepage = https://sourceforge.net/projects/lprof; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 5e4fd3ff0624..49bd74ea412f 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -2,23 +2,21 @@ let debPatch = fetchzip { - url = mirror://debian/pool/main/s/scrot/scrot_0.8-17.debian.tar.xz; - sha256 = "0ydsr3vah5wkcbnp91knkdbil4hx0cn0iy57frl03azqzc29bkw5"; + url = mirror://debian/pool/main/s/scrot/scrot_0.8-18.debian.tar.xz; + sha256 = "1m8m8ad0idf3nzw0k57f6rfbw8n7dza69a7iikriqgbrpyvxqybx"; }; in stdenv.mkDerivation rec { - name = "scrot-0.8-17"; + name = "scrot-0.8-18"; src = fetchurl { url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; }; - inherit debPatch; - postPatch = '' - for patch in $(cat $debPatch/patches/series); do - patch -p1 < "$debPatch/patches/$patch" + for patch in $(cat ${debPatch}/patches/series); do + patch -p1 < "${debPatch}/patches/$patch" done ''; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 596b3ce15652..170ac4c6a26f 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -33,7 +33,7 @@ in clangStdenv.mkDerivation rec { ''; patch_version = "2.18.2612.102.1"; - patches = [ + patches = [ (fetchpatch rec { name = "fcitx-mozc-${patch_version}.patch"; url = "https://download.fcitx-im.org/fcitx-mozc/${name}"; @@ -43,7 +43,7 @@ in clangStdenv.mkDerivation rec { postPatch = '' substituteInPlace src/unix/fcitx/mozc.conf \ - --replace "/usr/share/fcitx/mozc/icon/mozc.png" "mozc" + --replace "/usr/share/fcitx/mozc/icon/mozc.png" "mozc" ''; configurePhase = '' @@ -91,7 +91,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isFcitxEngine = true; description = "Fcitx engine for Google japanese input method"; - homepage = http://code.google.com/p/mozc/; + homepage = https://github.com/google/mozc; downloadPage = "http://download.fcitx-im.org/fcitx-mozc/"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 2e32075992c9..fd924cdd2a2b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -15,7 +15,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isIbusEngine = true; description = "Japanese input method from Google"; - homepage = http://code.google.com/p/mozc/; + homepage = https://github.com/google/mozc; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 69ac0ad3ef68..3fd29d65f369 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -10,11 +10,11 @@ let srcs = { data = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt"; - sha256 = "0zfn3z61xy76yah3d24dd745qjssrib009m4nvqpnx4sf1r13i2x"; + sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf"; }; sequences = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt"; - sha256 = "0xzk7hi2a8macx9s5gj2pb36d38y8fa9001sj71g6kw25c2h94cn"; + sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1"; }; variation-sequences = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt"; @@ -22,11 +22,11 @@ let }; zwj-sequences = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt"; - sha256 = "0rrnk94mhm3k9vs74pvyvs4ir7f31f1libx7c196fmdqvp1qfafw"; + sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q"; }; test = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt"; - sha256 = "1dvxw5xp1xiy13c1p1c7l2xc9q8f8znk47kb7q8g7bbgbi21cq5m"; + sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw"; }; }; in stdenv.mkDerivation { diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 7ca5af555f96..b93c59d9789b 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nabi-1.0.0"; src = fetchurl { - url = "http://nabi.googlecode.com/files/nabi-1.0.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-1.0.0.tar.gz"; sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Easy Hangul XIM"; - homepage = https://code.google.com/p/nabi; + homepage = https://github.com/choehwanjin/nabi; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index b32d0c78a1b7..bdcbc939a07b 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "touchegg-${version}"; version = "1.1.1"; src = fetchurl { - url = "https://touchegg.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${name}.tar.gz"; sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://code.google.com/p/touchegg/; + homepage = https://github.com/JoseExposito/touchegg; description = "Macro binding for touch surfaces"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 9af5de0476a7..3f37c1a2ab0c 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; src = fetchurl { - url = "http://uim.googlecode.com/files/uim-${version}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/uim/uim-${version}.tar.bz2"; sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777"; }; meta = with stdenv.lib; { - homepage = "http://code.google.com/p/uim/"; + homepage = "https://github.com/uim/uim"; description = "A multilingual input method framework"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix index 18e6176b706d..60f3a0feb55b 100644 --- a/pkgs/tools/inputmethods/zinnia/default.nix +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"; }; - setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)"; + setSourceRoot = '' + sourceRoot=$(echo */zinnia) + ''; meta = with stdenv.lib; { description = "Online hand recognition system with machine learning"; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index bf1377419a5c..b8b01a7c0fc7 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.158"; + version = "1.170"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "12zaj7hi5gzdh9r7rcyqnkwik1ljw1qzj6j7rw80bgw6fn611rs9"; + sha256 = "0xh743cr21qk8cmc6ijp59d61dqra4ggdlgbin9v991xqa0mqdxb"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 67faf925a278..be1df0510d7b 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { }; meta = { - homepage = http://github.com/bepasty/bepasty-server; + homepage = https://github.com/bepasty/bepasty-server; description = "Binary pastebin server"; license = lib.licenses.mit; maintainers = [ lib.maintainers.makefu ]; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 65a5b718e5f4..eaa2c6e4942f 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bibliography format interconversion"; longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters."; - homepage = http://sourceforge.net/p/bibutils/home/Bibutils/; + homepage = https://sourceforge.net/p/bibutils/home/Bibutils/; license = licenses.gpl2; maintainers = [ maintainers.garrison ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 534e3d950d36..a1c04f06d144 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b"; }; - sourceRoot = "cloc-${version}-src/Unix"; + setSourceRoot = '' + sourceRoot=$(echo */Unix) + ''; buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ]; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 40ea672296d8..020599e17a81 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,51 +1,44 @@ { stdenv, fetchurl, bash-completion -, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus -, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook +, glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus +, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 , libgudev, sane-backends }: stdenv.mkDerivation rec { - name = "colord-1.2.12"; + name = "colord-1.4.1"; src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; + sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib"; }; enableParallelBuilding = true; - # Version mismatch requires intltoolize to overwrite - # with newer version. - preConfigure = '' - intltoolize --force - ''; - - configureFlags = [ - "--enable-sane" - "--with-udevrulesdir=$(out)/lib/udev/rules.d" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + mesonFlags = [ + "-Denable-sane=true" + "-Denable-vala=true" "--localstatedir=/var" - "--disable-bash-completion" + "-Denable-bash-completion=true" + # TODO: man page cannot be build with docbook2x + "-Denable-man=false" + "-Denable-docs=false" ]; + patches = [ + ./fix-build-paths.patch + ]; - # don't touch /var at install time, colord creates what it needs at runtime - postPatch = '' - sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} - ''; - - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ]; - buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ]; postInstall = '' - mkdir -p $out/etc/bash_completion.d - cp -v data/colormgr $out/etc/bash_completion.d + glib-compile-schemas $out/share/glib-2.0/schemas ''; meta = { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; - homepage = http://www.freedesktop.org/software/colord/intro.html; + homepage = https://www.freedesktop.org/software/colord/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch new file mode 100644 index 000000000000..7eb66a0b34be --- /dev/null +++ b/pkgs/tools/misc/colord/fix-build-paths.patch @@ -0,0 +1,56 @@ +--- a/contrib/session-helper/meson.build ++++ b/contrib/session-helper/meson.build +@@ -21,7 +21,7 @@ + output : 'colord-session.service', + configuration : con2, + install: true, +- install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'), + ) + endif + +--- a/data/meson.build ++++ b/data/meson.build +@@ -8,13 +8,13 @@ + + if get_option('enable-systemd') + install_data('colord.conf', +- install_dir: systemd.get_pkgconfig_variable('tmpfilesdir') ++ install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d') + ) + endif + + if get_option('enable-bash-completion') + install_data('colormgr', +- install_dir: bash_completion.get_pkgconfig_variable('completionsdir') ++ install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d') + ) + endif + +@@ -31,7 +31,7 @@ + output : 'colord.service', + configuration : con2, + install: true, +- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'), + ) + endif + +--- a/meson.build ++++ b/meson.build +@@ -258,6 +258,3 @@ + subdir('policy') + subdir('rules') + subdir('src') +- +-meson.add_install_script('meson_post_install.sh', +- localstatedir, get_option('with-daemon-user')) +--- a/rules/meson.build ++++ b/rules/meson.build +@@ -9,5 +9,5 @@ + sensor_rules_in, + '95-cd-devices.rules', + ], +- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') ++ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') + ) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index c45c85e4271d..53755c8a19d2 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1hcdg54xyb1pfl03iqll14y9yglwmyvxyvhbql87hd9q0dywah6m"; + sha256 = "1w9bkrlxlgc58rpf03xfd2qbkj73rlbiqrhy8nhwxqqhsj1kkdb0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index e70efe6c4f11..a65862a78451 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.87"; + version = "1.0.92"; 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 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374"; + sha256 = "06gp6ivmfh0ks4mibx1mz0pwzjyxqas319s741pp9b3k091jkip1"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 2ea29196ed66..3fd5bb7daa61 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "86"; + version = "87"; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "0jj3gn7pw7him12bxf0wbs6wkz32ydv909v5gi681p0dyzajd0zr"; + sha256 = "0j3pljwmggrpaghbamvr24x4cg5yj7hl2ll27405p7970scnpngv"; }; patches = [ diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index ae6ea6e3f538..85672619d61c 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "4.11"; + version = "4.13"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "1cp132kk2xd2cwn1ysjv0cl8i9lnq3n4zi4wy676p5k4h2mfvn0j"; + sha256 = "1flwz4x76ajxigadq9knxgwr778g03y3qfx6c7rflc3x020a7hdp"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 8937de88c38d..82b3a1d963d4 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "0.14.3"; + version = "0.16.1"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "15sjpxw1llpipshriivpha6470lkvhcgs5wh5mlaabjbvrgxygqh"; + sha256 = "1hphgpwxzdbfswzxbx0jm7lma1xkkwxvm8ll3jp2ljmimqzzb7jf"; }; doCheck = true; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index e0367dc915d3..830f9cb878be 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.17.0-2"; + version = "0.17.1"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0j4m3xf6qxfymfq6y5ml5rgz2rr1glh54k3b5xa9zi4cl5wg43qv"; + sha256 = "0zxav6kfifppj49kif8917djq1vqjznqzmviqj4iiar8jmyrn2fy"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix new file mode 100644 index 000000000000..588511638bea --- /dev/null +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -0,0 +1,58 @@ +{ fetchzip +, libX11 +, mesa +, makeWrapper +, stdenv +}: + +let + + libPath = stdenv.lib.makeLibraryPath [ + mesa + stdenv.cc.cc + libX11 + ]; + + inidir = "\\\${XDG_CONFIG_HOME:-\\$HOME/.config}/kisslicer"; + +in + +stdenv.mkDerivation rec { + name = "kisslicer-1.6.2"; + + src = fetchzip { + url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.2_release.zip"; + sha256 = "0fb7hzic78skq3ykc37srnjsw0yri7m0pb3arlz076ws7jrcbr0f"; + stripRoot = false; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + buildInputs = [ + makeWrapper + mesa + libX11 + ]; + + installPhase = '' + mkdir -p $out/bin + cp -p * $out/bin + ''; + + fixupPhase = '' + chmod 755 $out/bin/KISSlicer + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath} $out/bin/KISSlicer + wrapProgram $out/bin/KISSlicer \ + --add-flags "-inidir ${inidir}" \ + --run "mkdir -p ${inidir}" + ''; + + meta = with stdenv.lib; { + description = "Convert STL files into Gcode"; + homepage = http://www.kisslicer.com; + license = licenses.unfree; + maintainers = [ maintainers.cransom ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b10b7891e5d1..f8b687a5c8ba 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2017-09-06"; + version = "2017-10-30"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "ae4a29e5501f805fadb115658e83df6744a258b2"; # nightly - sha256 = "099ckbnyk08a716fc5qz7yldalb1p9gn2zn8kqp7bp4adi541hid"; + rev = "3f7bd0a62d1a243562e182d9051ebb54f3414aaa"; # nightly + sha256 = "0g6wf4j3dfy3yfkby3wlqajryv4kffqvhljq2q0x482fsrl4vipz"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 5b014d18dc1c..91a0c368d5f9 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "4ed959e0540971545eddb8c75514973d670cf739"; # master - sha256 = "1vx64i1mg660if3wwm81p4b7lzxfb3qbr39i7misdyld3fc486p9"; + rev = "10cefba34bc5e7a6e5df0836a42513c28a10e074"; # master + sha256 = "05jy6dpva2a1xfsv3yajavbx41gx8hhh5k3k901dnk0118hnyd0w"; }; } { diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix new file mode 100644 index 000000000000..930fd1e5d3ec --- /dev/null +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, unzip, fpc, lazarus }: + +let + date = "07.apr.2016"; + +in stdenv.mkDerivation rec { + name = "mht2mht-${version}"; + version = "1.8.1.35"; + + src = fetchurl { + # there is a disconnect between the directory name date and file name date + # you should verify if that is still then case when the next version is released + url = "mirror://sourceforge/mht2htm/mht2htm/1.8.1%20%2805.apr.2016%29/mht2htmcl-${version}_${date}.source.zip"; + sha256 = "16r6zkihp84yqllp2hyaf0nvymdn9ji3g30mc5scfwycdfanja6f"; + }; + + sourceRoot = "."; + + buildInputs = [ fpc lazarus ]; + + nativeBuildInputs = [ unzip ]; + + buildPhase = '' + runHook preBuild + lazbuild --lazarusdir=${lazarus}/share/lazarus mht2htmcl.lpi + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin mht2htmcl + install -Dm644 -t $out/share/doc/mht2htm CHANGELOG COPYING README + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Convert .mht files to .html"; + homepage = http://pgm.bpalanka.com/mht2htm.html; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index c309c8229747..1cb71ce9dd67 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ncurses disk usage analyzer"; - homepage = http://dev.yorhel.nl/ncdu; + homepage = https://dev.yorhel.nl/ncdu; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 82abb5c9bbcf..a8332ad494da 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse -, libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 +, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 }: let libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6"; - sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs"; + rev = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08"; + sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr"; }; bsdiff-src = fetchFromGitHub { owner = "mendsley"; repo = "bsdiff"; - rev = "7d70d8f4ff48345bc76e314c9d98da91f78873fa"; - sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws"; + rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; + sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; - version = "2017.9"; + version = "2017.12"; in stdenv.mkDerivation { name = "ostree-${version}"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3"; + sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68"; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { libxslt docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ]; + buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ]; prePatch = '' rmdir libglnx bsdiff @@ -50,7 +50,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Git for operating system binaries"; - homepage = "http://live.gnome.org/OSTree/"; + homepage = https://ostree.readthedocs.io/en/latest/; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 86750518bb5a..9da2ebc07fc0 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: +let inherit (stdenv.lib) getDev; in + stdenv.mkDerivation rec { name = "qt5ct-${version}"; version = "0.33"; @@ -14,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg ]; + qmakeFlags = [ ''LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease'' ]; + preConfigure = '' qmakeFlags="$qmakeFlags PLUGINDIR=$out/$qtPluginPrefix" ''; diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix index 9ba138bf0e9d..a13f7160aa69 100644 --- a/pkgs/tools/misc/quota/default.nix +++ b/pkgs/tools/misc/quota/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to manage kernel-level quotas in Linux"; - homepage = http://sourceforge.net/projects/linuxquota/; + homepage = https://sourceforge.net/projects/linuxquota/; license = licenses.gpl2; # With some files being BSD as an exception platforms = platforms.linux; maintainers = [ maintainers.dezgeg ]; diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index 5c56f9accfc1..ff606c6b72bb 100644 --- a/pkgs/tools/misc/rkflashtool/default.nix +++ b/pkgs/tools/misc/rkflashtool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://sourceforge.net/projects/rkflashtool/; + homepage = https://sourceforge.net/projects/rkflashtool/; description = "Tools for flashing Rockchip devices"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index 86d81fd25856..bd60e786036f 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "rlwrap-0.42"; + name = "rlwrap-${version}"; + version = "0.43"; src = fetchurl { - url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz"; - sha256 = "0i3yz303wscrysyzpdq04h4nrl9ajz9dbwi80risdl5rkm3dhw2s"; + url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf"; }; buildInputs = [ readline ]; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Readline wrapper for console programs"; - homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/; + homepage = https://github.com/hanslub42/rlwrap; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index f84b9563967f..32f5a551dfe3 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -2,6 +2,8 @@ , qtbase, qttools, makeWrapper, qmake , withEspeak ? false, espeak ? null }: +let inherit (stdenv.lib) getDev; in + stdenv.mkDerivation rec { name = "rockbox-utility-${version}"; version = "1.4.0"; @@ -15,6 +17,11 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withEspeak espeak; nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; + postPatch = '' + sed -i rbutil/rbutilqt/rbutilqt.pro \ + -e '/^lrelease.commands =/ s|$$\[QT_INSTALL_BINS\]/lrelease -silent|${getDev qttools}/bin/lrelease|' + ''; + preConfigure = '' cd rbutil/rbutilqt ''; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index ee5c37ef6bb1..671dba0d548b 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://oss.oetiker.ch/rrdtool/; + homepage = https://oss.oetiker.ch/rrdtool/; description = "High performance logging in Round Robin Databases"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 911f0ff50bf3..cce7614b904e 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -1,15 +1,14 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "time-1.7"; +stdenv.mkDerivation rec { + name = "time-${version}"; + version = "1.8"; src = fetchurl { - url = mirror://gnu/time/time-1.7.tar.gz; - sha256 = "0va9063fcn7xykv658v2s9gilj2fq4rcdxx2mn2mmy1v4ndafzp3"; + url = "mirror://gnu/time/${name}.tar.gz"; + sha256 = "06rfg8dn0q2r8pdq8i6brrs6rqrsgvkwbbl4kfx3a6lnal0m8bwa"; }; - patches = [ ./max-resident.patch ]; - meta = { description = "Tool that runs programs and summarizes the system resources they use"; @@ -27,7 +26,7 @@ stdenv.mkDerivation { `time' reports unavailable information as zero values. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/time/; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/misc/time/max-resident.patch b/pkgs/tools/misc/time/max-resident.patch deleted file mode 100644 index e593d833d5e4..000000000000 --- a/pkgs/tools/misc/time/max-resident.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix the "max resident" size reported by ‘time’ being off by a factor of 4. - -From http://lists.gnu.org/archive/html/help-gnu-utils/2010-10/msg00002.html - -diff -ru -x '*~' time-1.7-orig/time.c time-1.7/time.c ---- time-1.7-orig/time.c 1996-06-13 15:38:21.000000000 -0400 -+++ time-1.7/time.c 2011-10-31 10:40:27.000000000 -0400 -@@ -392,7 +392,7 @@ - ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v)); - break; - case 'M': /* Maximum resident set size. */ -- fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss)); -+ fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss); - break; - case 'O': /* Outputs. */ - fprintf (fp, "%ld", resp->ru.ru_oublock); diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 24a7e8d3f714..f30fdb1f1192 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/timidity/; + homepage = https://sourceforge.net/projects/timidity/; license = licenses.gpl2; description = "A software MIDI renderer"; maintainers = [ maintainers.marcweber ]; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 9faa36c13f02..24486980b4ba 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "tmuxp-${version}"; - version = "1.3.1"; + version = "1.3.4"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/t/tmuxp/${name}.tar.gz"; - sha256 = "189mxnb2pxj3wjijn56j8y5x1r23fil00fn2q7d6bd13vgr0f85s"; + sha256 = "149n35rr27n2c6yna1bla20x3w1zz9gxnjj3m3xxdfp4fbsd2y31"; }; patchPhase = '' diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 17798057ec3d..382b69722a42 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -6,12 +6,12 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "0.15.0"; + version = "0.16.3"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "08aa5yxcj7ziz2r0hz4p554q8hgpfl2bh8r6r85f4g24mg6arxsj"; + sha256 = "0dpwbfi97ksijqng191659m8k0v215y8ld95w8gb126m4m96qpzw"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index 567783f63138..1c108af27f88 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://sjeng.org/vorbisgain.html; + homepage = https://sjeng.org/vorbisgain.html; description = "A utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 0e7cd49b543d..c1091d47c5a8 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -1,17 +1,14 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, buildPythonApplication, fetchFromGitHub }: -with pythonPackages; - -buildPythonPackage rec { - namePrefix = ""; +buildPythonApplication rec { name = "wakatime-${version}"; - version = "7.0.4"; + version = "10.0.1"; src = fetchFromGitHub { - sha256 = "1cddabx9x11d2nxxcqlf4piysjnpfici0n5qy3n9gw81asz1djhf"; - rev = version; - repo = "wakatime"; owner = "wakatime"; + repo = "wakatime"; + rev = version; + sha256 = "1bg8fzd3rdc6na0a7z1d55m2gbnfq6d72mf2jlyzc817r6dr4bfx"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index ccedec968e4b..13d5dec91cee 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.10.20"; + version = "2017.11.06"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0npr8b1xg1dylz717kfllw433h1y16251npzch48lchq69bhm4iy"; + sha256 = "1djq3sf16il6y7n175gv7xwdz2s9lvsvzs38k95cj579l4k0433d"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 11f65ea82b03..d5819639fa2c 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: let version = "20"; in stdenv.mkDerivation { name = "cjdns-"+version; - src = fetchurl { - url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; - sha256 = "1dyqxi9l2pmrgm16a161909rg3vfzvib40frr7p6ddpk8yfh5888"; + src = fetchFromGitHub { + owner = "cjdelisle"; + repo = "cjdns"; + rev = "cjdns-v${version}"; + sha256 = "0gqcspiz1n0j711vwq807cy456dkcf03r376l04qc92173g2fzrx"; }; buildInputs = [ which python27 nodejs ] ++ diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index 985cb0c3015a..d145e1e12c3a 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; buildInputs = [ go ]; - buildPhase = "go build"; - installPhase = "install -D curl-unix-socket* $out/bin/curl-unix-socket"; + buildPhase = "go build -o curl-unix-socket"; + installPhase = "install -D curl-unix-socket $out/bin/curl-unix-socket"; meta = with stdenv.lib; { description = "Run HTTP requests over UNIX socket"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c01dbbaa3a71..d67b34371fe2 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.56.0"; + name = "curl-7.56.1"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1pvr2bqfhk46bzq2x2hskmnq3wc8qxlps7apm9q1qiixb9ra8q6y"; + sha256 = "142zidvlmrz31yx480nrhh47hl01d7jbaagin23pspl7cw1ng515"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 0061620b58d1..3984922abe28 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -1,45 +1,31 @@ -{ stdenv, fetchurl - , openssl, tdb, zlib, flex, bison - }: -let - buildInputs = [ openssl tdb zlib flex bison ]; - sourceInfo = rec { - baseName="fdm"; - version = "1.8"; - name="${baseName}-${version}"; - url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz"; - sha256 = "0hi39f31ipv8f9wxb41pajvl61w6vaapl39wq8v1kl9c7q6h0k2g"; - }; +{ stdenv, fetchFromGitHub, autoreconfHook, openssl, tdb, zlib, flex, bison }: + +let + + baseName = "fdm"; + version = "1.9.0.20170124"; + in -stdenv.mkDerivation { - src = fetchurl { - inherit (sourceInfo) url sha256; + +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "nicm"; + repo = baseName; + rev = "cae4ea37b6b296d1b2e48f62934ea3a7f6085e33"; + sha256 = "048191wdv1yprwinipmx2152gvd2iq1ssv7xfb1bzh6zirh1ya3n"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - preBuild = '' - export makeFlags="$makeFlags PREFIX=$out" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Dbool=int" - - sed -i */Makefile -i Makefile -e 's@ -g bin @ @' - sed -i */Makefile -i Makefile -e 's@ -o root @ @' - sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @' - sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @' - sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g' - ''; - - meta = { + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl tdb zlib flex bison ]; + + + meta = with stdenv.lib; { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; - maintainers = with stdenv.lib.maintainers; - [ - raskin - ]; - platforms = with stdenv.lib.platforms; - linux; - homepage = http://fdm.sourceforge.net/; - inherit (sourceInfo) version; - updateWalker = true; + maintainers = with maintainers; [ raskin ]; + platforms = with platforms; linux; + homepage = https://github.com/nicm/fdm; + downloadPage = https://github.com/nicm/fdm/releases; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index b8bd9c0910a4..ff5a6c1eaeea 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "4.54.0"; + version = "5.4"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0r9s91zrdm6xklnj1fwzz74cxhkbmrgrrp86n62qgijkafa5fmnl"; + sha256 = "1iwss9z94p165gxr2yw7s9q12a0bn71fcdbikzkykr5s7xxnz2ds"; }; doCheck = false; diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 10ed8f34e3a6..47163b94dc52 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, coreutils, binutils }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.1.3"; + version = "1.2.0"; name = "htpdate-${version}"; src = fetchurl { - url = "http://twekkel.home.xs4all.nl/htp/htpdate-${version}.tar.gz"; - sha256 = "0hfg4qrsmpqw03m9qwf3zgi4brbf65w6wd3w30nkamc7x8b4vn5i"; + url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz"; + sha256 = "00xwppq3aj951m0srjvxmr17kiaaflyjmbfkvpnfs3jvqhzczci2"; }; - installFlags = [ - "INSTALL=${coreutils}/bin/install" - "STRIP=${binutils}/bin/strip" + makeFlags = [ + "INSTALL=install" + "STRIP=${stdenv.cc.bintools.prefix}strip" "prefix=$(out)" ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Utility to fetch time and set the system clock over HTTP"; homepage = http://www.vervest.org/htp/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 5f6f0466f630..83ad64a66a4a 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages, httpie }: pythonPackages.buildPythonApplication rec { - version = "0.10.2"; + version = "0.11.0"; name = "http-prompt"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0c03n1ll61zd4f60kzih3skl0hspck5hhpcf74h5l6v5as7qdbi2"; + sha256 = "0arl85880nnyfx8cvpzm6cr8nalhyrkz5zqfr628p487rwqv45ip"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 7348cd7f1165..f96987a1300b 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,82 +1,32 @@ { stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: -let - p = python3.override { - packageOverrides = self: super: { - cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec { - version = "1.8.2"; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "8e88ebac371a388024dab3ccf393bf3c1790d21bc3c299d5a6f9f83fb823beda"; - }; - }); - cryptography_vectors = super.cryptography_vectors.overridePythonAttrs (oldAttrs: rec { - version = self.cryptography.version; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "00daa04c9870345f56605d91d7d4897bc1b16f6fff7c74cb602b08ef16c0fb43"; - }; - }); - pyopenssl = super.pyopenssl.overridePythonAttrs (oldAttrs: rec { - version = "17.0.0"; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1pdg1gpmkzj8yasg6cmkhcivxcdp4c12nif88y4qvsxq5ffzxas8"; - }; - patches = fetchpatch { - url = "https://github.com/pyca/pyopenssl/commit/" - + "a40898b5f1d472f9449a344f703fa7f90cddc21d.patch"; - sha256 = "0bdfrhfvdfxhfknn46s4db23i3hww6ami2r1l5rfrri0pn8b8mh7"; - }; - }); - }; - }; -in p.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { baseName = "mitmproxy"; - name = "${baseName}-${version}"; - version = "2.0.2"; + name = "${baseName}-unstable-2017-10-31"; src = fetchFromGitHub { owner = baseName; repo = baseName; - rev = "v${version}"; - sha256 = "1x1a28al5clpfd69rjcpw26gjjnpsm1vfl4scrwpdd1jhkw044h9"; + rev = "80a8eaa708ea31dd9c5e7e1ab6b02c69079039c0"; + sha256 = "0rvwm11yryzlp3c1i42rk2iv1m38yn6r83k41jb51hwg6wzbwzvw"; }; - patches = [ - # fix tests - (fetchpatch { - url = "https://github.com/mitmproxy/mitmproxy/commit/b3525570929ba47c10d9d08696876c39487f7000.patch"; - sha256 = "111fld5gqdii7rs1jhqaqrxgbyhfn6qd0y7l15k4npamsnvdnv20"; - }) - # bump pyOpenSSL - (fetchpatch { - url = https://github.com/mitmproxy/mitmproxy/commit/6af72160bf98b58682b8f9fc5aabf51928d2b1d3.patch; - sha256 = "1q4ml81pq9c8j9iscq8janbxf4s37w3bqskbs6r30yqzy63v54f2"; - }) - # https://github.com/mitmproxy/mitmproxy/commit/3d7cde058b7e6242d93b9bc9d3e17520ffb578a5 - ./tornado-4.6.patch - ]; - checkPhase = '' export HOME=$(mktemp -d) # test_echo resolves hostnames - LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo' + LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs ' ''; - propagatedBuildInputs = with p.pkgs; [ - blinker click certifi construct cryptography - cssutils editorconfig h2 html2text hyperframe - jsbeautifier kaitaistruct passlib pyasn1 pyopenssl + propagatedBuildInputs = with python3.pkgs; [ + blinker click certifi cryptography + h2 hyperframe + kaitaistruct passlib pyasn1 pyopenssl pyparsing pyperclip requests ruamel_yaml tornado - urwid watchdog brotlipy sortedcontainers + urwid brotlipy sortedcontainers ldap3 ]; - buildInputs = with p.pkgs; [ - beautifulsoup4 flask pytz pytest pytestrunner protobuf glibcLocales + buildInputs = with python3.pkgs; [ + beautifulsoup4 flask pytest pytestrunner glibcLocales ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix new file mode 100644 index 000000000000..a352596eed05 --- /dev/null +++ b/pkgs/tools/networking/nat-traverse/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "nat-traverse-${version}"; + version = "0.7"; + + src = fetchurl { + url = "https://www.speicherleck.de/iblech/nat-traverse/nat-traverse-${version}.tar.bz2"; + sha256 = "0knwnqsjwv7sa5wjb863ghabs7s269a73qwkmxpsbngjw9s0j2ih"; + }; + + nativeBuildInputs = [ perl ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp nat-traverse $out/bin + gzip -c nat-traverse.1 > $out/share/man/man1/nat-traverse.1.gz + ''; + + meta = with stdenv.lib; { + description = "NAT gateway traversal utility"; + longDescription = '' + nat-traverse establishes direct connections between nodes which are + behind NAT gateways, i.e. hosts which do not have public IP addresses. + This is done using an UDP NAT traversal technique. Additionally, it's + possible to setup a small VPN by using pppd on top of nat-traverse. + + nat-traverse does not need an external server on the Internet, and it + isn't necessary to reconfigure the involved NAT gateways, either. + nat-traverse works out-of-the-box. + ''; + homepage = https://www.speicherleck.de/iblech/nat-traverse/; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.iblech ]; + }; +} diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 5ca3079a084f..b0921375849d 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1lz4hwgwdq3znlqjmvl7cw3g3ilbayn608h0hwqdf7v2jq6n67kg"; }; + patches = [ ./glibc-2.26.patch ]; + buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl libnetfilter_conntrack libpcap libsodium liburcu ncurses perl pkgconfig zlib ]; diff --git a/pkgs/tools/networking/netsniff-ng/glibc-2.26.patch b/pkgs/tools/networking/netsniff-ng/glibc-2.26.patch new file mode 100644 index 000000000000..2ee7b478e9b2 --- /dev/null +++ b/pkgs/tools/networking/netsniff-ng/glibc-2.26.patch @@ -0,0 +1,24 @@ +diff --git a/built_in.h b/built_in.h +index da04dbd..7acc183 100644 +--- a/built_in.h ++++ b/built_in.h +@@ -10,6 +10,7 @@ + #include <endian.h> + #include <byteswap.h> + #include <asm/byteorder.h> ++#include <string.h> + + typedef uint64_t u64; + typedef uint32_t u32; +diff --git a/staging/tools.c b/staging/tools.c +index 9d2d1be..909b059 100644 +--- a/staging/tools.c ++++ b/staging/tools.c +@@ -55,6 +55,7 @@ + //////////////////////////////////////////////////////////////////////////////////////////// + + #include "mz.h" ++#include <stdint.h> + + #define CMP_INT(a, b) ((a) < (b) ? -1 : (a) > (b)) + #define IPV6_MAX_RANGE_LEN strlen("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff-ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128") diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 3220aebdfe49..fc320ba2fb96 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, librsvg +, libnotify, libsecret, polkit, isocodes, modemmanager , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk +, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk , withGnome ? false }: stdenv.mkDerivation rec { @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas - polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring - modemmanager jansson librsvg glib_networking gnome3.dconf + polkit isocodes udev libgudev gnome3.libgnome_keyring + modemmanager jansson glib_networking ] ++ stdenv.lib.optional withGnome webkitgtk; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ]; + propagatedUserEnvPkgs = [ gnome3.gnome_keyring hicolor_icon_theme ]; makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 2b2b441f2f98..7e1c257ec4b6 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { "--with-privsep-user=${privsepUser}" "--sysconfdir=/etc" "--localstatedir=/var" + "--with-cacert=/etc/ssl/certs/ca-certificates.crt" ]; buildInputs = [ libressl ]; diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix new file mode 100644 index 000000000000..3d1055be02b8 --- /dev/null +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -0,0 +1,76 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, + autoreconfHook, re2c, openldap, openvpn, gnustep, check +}: + +let + srcName = "openvpn-auth-ldap"; + srcVersion = "2.0.3"; + debianRev = "6.1"; + + fetchPatchFromDebian = + {patch, sha256}: + fetchpatch { + inherit sha256; + url = "http://sources.debian.net/data/main/o/${srcName}/${srcVersion}-${debianRev}/debian/patches/${patch}"; + }; +in + +stdenv.mkDerivation rec { + name = "${srcName}-${version}"; + version = "${srcVersion}+deb${debianRev}"; + + srcs = fetchFromGitHub { + owner = "threerings"; + repo = srcName; + rev = "auth-ldap-${version}"; + sha256 = "1v635ylzf5x3l3lirf3n6173q1w8g0ssjjkf27qqw98c3iqp63sq"; + }; + + patches = map fetchPatchFromDebian [ + {patch = "STARTTLS_before_auth.patch"; + sha256 = "14d2vy366rhzggxb1zb3ld00wmaqxi2gq885vxhlldnwpgig0jx0";} + {patch = "gobjc_4.7_runtime.patch"; + sha256 = "11hpmd4i1cm3m27x8c77d9jrwxpir4cy5d74k2kxq0q77rawnxcm";} + {patch = "openvpn_ldap_simpler_add_handler_4"; + sha256 = "0qj7v2w921489c18mfrs5bmipzn1mcjj9avyp15x4531ss0lyanb";} + {patch = "auth-ldap-gnustep.patch"; + sha256 = "0cz3jgyzgzi2p9bavd4lh69pnlnf4s7n9ihwg6zmmh6vqsynqss3";} + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + check + gnustep.base + gnustep.libobjc + gnustep.make + openldap + openvpn + re2c + ]; + + configureFlags = [ + "--with-objc-runtime=modern" + "--with-openvpn=${openvpn}/include" + "--libdir=$(out)/lib/openvpn" + ]; + + preInstall = '' + mkdir -p $out/lib/openvpn $out/share/doc/openvpn/examples + cp README $out/share/doc/openvpn/ + cp auth-ldap.conf $out/share/doc/openvpn/examples/ + ''; + + meta = with lib; { + description = "LDAP authentication plugin for OpenVPN"; + homepage = https://github.com/threerings/openvpn-auth-ldap; + license = [ + licenses.asl20 + licenses.bsd3 + ]; + maintainers = [ maintainers.benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 901d84b46926..f63c1d474c05 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { sha256 = "1zvadgsskmpm82id9mbj24a2lyq38qv768ixv7nmfjl3d4wr2biv"; }; - nativeBuildInputs = [ bison binutils gettext pkgconfig ]; - buildInputs = [ glib gnutls gtk2 libxml2 zlib ]; + nativeBuildInputs = [ bison gettext pkgconfig ]; + buildInputs = [ binutils glib gnutls gtk2 libxml2 zlib ]; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 0c8ca56024bf..5633061c7212 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://pdsh.googlecode.com/files/${name}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pdsh/${name}.tar.bz2"; sha256 = "1kvzz01fyaxfqmbh53f4ljfsgvxdykh5jyr6fh4f1bw2ywxr1w2p"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/p/pdsh/; + homepage = https://github.com/chaos/pdsh; description = "High-performance, parallel remote shell utility"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index 6e4a5561f07a..dd8347717319 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -1,31 +1,24 @@ -{ stdenv, fetchFromGitHub, libpcap, sqlite, pixiewps, makeWrapper }: +{ stdenv, fetchFromGitHub, libpcap, pixiewps, makeWrapper }: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.6.3"; name = "reaver-wps-t6x-${version}"; - confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db" src = fetchFromGitHub { owner = "t6x"; repo = "reaver-wps-fork-t6x"; rev = "v${version}"; - sha256 = "0zhlms89ncqz1f1hc22yw9x1s837yv76f1zcjizhgn5h7vp17j4b"; + sha256 = "1bccwp67q1q0h5m38gqxn9imq5rb75jbmv7fjr2n38v10jcga2pb"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libpcap sqlite pixiewps ]; + buildInputs = [ libpcap pixiewps ]; - sourceRoot = "reaver-wps-fork-t6x-v${version}-src/src"; - - configureFlags = "--sysconfdir=${confdir}"; + preConfigure = "cd src"; installPhase = '' - mkdir -p $out/{bin,etc} - cp reaver.db $out/etc/ + mkdir -p $out/bin cp reaver wash $out/bin/ - - wrapProgram $out/bin/reaver --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db" - wrapProgram $out/bin/wash --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index c9bd3fbaa853..6cbee7d2a851 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap sqlite ]; - sourceRoot = "reaver-${version}/src"; + + setSourceRoot = '' + sourceRoot=$(echo */src) + ''; configureFlags = "--sysconfdir=${confdir}"; @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brute force attack against Wifi Protected Setup"; - homepage = http://code.google.com/p/reaver-wps; + homepage = https://code.google.com/archive/p/reaver-wps/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nico202 volth ]; diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 14283c279e46..ef2c91ee2fab 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "slimrat-1.0"; src = fetchurl { - url = http://slimrat.googlecode.com/files/slimrat-1.0.tar.bz2; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/slimrat/slimrat-1.0.tar.bz2"; sha256 = "139b71d45k4b1y47iq62a9732cnaqqbh8s4knkrgq2hx0jxpsk5a"; }; @@ -24,9 +24,10 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/p/slimrat/; + homepage = https://code.google.com/archive/p/slimrat/; description = "Linux Rapidshare downloader"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + broken = true; # officially abandonned upstream }; } diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index f87cecaf4d27..aedb89ce4891 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://sourceforge.net/projects/sshpass/; + homepage = https://sourceforge.net/projects/sshpass/; description = "Non-interactive ssh password auth"; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/statsd/default.nix b/pkgs/tools/networking/statsd/default.nix deleted file mode 100644 index 6f909a915ae3..000000000000 --- a/pkgs/tools/networking/statsd/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ recurseIntoAttrs, callPackage, nodejs -}: - -let - self = recurseIntoAttrs ( - callPackage ../../../top-level/node-packages.nix { - inherit nodejs self; - generated = callPackage ./node-packages.nix { inherit self; }; - overrides = { - "statsd" = { passthru.nodePackages = self; }; - }; - }); -in self.statsd diff --git a/pkgs/tools/networking/statsd/node-packages.json b/pkgs/tools/networking/statsd/node-packages.json deleted file mode 100644 index f75224e79f92..000000000000 --- a/pkgs/tools/networking/statsd/node-packages.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - "statsd" -, "statsd-librato-backend" -, "stackdriver-statsd-backend" -, "statsd-influxdb-backend" -] diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix deleted file mode 100644 index fd196c249ae1..000000000000 --- a/pkgs/tools/networking/statsd/node-packages.nix +++ /dev/null @@ -1,284 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."commander"."1.3.1" = - self.by-version."commander"."1.3.1"; - by-version."commander"."1.3.1" = self.buildNodePackage { - name = "commander-1.3.1"; - version = "1.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; - name = "commander-1.3.1.tgz"; - sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; - }; - deps = { - "keypress-0.1.0" = self.by-version."keypress"."0.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connection-parse"."0.0.x" = - self.by-version."connection-parse"."0.0.7"; - by-version."connection-parse"."0.0.7" = self.buildNodePackage { - name = "connection-parse-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; - name = "connection-parse-0.0.7.tgz"; - sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generic-pool"."2.2.0" = - self.by-version."generic-pool"."2.2.0"; - by-version."generic-pool"."2.2.0" = self.buildNodePackage { - name = "generic-pool-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz"; - name = "generic-pool-2.2.0.tgz"; - sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hashring"."3.2.0" = - self.by-version."hashring"."3.2.0"; - by-version."hashring"."3.2.0" = self.buildNodePackage { - name = "hashring-3.2.0"; - version = "3.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz"; - name = "hashring-3.2.0.tgz"; - sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce"; - }; - deps = { - "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7"; - "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."keypress"."0.1.x" = - self.by-version."keypress"."0.1.0"; - by-version."keypress"."0.1.0" = self.buildNodePackage { - name = "keypress-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - name = "keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."modern-syslog"."1.1.2" = - self.by-version."modern-syslog"."1.1.2"; - by-version."modern-syslog"."1.1.2" = self.buildNodePackage { - name = "modern-syslog-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz"; - name = "modern-syslog-1.1.2.tgz"; - sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; - }; - deps = { - "nan-2.4.0" = self.by-version."nan"."2.4.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ "!win32" ]; - cpu = [ ]; - }; - by-spec."nan"."^2.0.5" = - self.by-version."nan"."2.4.0"; - by-version."nan"."2.4.0" = self.buildNodePackage { - name = "nan-2.4.0"; - version = "2.4.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; - name = "nan-2.4.0.tgz"; - sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sequence"."2.2.1" = - self.by-version."sequence"."2.2.1"; - by-version."sequence"."2.2.1" = self.buildNodePackage { - name = "sequence-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; - name = "sequence-2.2.1.tgz"; - sha1 = "7f5617895d44351c0a047e764467690490a16b03"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."simple-lru-cache"."0.0.x" = - self.by-version."simple-lru-cache"."0.0.2"; - by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage { - name = "simple-lru-cache-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - name = "simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stackdriver-statsd-backend"."*" = - self.by-version."stackdriver-statsd-backend"."0.2.3"; - by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage { - name = "stackdriver-statsd-backend-0.2.3"; - version = "0.2.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; - name = "stackdriver-statsd-backend-0.2.3.tgz"; - sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3"; - by-spec."statsd"."*" = - self.by-version."statsd"."0.8.0"; - by-version."statsd"."0.8.0" = self.buildNodePackage { - name = "statsd-0.8.0"; - version = "0.8.0"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz"; - name = "statsd-0.8.0.tgz"; - sha1 = "92041479e174a214df7147f2fab1348af0839052"; - }; - deps = { - "generic-pool-2.2.0" = self.by-version."generic-pool"."2.2.0"; - }; - optionalDependencies = { - "modern-syslog-1.1.2" = self.by-version."modern-syslog"."1.1.2"; - "hashring-3.2.0" = self.by-version."hashring"."3.2.0"; - "winser-0.1.6" = self.by-version."winser"."0.1.6"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "statsd" = self.by-version."statsd"."0.8.0"; - by-spec."statsd-influxdb-backend"."*" = - self.by-version."statsd-influxdb-backend"."0.6.0"; - by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage { - name = "statsd-influxdb-backend-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz"; - name = "statsd-influxdb-backend-0.6.0.tgz"; - sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.6.0"; - by-spec."statsd-librato-backend"."*" = - self.by-version."statsd-librato-backend"."0.1.7"; - by-version."statsd-librato-backend"."0.1.7" = self.buildNodePackage { - name = "statsd-librato-backend-0.1.7"; - version = "0.1.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz"; - name = "statsd-librato-backend-0.1.7.tgz"; - sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.7"; - by-spec."winser"."=0.1.6" = - self.by-version."winser"."0.1.6"; - by-version."winser"."0.1.6" = self.buildNodePackage { - name = "winser-0.1.6"; - version = "0.1.6"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; - name = "winser-0.1.6.tgz"; - sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; - }; - deps = { - "sequence-2.2.1" = self.by-version."sequence"."2.2.1"; - "commander-1.3.1" = self.by-version."commander"."1.3.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 7ef278e359cc..89019986bca2 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { # the configuration files. In the absence of that we patch swanctl to look # for configuration files in /etc/swanctl. substituteInPlace src/swanctl/swanctl.h --replace "SWANCTLDIR" "\"/etc/swanctl\"" + # glibc-2.26 reorganized internal includes + sed '1i#include <stdint.h>' -i src/libstrongswan/utils/utils/memory.h ''; preConfigure = '' diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix index 52727f1c49e7..1df0f2c37fc2 100644 --- a/pkgs/tools/networking/tcpflow/default.nix +++ b/pkgs/tools/networking/tcpflow/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib libpcap boost automake autoconf ] ++ lib.optional useCairo cairo; postUnpack = '' - pushd tcpflow-*-src/src + pushd "$sourceRoot/src" cp -rv ${be13_api}/* be13_api/ cp -rv ${dfxml}/* dfxml/ cp -rv ${httpparser}/* http-parser/ diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index b12ce573d1c4..4ee4fa418335 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "udptunnel-19"; src = fetchurl { - url = http://udptunnel.googlecode.com/files/udptunnel-r19.tar.gz; - sha1 = "51edec3b63b659229bcf92f6157568d3b074ede0"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r19.tar.gz"; + sha256 = "1hkrn153rdyrp9g15z4d5dq44cqlnby2bfplp6z0g3862lnv7m3l"; }; installPhase = '' @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/p/udptunnel/; + homepage = https://code.google.com/archive/p/udptunnel/; description = "Tunnels TCP over UDP packets"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index cb462a2cedd2..b124352fd7b9 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.6.6"; + version = "1.6.7"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "145kska9a63yf32y3jg91y5ikcmsb7qvbcm7a8k6fgh96gf18awp"; + sha256 = "17qwfmlls0w9kpkya3dlpn44b3kr87wsswzg3gawc13hh8yx8ysf"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 8161f700ce18..6a322f649ac4 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,19 +2,21 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.5"; + version = "2.7"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "0irz54nvyq3cxa3fvjc5k2836a5nmly4wiiy4s5cwib1rnwg6r94"; + sha256 = "0fx964z73yv08b1lpymmjsigf6929zx9ax5bp34rcf2c5gk11l5m"; }; propagatedBuildInputs = with python3Packages; [ + appdirs keyring minidb pyyaml + pycodestyle requests ]; diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 7c72c2cd210c..05dcf6dc594c 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP benchmarking tool"; - homepage = http://github.com/wg/wrk; + homepage = https://github.com/wg/wrk; longDescription = '' wrk is a modern HTTP benchmarking tool capable of generating significant load when run on a single multi-core CPU. It diff --git a/pkgs/tools/package-management/fpm/Gemfile b/pkgs/tools/package-management/fpm/Gemfile index ea498ca78355..17ed0a0cb2af 100644 --- a/pkgs/tools/package-management/fpm/Gemfile +++ b/pkgs/tools/package-management/fpm/Gemfile @@ -1,4 +1,3 @@ source 'https://rubygems.org' -gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar' gem 'fpm' diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock index 16d7a8250ec9..e0c12dcce31a 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -1,22 +1,16 @@ -GIT - remote: git://github.com/peterhoeg/archive-tar-minitar.git - revision: dae32ca550a87dba32597115ae18805db4782ebe - specs: - archive-tar-minitar (0.5.2.1) - GEM remote: https://rubygems.org/ specs: arr-pm (0.0.10) cabin (> 0) - backports (3.6.8) - cabin (0.8.1) - childprocess (0.5.9) + backports (3.10.3) + cabin (0.9.0) + childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) - clamp (1.0.0) - ffi (1.9.14) - fpm (1.6.2) - archive-tar-minitar + clamp (1.0.1) + dotenv (2.2.1) + ffi (1.9.18) + fpm (1.9.3) arr-pm (~> 0.0.10) backports (>= 2.6.2) cabin (>= 0.6.0) @@ -24,29 +18,30 @@ GEM clamp (~> 1.0.0) ffi json (>= 1.7.7, < 2.0) - pleaserun (~> 0.0.24) + pleaserun (~> 0.0.29) ruby-xz + stud insist (1.0.0) io-like (0.3.0) - json (1.8.3) + json (1.8.6) mustache (0.99.8) - pleaserun (0.0.24) + pleaserun (0.0.30) cabin (> 0) clamp + dotenv insist mustache (= 0.99.8) stud ruby-xz (0.2.3) ffi (~> 1.9) io-like (~> 0.3) - stud (0.0.22) + stud (0.0.23) PLATFORMS ruby DEPENDENCIES - archive-tar-minitar (>= 0.5.2.1)! fpm BUNDLED WITH - 1.14.3 + 1.14.6 diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix index 4243651dd25d..26450bc36122 100644 --- a/pkgs/tools/package-management/fpm/gemset.nix +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -1,15 +1,6 @@ { - archive-tar-minitar = { - source = { - fetchSubmodules = false; - rev = "dae32ca550a87dba32597115ae18805db4782ebe"; - sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd"; - type = "git"; - url = "git://github.com/peterhoeg/archive-tar-minitar.git"; - }; - version = "0.5.2.1"; - }; arr-pm = { + dependencies = ["cabin"]; source = { remotes = ["https://rubygems.org"]; sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; @@ -20,50 +11,60 @@ backports = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k"; + sha256 = "1agsk23kfr194s690jnrpijh9pf3hq4a9yy66j1wzzj2x19ss9y0"; type = "gem"; }; - version = "3.6.8"; + version = "3.10.3"; }; cabin = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06b5ri2629ad9xjc419xswz17zli90v8x640k2sd6v2yb90zkr1b"; + sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.0"; }; childprocess = { + dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1is253wm9k2s325nfryjnzdqv9flq8bm4y2076mhdrncxamrh7r2"; + sha256 = "081hxbgrqjxha0jz0p0wkncdqawdvlsxb3awsx195g0pgkpqrcms"; type = "gem"; }; - version = "0.5.9"; + version = "0.8.0"; }; clamp = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0vy6ghz9l84qazlza30z0dwwrlifc5c7akgrl1v72ivmmjga45hw"; + sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; + }; + dotenv = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + type = "gem"; + }; + version = "2.2.1"; }; ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nkcrmxqr0vb1y4rwliclwlj2ajsi4ddpdx2gvzjy0xbkk5iqzfp"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.14"; + version = "1.9.18"; }; fpm = { + dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ids20mcs6w8nf4bpjj749ayc7h637kqx0pdw5d5a0yzik34daaj"; + sha256 = "0yvp9cifzfrxv3pr1kvcvvnyrcz8vxf6yd43hg5blaick50sbm23"; type = "gem"; }; - version = "1.6.2"; + version = "1.9.3"; }; insist = { source = { @@ -84,10 +85,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.6"; }; mustache = { source = { @@ -98,14 +99,16 @@ version = "0.99.8"; }; pleaserun = { + dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s26216ip6skzbdl48z8wbrzqbvwq1q4s6sm8r209zvvlp0rinkw"; + sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; type = "gem"; }; - version = "0.0.24"; + version = "0.0.30"; }; ruby-xz = { + dependencies = ["ffi" "io-like"]; source = { remotes = ["https://rubygems.org"]; sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; @@ -116,9 +119,9 @@ stud = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1raavxgn5k4bxap5wqdl7zmfw5k4ndl8aagnajlfg4f0bmm8yni7"; + sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb"; type = "gem"; }; - version = "0.0.22"; + version = "0.0.23"; }; } \ No newline at end of file diff --git a/pkgs/tools/package-management/fpm/update b/pkgs/tools/package-management/fpm/update new file mode 100755 index 000000000000..22d1e52e2977 --- /dev/null +++ b/pkgs/tools/package-management/fpm/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -r ~/.gem +fi diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4359682d96a0..fe7818691779 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -160,13 +160,13 @@ in rec { }) // { perl-bindings = nixStable; }; nixUnstable = (lib.lowPrio (common rec { - name = "nix-1.12${suffix}"; - suffix = "pre5663_c7af84ce"; + name = "nix-unstable-1.12${suffix}"; + suffix = "pre5732_fd10f6f2"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c7af84ce846a9deefa5b4db1b1bce1c091ca2a1e"; - sha256 = "1sc6rkx0500jz4fyfqm7443s1q24whmpx10mfs12wdk516f0q8qh"; + rev = "fd10f6f2414521947ca60b9d1508d909f50e9faa"; + sha256 = "17561jll94c8hdpxnyvdbjslnwr9g7ii4wqvrla7gfza236j9hff"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh index 915497208fac..e3a7d9f69e4f 100755 --- a/pkgs/tools/package-management/nixui/generate.sh +++ b/pkgs/tools/package-management/nixui/generate.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -node2nix -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix +node2nix -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index ed7ec74483f3..f6c5c7b53e13 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -25,6 +25,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/madjar/nox; description = "Tools to make nix nicer to use"; maintainers = [ lib.maintainers.madjar ]; + license = lib.licenses.mit; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index e1e57a84b555..a0368b0df89e 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; - homepage = http://code.google.com/p/opkg/; + homepage = https://git.yoctoproject.org/cgit/cgit.cgi/opkg/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 180395571b22..d4e6885d8f36 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite, systemd -, gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive +, gobjectIntrospection, vala_0_38, gtk_doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.3"; + version = "1.1.7"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "150mpar7bhlvwfpwsr6zrjn3yggvklzr6nlhk0shaxnrfkfxvvb6"; + sha256 = "076rrczmyhapj87pxqldsar5pbz4mid6cm9l1n91zh2q403chdkb"; }; - buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ] + buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 860be0e1f791..0e9ef3876d2b 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rpm-${version}"; - version = "4.13.0.1"; + version = "4.14.0"; src = fetchurl { - url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2"; - sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d"; + url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; + sha256 = "053396glswgszzg6wizn76vc8zc5m2bicw025vj44g0dc1aav806"; }; outputs = [ "out" "dev" "man" ]; @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - patches = [ ./rpm-4.13.0.1-bfd-config.patch ]; - postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch deleted file mode 100644 index b8192b24f134..000000000000 --- a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c ---- rpm-4.13.0.1/tools/sepdebugcrcfix.c 2017-02-16 10:40:09.988649399 +0100 -+++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c 2017-04-15 00:02:21.151359876 +0200 -@@ -28,6 +28,7 @@ - #include <error.h> - #include <libelf.h> - #include <gelf.h> -+#include <config.h> - #include <bfd.h> - - #define _(x) x diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index c078c3a21c5a..7230d30c7955 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -3,15 +3,17 @@ buildGoPackage rec { name = "browserpass-${version}"; - version = "1.0.6"; + version = "2.0.7"; goPackagePath = "github.com/dannyvankooten/browserpass"; + goDeps = ./deps.nix; + src = fetchFromGitHub { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "07wkvwb9klzxnlrm9a07kxzj3skpy0lymc9ijr8ykfbz6l0bpbqy"; + sha256 = "1dbp5za5qh6xmgh3w2cx5fbw13mh1szgj2y7ilmq0jh2ik09fbnd"; }; postInstall = '' diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix new file mode 100644 index 000000000000..4a86966a9fc0 --- /dev/null +++ b/pkgs/tools/security/browserpass/deps.nix @@ -0,0 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gokyle/twofactor"; + fetch = { + type = "git"; + url = "https://github.com/gokyle/twofactor"; + rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7"; + sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-zglob"; + rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6"; + sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn"; + }; + } + { + goPackagePath = "rsc.io/qr"; + fetch = { + type = "git"; + url = "https://github.com/rsc/qr"; + rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5"; + sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p"; + }; + } +] diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix new file mode 100644 index 000000000000..55335927b36a --- /dev/null +++ b/pkgs/tools/security/doas/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, bison, pam }: + +stdenv.mkDerivation rec { + name = "doas-${version}"; + + version = "6.0"; + + src = fetchFromGitHub { + owner = "Duncaen"; + repo = "OpenDoas"; + rev = "v${version}"; + sha256 = "1j50l3jvbgvg8vmp1nx6vrjxkbj5bvfh3m01bymzfn25lkwwhz1x"; + }; + + # otherwise confuses ./configure + dontDisableStatic = true; + + postPatch = '' + sed -i '/\(chown\|chmod\)/d' bsd.prog.mk + ''; + + buildInputs = [ bison pam ]; + + meta = with lib; { + description = "Executes the given command as another user"; + homepage = "https://github.com/Duncaen/OpenDoas"; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 298dd336be1f..81c92415c509 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,40 +1,39 @@ -{ stdenv, fetchurl, gmp }: +{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }: -assert stdenv.isLinux; - -let - bits = if stdenv.system == "x86_64-linux" then "64" else "32"; -in stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "2.00"; + version = "4.0.0"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://codeload.github.com/hashcat/hashcat/tar.gz/${version}"; - sha256 = "0i2l4i1jkdhj9bkvycgd2nf809kki3jp83y0vrd4iwsdbbbyc9b3"; + url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; + sha256 = "0l1vq4h1gfxc2yclxkvy6gfz6sii2vyzip8pw6ifq930y8dvi34y"; }; - buildInputs = [ gmp ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ opencl-headers ]; - buildFlags = [ "posix${bits}" ] - ++ stdenv.lib.optionals (bits == "64") [ "posixXOP" "posixAVX" ]; + makeFlags = [ + "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" + "COMPTIME=1337" + "VERSION_TAG=${version}" + ]; - # Upstream Makefile doesn't have 'install' target - installPhase = '' - mkdir -p $out/bin $out/libexec - cp -R * $out/libexec + # $out is not known until the build has started. + configurePhase = '' + runHook preConfigure + makeFlags="$makeFlags PREFIX=$out" + runHook postConfigure + ''; - ln -s $out/libexec/hashcat-cli${bits}.bin $out/bin/hashcat - ln -s $out/libexec/hashcat-cliXOP.bin $out/bin/hashcat-xop - ln -s $out/libexec/hashcat-cliAVX.bin $out/bin/hashcat-avx + postFixup = '' + wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib ''; - meta = { + meta = with stdenv.lib; { description = "Fast password cracker"; - homepage = "https://hashcat.net/hashcat/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = https://hashcat.net/hashcat/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kierdavis zimbatm ]; }; } diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix deleted file mode 100644 index 7a0d7241bbf9..000000000000 --- a/pkgs/tools/security/hashcat/hashcat3/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }: - -assert stdenv.isLinux; - -stdenv.mkDerivation rec { - name = "hashcat-${version}"; - version = "3.6.0"; - - src = fetchurl { - url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "127hdvq6ikah7r5vch63jnnkcsj7y61f9h8x79c3w25x9w55bxry"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ opencl-headers ]; - - makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ]; - - # $out is not known until the build has started. - configurePhase = '' - runHook preConfigure - makeFlags="$makeFlags PREFIX=$out" - runHook postConfigure - ''; - - postFixup = '' - wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib - ''; - - meta = { - description = "Fast password cracker"; - homepage = https://hashcat.net/hashcat/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.kierdavis ]; - }; -} diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 46c90481628d..22a452ccabdd 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, libpcap }: +{ stdenv, fetchFromGitHub, makeWrapper, libpcap }: stdenv.mkDerivation rec { name = "masscan-${version}"; - version = "2016-11-03"; + version = "1.0.4"; src = fetchFromGitHub { owner = "robertdavidgraham"; repo = "masscan"; - rev = "dc88677a11dc3d9a5f6aa55cc1377bc17dba1496"; - sha256 = "1mdjqkn4gnbwr5nci6i6xn7qzkjgq7dx37fzd6gghv87xgw7cdbg"; + rev = "39061a5e9ef158dde1e6618f6fbf379739934a73"; + sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf"; }; - buildInputs = [ libpcap ]; + buildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ]; @@ -24,13 +24,15 @@ stdenv.mkDerivation rec { cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.hml cp doc/masscan.8 $out/share/man/man8/masscan.8 cp LICENSE $out/share/licenses/masscan/LICENSE + + wrapProgram $out/bin/masscan --prefix LD_LIBRARY_PATH : "${libpcap}/lib" ''; meta = with stdenv.lib; { description = "Fast scan of the Internet"; homepage = https://github.com/robertdavidgraham/masscan; license = licenses.agpl3; - platforms = with platforms; allBut darwin; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index ebd9a6d5e7ee..3d4bdd2edf17 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.8"; src = fetchurl { - url = "http://mfcuk.googlecode.com/files/mfcuk-0.3.8.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mfcuk/mfcuk-0.3.8.tar.gz"; sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MiFare Classic Universal toolKit"; license = licenses.gpl2; - homepage = http://code.google.com/p/mfcuk/; + homepage = https://github.com/nfc-tools/mfcuk; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 8a454ca67fde..278818e88b54 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.10.6"; src = fetchurl { - url = "http://mfoc.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mfoc/${name}.tar.gz"; sha1 = "3adce3029dce9124ff3bc7d0fad86fa0c374a9e3"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mifare Classic Offline Cracker"; license = licenses.gpl2; - homepage = http://code.google.com/p/mfoc/; + homepage = https://github.com/nfc-tools/mfoc; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index e30866021da6..3e1e3a882839 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -1,50 +1,39 @@ -{ stdenv, fetchzip, autoconf, automake, openssl, libxml2, fetchFromGitHub, ncurses }: +{ stdenv, cmake, fetchFromGitHub, ncurses, libsodium, json_c }: -let - scrypt_src = fetchzip { - url = "http://www.tarsnap.com/scrypt/scrypt-1.2.0.tgz"; - sha256 = "0ahylib2pimlhjcm566kpim6n16jci5v749xwdkr9ivgfjrv3xn4"; - }; - -in stdenv.mkDerivation { - name = "mpw-2.1-6834f36"; +stdenv.mkDerivation rec { + name = "mpw-2.6-f8043ae"; src = fetchFromGitHub { owner = "Lyndir"; repo = "MasterPassword"; - rev = "6834f3689f5dfd4e59ad6959961d349c224977ee"; - sha256 = "0zlpx3hb1y2l60hg961h05lb9yf3xb5phnyycvazah2674gkwb2p"; + rev = "f8043ae16d73ddfb205aadd25c35cd9c5e95b228"; + sha256 = "0hy02ri7y3sca85z3ff5i68crwav5cjd7rrdqj7jrnpp1bw4yapi"; }; postUnpack = '' - sourceRoot+=/MasterPassword/C + sourceRoot+=/platform-independent/cli-c ''; - prePatch = '' - patchShebangs . - mkdir lib/scrypt/src - cp -R --no-preserve=ownership ${scrypt_src}/* lib/scrypt/src - chmod +w -R lib/scrypt/src - substituteInPlace lib/scrypt/src/libcperciva/cpusupport/Build/cpusupport.sh \ - --replace dirname "$(type -P dirname)" - substituteInPlace lib/scrypt/src/Makefile.in --replace "command -p mv" "mv" + preConfigure = '' + substituteInPlace CMakeLists.txt --replace curses ncurses + echo ${name} > VERSION ''; - NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + dontUseCmakeBuildDir = true; - buildInputs = [ autoconf automake openssl libxml2 ncurses ]; + nativeBuildInputs = [ cmake ]; - buildPhase = '' - substituteInPlace build --replace '"curses"' '"ncurses"' - targets="mpw mpw-tests" ./build - ''; + buildInputs = [ ncurses libsodium json_c ]; installPhase = '' mkdir -p $out/bin mv mpw $out/bin/mpw ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + homepage = http://masterpasswordapp.com/; + description = "A stateless password management solution"; + license = licenses.gpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index a9763b07b71f..8f087ef3d93c 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -3,29 +3,31 @@ stdenv.mkDerivation rec { name = "nsjail-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "google"; repo = "nsjail"; rev = version; fetchSubmodules = true; - sha256 = "1wkhy86d0vgzngdvv593yhcghjh63chb8s67v891zll6bwgwg5h2"; + sha256 = "11323j5wd02nm8ibvzbzq7dla70bmcldc71lv5bpk4x7h64ai14v"; }; nativeBuildInputs = [ autoconf libtool pkgconfig ]; buildInputs = [ bison flex libnl protobuf protobufc ]; + enableParallelBuilding = true; installPhase = '' - mkdir -p $out/bin - cp nsjail $out/bin + mkdir -p $out/bin $out/share/man/man1 + install nsjail $out/bin/ + install nsjail.1 $out/share/man/man1/ ''; meta = with stdenv.lib; { description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; homepage = http://nsjail.com/; - license = licenses.apsl20; - maintainers = [ maintainers.bosu ]; + license = licenses.asl20; + maintainers = with maintainers; [ bosu c0bw3b ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index 9e01e8f0a9f3..91df7f3fbb0a 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.2"; src = fetchurl { - url = "http://omapd.googlecode.com/files/${name}.tgz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${name}.tgz"; sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/omapd; + homepage = https://code.google.com/archive/p/omapd/; description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; license = licenses.gpl3; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 919ad9791a2c..61f51973ed32 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; rev = version; - sha256 = "1sc4b1g2z7402akk96rqbnwjd66n6qn046ihpwxdb03bv2qahiap"; + sha256 = "1fn1j2rf3abc5qb44zfc8z8ffw6rva4xfp7597hwr1g3szacazpq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 93b53c3ad4a3..09b5b5f58ca4 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub +, supportCompressedPackets ? true, zlib, bzip2 +}: stdenv.mkDerivation rec { name = "pgpdump-${version}"; @@ -11,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc"; }; + buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ]; + meta = with stdenv.lib; { description = "A PGP packet visualizer"; longDescription = '' diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index b793219f6497..79e8fb071b37 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, autoreconfHook}: stdenv.mkDerivation { - name = "pwgen-2.07"; + name = "pwgen-2.08"; src = fetchurl { - url = mirror://sourceforge/pwgen/pwgen-2.07.tar.gz; - sha256 = "0mhmw700kkh238fzivcwnwi94bj9f3h36yfh3k3j2v19b0zmjx7b"; + url = https://github.com/tytso/pwgen/archive/v2.08.tar.gz; + sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; }; + + nativeBuildInputs = [ autoreconfHook ]; + meta = { description = "Password generator which creates passwords which can be easily memorized by a human"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 1e626084ee3a..87c9fc59a5bd 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1a7nsi28q57ic99hrb6x83qlvpqvzvk6acbfl6ncny2j4yaxa4jl"; }; - patches = [ ./certs.patch ]; + patches = [ ./certs.patch ./glibc-2_26.patch ]; unpackPhase = '' mkdir src @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { hicolor_icon_theme libdigidocpp opensc shared_mime_info openldap gettext desktop_file_utils makeWrapper ]; - + + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Qt based UI application for verifying and signing digital signatures"; homepage = http://www.id.ee/; diff --git a/pkgs/tools/security/qdigidoc/glibc-2_26.patch b/pkgs/tools/security/qdigidoc/glibc-2_26.patch new file mode 100644 index 000000000000..1d99538e72d9 --- /dev/null +++ b/pkgs/tools/security/qdigidoc/glibc-2_26.patch @@ -0,0 +1,221 @@ +diff --git a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +index b20a68b..38f1375 100644 +--- a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -36,19 +36,19 @@ namespace google_breakpad { + + // Minidump defines register structures which are different from the raw + // structures which we get from the kernel. These are platform specific +-// functions to juggle the ucontext and user structures into minidump format. ++// functions to juggle the ucontext_t and user structures into minidump format. + + #if defined(__i386__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_ESP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_EIP]; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fp) { + const greg_t* regs = uc->uc_mcontext.gregs; + +@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, + + #elif defined(__x86_64) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RSP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RIP]; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fpregs) { + const greg_t* regs = uc->uc_mcontext.gregs; + +@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, + + #elif defined(__ARM_EABI__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_sp; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + out->context_flags = MD_CONTEXT_ARM_FULL; + + out->iregs[0] = uc->uc_mcontext.arm_r0; +@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { + + #elif defined(__aarch64__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.sp; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct fpsimd_context* fpregs) { + out->context_flags = MD_CONTEXT_ARM64_FULL; + +@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, + + #elif defined(__mips__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + out->context_flags = MD_CONTEXT_MIPS_FULL; + + for (int i = 0; i < MD_CONTEXT_MIPS_GPR_COUNT; ++i) +diff --git a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +index b6e77b4..2de80b7 100644 +--- a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ++++ b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +@@ -39,23 +39,23 @@ + + namespace google_breakpad { + +-// Wraps platform-dependent implementations of accessors to ucontext structs. ++// Wraps platform-dependent implementations of accessors to ucontext_t structs. + struct UContextReader { +- static uintptr_t GetStackPointer(const struct ucontext* uc); ++ static uintptr_t GetStackPointer(const ucontext_t* uc); + +- static uintptr_t GetInstructionPointer(const struct ucontext* uc); ++ static uintptr_t GetInstructionPointer(const ucontext_t* uc); + +- // Juggle a arch-specific ucontext into a minidump format ++ // Juggle a arch-specific ucontext_t into a minidump format + // out: the minidump structure + // info: the collection of register structures. + #if defined(__i386__) || defined(__x86_64) +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fp); + #elif defined(__aarch64__) +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct fpsimd_context* fpregs); + #else +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); + #endif + }; + +diff --git a/common/google-breakpad/src/client/linux/handler/exception_handler.cc b/common/google-breakpad/src/client/linux/handler/exception_handler.cc +index 3e2d196..b6d02ef 100644 +--- a/common/google-breakpad/src/client/linux/handler/exception_handler.cc ++++ b/common/google-breakpad/src/client/linux/handler/exception_handler.cc +@@ -404,9 +404,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { + // Fill in all the holes in the struct to make Valgrind happy. + memset(&context, 0, sizeof(context)); + memcpy(&context.siginfo, info, sizeof(siginfo_t)); +- memcpy(&context.context, uc, sizeof(struct ucontext)); ++ memcpy(&context.context, uc, sizeof(ucontext_t)); + #if defined(__aarch64__) +- struct ucontext *uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; + struct fpsimd_context *fp_ptr = + (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; + if (fp_ptr->head.magic == FPSIMD_MAGIC) { +@@ -414,9 +414,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { + } + #elif !defined(__ARM_EABI__) && !defined(__mips__) + // FP state is not part of user ABI on ARM Linux. +- // In case of MIPS Linux FP state is already part of struct ucontext ++ // In case of MIPS Linux FP state is already part of ucontext_t + // and 'float_state' is not a member of CrashContext. +- struct ucontext *uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; + if (uc_ptr->uc_mcontext.fpregs) { + memcpy(&context.float_state, + uc_ptr->uc_mcontext.fpregs, +@@ -440,7 +440,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { + // ExceptionHandler::HandleSignal(). + siginfo.si_code = SI_USER; + siginfo.si_pid = getpid(); +- struct ucontext context; ++ ucontext_t context; + getcontext(&context); + return HandleSignal(sig, &siginfo, &context); + } +diff --git a/common/google-breakpad/src/client/linux/handler/exception_handler.h b/common/google-breakpad/src/client/linux/handler/exception_handler.h +index 591c310..42f4055 100644 +--- a/common/google-breakpad/src/client/linux/handler/exception_handler.h ++++ b/common/google-breakpad/src/client/linux/handler/exception_handler.h +@@ -191,11 +191,11 @@ class ExceptionHandler { + struct CrashContext { + siginfo_t siginfo; + pid_t tid; // the crashing thread. +- struct ucontext context; ++ ucontext_t context; + #if !defined(__ARM_EABI__) && !defined(__mips__) + // #ifdef this out because FP state is not part of user ABI for Linux ARM. +- // In case of MIPS Linux FP state is already part of struct +- // ucontext so 'float_state' is not required. ++ // In case of MIPS Linux FP state is already part of ucontext_t so ++ // 'float_state' is not required. + fpstate_t float_state; + #endif + }; +diff --git a/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc +index 494e2a2..c00436b 100644 +--- a/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc ++++ b/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc +@@ -328,7 +328,7 @@ class MicrodumpWriter { + + void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } + +- const struct ucontext* const ucontext_; ++ const ucontext_t* const ucontext_; + #if !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; + #endif +diff --git a/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc +index 8406ffe..7e6fe52 100644 +--- a/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc ++++ b/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc +@@ -1221,7 +1221,7 @@ class MinidumpWriter { + const int fd_; // File descriptor where the minidum should be written. + const char* path_; // Path to the file where the minidum should be written. + +- const struct ucontext* const ucontext_; // also from the signal handler ++ const ucontext_t* const ucontext_; // also from the signal handler + #if !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; // ditto + #endif diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 4a770f86e5cb..3a6c09b9291d 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A general purpose fuzzer"; longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; - homepage = http://github.com/aoh/radamsa; + homepage = https://github.com/aoh/radamsa; maintainers = [ stdenv.lib.maintainers.markWot ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 75a865917ec1..1885940e7f31 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "A random number generator daemon"; - homepage = http://sourceforge.net/projects/gkernel; + homepage = https://sourceforge.net/projects/gkernel; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index bb165e53c73d..6db16c95fc88 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: - stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.1.0"; name = "sshguard-${version}"; src = fetchurl { - url = "mirror://sourceforge/sshguard/sshguard-2.0.0.tar.gz"; - sha256 = "e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06"; + url = "mirror://sourceforge/sshguard/${name}.tar.gz"; + sha256 = "12h2rx40lf3p3kgazmgakkgajjk2d3sdvr2f73ghi15d6i42l991"; }; doCheck = true; @@ -16,8 +15,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" ]; - patches = [ ./0001-Remove-the-unnecessary-from-ipset-cmds.patch ]; - meta = with stdenv.lib; { description = "SSHGuard protects hosts from brute-force attacks"; longDescription = '' diff --git a/pkgs/tools/security/tmin/default.nix b/pkgs/tools/security/tmin/default.nix deleted file mode 100644 index 2c16e936a695..000000000000 --- a/pkgs/tools/security/tmin/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, bash }: - -stdenv.mkDerivation rec { - name = "tmin-${version}"; - version = "0.05"; - - src = fetchurl { - url = "https://tmin.googlecode.com/files/${name}.tar.gz"; - sha256 = "0166kcfs4b0da4hs2aqyn41f5l09i8rwxpi20k7x17qsxbmjbpd5"; - }; - - buildPhase = '' - gcc -O3 -funroll-loops -fno-strict-aliasing -Wno-pointer-sign tmin.c -o tmin - ''; - installPhase = "mkdir -p $out/bin && mv tmin $out/bin"; - - meta = { - description = "Fuzzing tool test-case optimizer"; - homepage = "https://code.google.com/p/tmin"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 466dc4b4e46c..ebc567f54cea 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper to safely torify applications"; - homepage = http://code.google.com/p/torsocks/; + homepage = https://github.com/dgoulet/torsocks; repositories.git = https://git.torproject.org/torsocks.git; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 34eb5583c455..7423c2d435bf 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.6.3"; name = "yara-${version}"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "05nadqpvihdyxym11mn6n02rzv2ng8ga7j9l0g5gnjx366gcai42"; + sha256 = "13znbdwin9lvql43wpms5hh13h8rk5x5wajgmphz18rxwp8h7j78"; }; # FIXME: this is probably not the right way to make it work diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index 69cd8da4aefe..ee82af1a4707 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation rec { - version = "1.99.5"; + version = "1.99.7"; name = "dd_rescue-${version}"; src = fetchurl { - sha256 = "0db94piwcdyqhnlhgfs0bfp0gp2mqyrcr2l5nljapgni31qk4p8j"; + sha256 = "0d318i1i5d7hbj06wmb3xag14x542cv7fpkh5zjf5ccm64nyzir4"; url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2"; }; diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index b85ad32ca37c..ea062115402d 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -1,29 +1,33 @@ -{ fetchurl, stdenv, unzip }: +{ stdenv, fetchurl, pcre2 }: -let - rev = "3ec908d539"; -in -stdenv.mkDerivation { - name = "hardlink-2012.9.${rev}"; + +stdenv.mkDerivation rec { + name = "hardlink-${version}"; + version = "1.3-4"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; - sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647"; - name = "hardlink-${rev}.zip"; + url = "http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; + sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2"; }; + buildInputs = [ pcre2 ]; + NIX_CFLAGS_LINK = "-lpcre2-8"; + + buildPhase = '' + $CC -O2 hardlink.c -o hardlink $NIX_CFLAGS_LINK + ''; + installPhase = '' mkdir -p $out/bin $out/share/man/man1 - cc -O2 hardlink.c -o $out/bin/hardlink - mv hardlink.1 $out/share/man/man1/hardlink.1 + cp -f hardlink $out/bin/hardlink + cp -f hardlink.1 $out/share/man/man1/hardlink.1 ''; - buildInputs = [ unzip ]; - - meta = { - homepage = http://pkgs.fedoraproject.org/cgit/hardlink.git/; + meta = with stdenv.lib; { description = "Consolidate duplicate files via hardlinks"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + homepage = https://pagure.io/hardlink; + repositories.git = http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 90feb381ae57..ae8a1b449374 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.0.5"; + version = "3.0.7"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "0ppfxh04c0aj9dxpkzj3xv1kylc17k1kvqabp8r7h70k6ljzgmxj"; + sha256 = "0bsl4czbwmz1f42b15y0fabys50bbfll4z73nm9xk161i2njzz6y"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 5510ec0e9486..d638a1c16b5d 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { name = "lr-${version}"; - version = "0.4"; + version = "1.1"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "16qp0791s652yi86x472wwr62w6nhiyb1i662d85y5zyfagdf7dd"; + sha256 = "171h353238s9wmhirvs2yc1151vds83a71p7wgn96wa3jpl248by"; }; makeFlags = "PREFIX=$(out)"; - meta = { - homepage = http://github.com/chneukirchen/lr; + meta = with stdenv.lib; { + homepage = https://github.com/chneukirchen/lr; description = "List files recursively"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.globin ]; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.globin ]; }; } diff --git a/pkgs/tools/system/procodile/Gemfile b/pkgs/tools/system/procodile/Gemfile new file mode 100644 index 000000000000..77e4bb430e96 --- /dev/null +++ b/pkgs/tools/system/procodile/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'procodile' diff --git a/pkgs/tools/system/procodile/Gemfile.lock b/pkgs/tools/system/procodile/Gemfile.lock new file mode 100644 index 000000000000..51ab44a762ab --- /dev/null +++ b/pkgs/tools/system/procodile/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + json (2.1.0) + procodile (1.0.17) + json + +PLATFORMS + ruby + +DEPENDENCIES + procodile + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix new file mode 100644 index 000000000000..3a5cb1b4965d --- /dev/null +++ b/pkgs/tools/system/procodile/default.nix @@ -0,0 +1,22 @@ +{ lib, bundlerEnv, ruby, stdenv }: + +bundlerEnv rec { + name = "procodile-${version}"; + + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + version = (import gemset).procodile.version; + inherit ruby; + + gemdir = ./.; + + meta = with lib; { + description = "Run processes in the background (and foreground) on Mac & Linux from a Procfile (for production and/or development environments)"; + homepage = https://adam.ac/procodile; + license = with licenses; mit; + maintainers = [ maintainers.ravloony ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/system/procodile/gemset.nix b/pkgs/tools/system/procodile/gemset.nix new file mode 100644 index 000000000000..8216159ad940 --- /dev/null +++ b/pkgs/tools/system/procodile/gemset.nix @@ -0,0 +1,19 @@ +{ + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + procodile = { + dependencies = ["json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gfms2h4k9zqq7jn04nphibcsjykgxiqwdyyz2r4kq428a25kqsf"; + type = "gem"; + }; + version = "1.0.17"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 6ef1f54c23b7..5fa55b275fe1 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -2,7 +2,7 @@ , IOKit ? null , ApplicationServices ? null }: let - version = "6.5"; + version = "6.6"; dbrev = "4548"; drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49"; + sha256 = "0m1hllbb78rr6cxkbalmz1gqkl0psgq8rrmv4gwcmz34n07kvx2i"; }; patches = [ ./smartmontools.patch ]; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 6dfc6d1349d0..e410ef1cee50 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,42 +1,35 @@ -{ stdenv, fetchgit, pkgconfig, libuuid, openssl }: +{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }: stdenv.mkDerivation rec { - version = "20130507"; - checkout = "25/50225/2"; + version = "20171023"; + checkout = "8122e0b8b13794"; name = "vboot_reference-${version}"; src = fetchgit { url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; - rev = "refs/changes/${checkout}"; - sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; + rev = "${checkout}"; + sha256 = "0qxm3qlvm2fgjrn9b3n8rdccw2f5pdi7z542m2hdfddflx7jz1w7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl stdenv.cc.libc.static ] - ++ stdenv.lib.optional (libuuid != null) - (libuuid.overrideAttrs (attrs: - { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; })); - - arch = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "x86" - else throw "vboot_reference for: ${stdenv.system} not supported!"; - - buildPhase = '' - make ARCH=${arch} `pwd`/build/cgpt/cgpt - make ARCH=${arch} `pwd`/build/utility/vbutil_kernel - make ARCH=${arch} `pwd`/build/utility/vbutil_key - make ARCH=${arch} `pwd`/build/utility/vbutil_keyblock - make ARCH=${arch} `pwd`/build/utility/vbutil_firmware + buildInputs = [ openssl libuuid libyaml lzma ]; + + enableParallelBuilding = true; + + patches = [ ./dont_static_link.patch ]; + + preBuild = '' + patchShebangs scripts ''; - installPhase = '' - mkdir -p $out/bin - cp build/cgpt/cgpt $out/bin - cp build/utility/vbutil_kernel $out/bin - cp build/utility/vbutil_key $out/bin - cp build/utility/vbutil_keyblock $out/bin - cp build/utility/vbutil_firmware $out/bin + makeFlags = [ + "DESTDIR=$(out)" + ]; + + postInstall = '' + mkdir -p $out/share/vboot + cp -r tests/devkeys* $out/share/vboot/ ''; meta = { diff --git a/pkgs/tools/system/vboot_reference/dont_static_link.patch b/pkgs/tools/system/vboot_reference/dont_static_link.patch new file mode 100644 index 000000000000..506b942e246e --- /dev/null +++ b/pkgs/tools/system/vboot_reference/dont_static_link.patch @@ -0,0 +1,30 @@ +--- +--- a/Makefile ++++ b/Makefile +@@ -964,7 +964,7 @@ ${UTILLIB21}: ${UTILLIB21_OBJS} ${FWLIB2 + # Link tests for external repos + ${BUILD}/host/linktest/extern: ${HOSTLIB} + ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB} +-${BUILD}/host/linktest/extern: LDLIBS += -static ++#${BUILD}/host/linktest/extern: LDLIBS += -static + TEST_OBJS += ${BUILD}/host/linktest/extern.o + + .PHONY: hostlib +@@ -1056,7 +1056,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTIL + ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB} + + # Utilities for auto-update toolkits must be statically linked. +-${UTIL_BINS_STATIC}: LDFLAGS += -static ++${UTIL_BINS_STATIC}: + + + .PHONY: utils +@@ -1089,7 +1089,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN} + + ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} + @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" +- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} ++ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} + + ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} + ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 415a2ade28db..65d0a1e4c00a 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -19,11 +19,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-4.1.4"; + name = "gawk-4.2.0"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "0rn2mmjxm767zliqzd67j7h2ncjn4j0321c60y9fy3grs3i89qak"; + sha256 = "1wm9lqj77y7xz07zi0n187aqm8zavzxzpm1j53ahxz81q0qwvwyl"; }; # When we do build separate interactive version, it makes sense to always include man. diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 71c5e352b949..275d65e7c370 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, getopt, lua, boost, pkgconfig, gcc }: +{ stdenv, fetchFromGitHub, getopt, lua, boost, pkgconfig, gcc }: with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.39"; + version = "3.40"; - src = fetchurl { - url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "0z8gs69sqlyis4kvl8wwdgzywi199k73kkvn1mf9pf60npvcxwj4"; + src = fetchFromGitHub { + owner = "andre-simon"; + repo = "highlight"; + rev = "${version}"; + sha256 = "0bkywhz4y10qcajimdha1ck5mvn7fsrv3yn8nd6rqbva39gbfmfd"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; @@ -28,6 +30,6 @@ stdenv.mkDerivation rec { description = "Source code highlighting tool"; homepage = http://www.andre-simon.de/doku/highlight/en/highlight.php; platforms = platforms.unix; - maintainers = [ maintainers.ndowens ]; + maintainers = with maintainers; [ ndowens willibutz ]; }; } diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 8aed674a644a..4f3f8af3256d 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { EXE chmod +x $out/bin/$lt done + cat > $out/bin/languagetool-http-server <<EXE + #!${stdenv.shell} + ${jdk}/bin/java -cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer "\$@" + EXE + chmod +x $out/bin/languagetool-http-server ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 8840130dde50..a8657c3ea2f9 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mawk-1.3.4-20161120"; + name = "mawk-1.3.4-20171017"; src = fetchurl { - url = "ftp://invisible-island.net/mawk/${name}.tgz"; - sha256 = "07hc33g2ip7463dravsiz0zwfc8vy4y4jxqvp7rz3hb896xw27in"; + urls = [ + "https://invisible-mirror.net/archives/mawk/${name}.tgz" + "ftp://invisible-island.net/mawk/${name}.tgz" + ]; + sha256 = "0nwyxhipn4jx7j695lih1xggxm6cp4fjk4wbgihd33ni3rfi25yv"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 162f7e1a397b..3c2b4f5e8854 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jing-trang-${version}"; - version = "20150603"; + version = "20151127"; src = fetchFromGitHub { owner = "relaxng"; repo = "jing-trang"; - rev = "54b9b1f4e67cd79c7987750d8c9dcfc014af98c3"; # needed to compile with jdk8 - sha256 = "0wa569xjb7ihhcaazz32y2b0dv092lisjz77isz1gfb1wvf53di5"; + rev = "47a0cbdaec2d48824b78a1c19879ac7875509598"; # needed to compile with jdk8 + sha256 = "1hhn52z9mv1x9nyvyqnmzg5yrs2lzm9xac7i15izppv02wp32qha"; }; buildInputs = [ jdk ant saxon ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com # for downloads and call it the "project site". - homepage = http://www.thaiopensource.com/relaxng/jing.html; + homepage = "http://www.thaiopensource.com/relaxng/trang.html"; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 1c508a9cf7ec..f9debaaf0615 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ]; - setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`"; + setSourceRoot = '' + sourceRoot=$(echo */zimreader) + ''; preConfigure = "./autogen.sh"; meta = { diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index 6fcbf5061d1d..5a5757bf2f2d 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ]; - setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`"; + setSourceRoot = '' + sourceRoot=$(echo */zimwriterfs) + ''; preConfigure = "./autogen.sh"; meta = { diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/pkgs/tools/typesetting/pygmentex/default.nix index c19447cc0c4a..fef6c9087c53 100644 --- a/pkgs/tools/typesetting/pygmentex/default.nix +++ b/pkgs/tools/typesetting/pygmentex/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchzip, python2Packages }: +{ stdenv, fetchFromBitbucket, python2Packages }: python2Packages.buildPythonApplication rec { name = "pygmentex-${version}"; version = "0.8"; - src = fetchzip { - url = "http://mirrors.ctan.org/macros/latex/contrib/pygmentex.zip"; - sha256 = "1nm19pvhlv51mv2sdankndhw64ys9r7ch6szzd6i4jz8zr86kn9v"; + src = fetchFromBitbucket { + owner = "romildo"; + repo = "pygmentex"; + rev = version; + sha256 = "07dnv7hgppy15bda2kcbrlvfqzl6lhza80klc7133dwg8q92hm6m"; }; pythonPath = [ python2Packages.pygments python2Packages.chardet ]; @@ -38,7 +40,7 @@ python2Packages.buildPythonApplication rec { texlive.combine. ''; license = licenses.lppl13c; - maintainers = with maintainers; [ romildo ]; platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index e43bc18ba70e..7439af275608 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,8 +1,18 @@ - { stdenv, python }: +{ stdenv, python }: let localPython = python.override { packageOverrides = self: super: rec { + cement = super.cement.overridePythonAttrs (oldAttrs: rec { + version = "2.8.2"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; + }; + }); + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { version = "0.3.7"; @@ -67,11 +77,11 @@ let in with localPython.pkgs; buildPythonApplication rec { name = "${pname}-${version}"; pname = "awsebcli"; - version = "3.11.0"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "052388annhyirlzdr89hbgif8k7pw7win2zm1ybn4iiisr5l49zi"; + sha256 = "0ljras4bgxpmk1l3plialmhi7jsm2cpzx0dcs9411ijykzkamdkd"; }; checkInputs = [ |