diff options
Diffstat (limited to 'pkgs/tools')
105 files changed, 976 insertions, 374 deletions
diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index fd0c0503de9f..9387c62c2a51 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ stdenv, fetchFromGitHub, python3, fetchpatch }: stdenv.mkDerivation rec { program = "dex"; @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3.pkgs.sphinx ]; makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; + patches = [ + (fetchpatch { + url = https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch; + sha256 = "06dfkfzxp8199by0jc5wim8g8qw38j09dq9p6n9w4zaasla60pjq"; + }) + ]; + meta = with stdenv.lib; { description = "A program to generate and execute DesktopEntry files of the Application type"; homepage = https://github.com/jceb/dex; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index d8ae32c6ee4c..44016b801e5d 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -17,11 +17,11 @@ in stdenv.mkDerivation rec { name = "xdg-utils-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://portland.freedesktop.org/download/${name}.tar.gz"; - sha256 = "1k4b4m3aiyqn9k12a0ihcdahzlspl3zhskmm1d7228dvqvi546cm"; + sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"; }; # just needed when built from git diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 915144daa908..3e4d49108b71 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -14,11 +14,11 @@ let xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { pname = "xpra"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; + sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 4ee51100b339..88e36bfde39c 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick -, pamtester, xscreensaver }: +, pamtester, xscreensaver, xset }: stdenv.mkDerivation rec { name = "xsecurelock-${version}"; @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { "--with-xscreensaver=${xscreensaver}/libexec/xscreensaver" ]; + preInstall = '' + substituteInPlace helpers/saver_blank \ + --replace 'protect xset' 'protect ${xset}/bin/xset' + ''; + meta = with lib; { description = "X11 screen lock utility with security in mind"; homepage = https://github.com/google/xsecurelock; diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix new file mode 100644 index 000000000000..19f149b02274 --- /dev/null +++ b/pkgs/tools/admin/aws-env/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, lib }: + +buildGoPackage rec { + pname = "aws-env"; + version = "0.4"; + name = "${pname}-${version}"; + rev = "v${version}"; + + goPackagePath = "github.com/Droplr/aws-env"; + + src = fetchFromGitHub { + owner = "Droplr"; + repo = pname; + inherit rev; + sha256 = "0pw1qz1nn0ig90p8d8c1qcwsdz0m9w63ib07carhh86gw55425j7"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Secure way to handle environment variables in Docker and envfile with AWS Parameter Store"; + homepage = "https://github.com/Droplr/aws-env"; + license = licenses.mit; + maintainers = with maintainers; [ srhb ]; + }; +} diff --git a/pkgs/tools/admin/aws-env/deps.nix b/pkgs/tools/admin/aws-env/deps.nix new file mode 100644 index 000000000000..891a6ecb5962 --- /dev/null +++ b/pkgs/tools/admin/aws-env/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "5f03c87445c9dcd6aa831a76a77170919265aa97"; + sha256 = "146rwinw2x4r0f2pixv62b7mmhvnnfvvjmfaj6dqjxrhp0imcxdi"; + }; + } +] diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index cffb67e7d6ca..a8c00cf0eefa 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "aws-rotate-key-${version}"; - version = "1.0.0"; + version = "1.0.3"; goPackagePath = "github.com/Fullscreen/aws-rotate-key"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "Fullscreen"; repo = "aws-rotate-key"; - sha256 = "13q7rns65cj8b4i0s75dbswijpra9z74b462zribwfjdm29by5k1"; + sha256 = "15na7flc0vp14amaq3116a5glqlb4ydvdlzv0q7mwl73pc38zxn3"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index a037a2e42aaa..ba07f75bb36d 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.3.0"; + version = "0.3.1"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; - sha256 = "0b5gkr5xiqnr9cz5padkkkhm74ia9cb06pkpfi8j642anmq2irf8"; + sha256 = "1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Unprivileged sandboxing tool"; homepage = https://github.com/projectatomic/bubblewrap; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ konimex ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 9cb80eb131c0..631d9cb9628a 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -4,7 +4,7 @@ GEM CFPropertyList (3.0.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - atomos (0.1.2) + atomos (0.1.3) babosa (1.0.2) claide (1.0.2) colored (1.2) @@ -13,20 +13,20 @@ GEM highline (~> 1.7.2) declarative (0.0.10) declarative-option (0.1.0) - domain_name (0.5.20170404) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - dotenv (2.2.2) + dotenv (2.5.0) emoji_regex (0.1.1) excon (0.62.0) - faraday (0.14.0) + faraday (0.15.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - fastimage (2.1.1) - fastlane (2.91.0) + fastimage (2.1.4) + fastlane (2.105.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -41,7 +41,7 @@ GEM faraday_middleware (~> 0.9) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.13.1, < 0.14.0) + google-api-client (>= 0.21.2, < 0.24.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) mini_magick (~> 4.5.1) @@ -50,7 +50,7 @@ GEM multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) public_suffix (~> 2.0.0) - rubyzip (>= 1.1.0, < 2.0.0) + rubyzip (>= 1.2.2, < 2.0.0) security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -59,24 +59,24 @@ GEM tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.5.7, < 2.0.0) - xcpretty (>= 0.2.4, < 1.0.0) + xcodeproj (>= 1.6.0, < 2.0.0) + xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-api-client (0.13.6) + google-api-client (0.23.9) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.5) + googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - googleauth (0.6.2) + signet (~> 0.9) + googleauth (0.6.6) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) - os (~> 0.9) + os (>= 0.9, < 2.0) signet (~> 0.7) highline (1.7.10) http-cookie (1.0.3) @@ -84,60 +84,56 @@ GEM httpclient (2.8.3) json (2.1.0) jwt (2.1.0) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) memoist (0.16.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mini_magick (4.5.1) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nanaimo (0.2.5) - naturally (2.1.0) - os (0.9.6) + nanaimo (0.2.6) + naturally (2.2.0) + os (1.0.0) plist (3.4.0) public_suffix (2.0.5) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - retriable (3.1.1) + retriable (3.1.2) rouge (2.0.7) - rubyzip (1.2.1) + rubyzip (1.2.2) security (0.1.3) - signet (0.8.1) + signet (0.10.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.3) + simctl (1.6.5) CFPropertyList naturally slack-notifier (2.3.2) terminal-notifier (1.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-cursor (0.5.0) - tty-screen (0.6.4) + tty-cursor (0.6.0) + tty-screen (0.6.5) tty-spinner (0.8.0) tty-cursor (>= 0.5.0) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.3.0) + unicode-display_width (1.4.0) word_wrap (1.0.0) - xcodeproj (1.5.7) + xcodeproj (1.6.0) CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.2) + atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.4) - xcpretty (0.2.8) + nanaimo (~> 0.2.6) + xcpretty (0.3.0) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.0) xcpretty (~> 0.2, >= 0.0.7) @@ -149,4 +145,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 1.14.6 + 1.16.3 diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index b9008c919bf3..8aba7524008b 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -1,11 +1,27 @@ -{ lib, bundlerEnv, ruby }: +{ stdenv, bundlerEnv, ruby, makeWrapper }: -bundlerEnv rec { - inherit ruby; +stdenv.mkDerivation rec { + name = "${pname}-${version}"; pname = "fastlane"; - gemdir = ./.; + version = (import ./gemset.nix).fastlane.version; - meta = with lib; { + nativeBuildInputs = [ makeWrapper ]; + + env = bundlerEnv { + name = "${name}-gems"; + inherit pname ruby; + gemdir = ./.; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/fastlane $out/bin/fastlane \ + --set FASTLANE_SKIP_UPDATE_CHECK 1 + ''; + + meta = with stdenv.lib; { description = "A tool to automate building and releasing iOS and Android apps"; longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; homepage = https://github.com/fastlane/fastlane; diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 4a0d0467d804..c2133c7c8c9c 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -11,10 +11,10 @@ atomos = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10z69hjv30r2w5q5wmlf0cq4jv3w744jrac8ylln8sf45ckqj7wk"; + sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; babosa = { source = { @@ -85,18 +85,18 @@ dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; type = "gem"; }; - version = "0.5.20170404"; + version = "0.5.20180417"; }; dotenv = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1f9s04xwa9gcsql734nwxvacgsl1si7xka4g4w3r6d3ab8a274y9"; + sha256 = "1va5y19f7l5jh53vz5vibz618lg8z93k5m2k70l25s9k46v2gfm3"; type = "gem"; }; - version = "2.2.2"; + version = "2.5.0"; }; emoji_regex = { source = { @@ -118,10 +118,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr"; + sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.3"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -144,19 +144,19 @@ fastimage = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0dzv34dgpw1sakj4wdd26dnw1z7iwvwfdvfr9aiirspabibfq6vc"; + sha256 = "0i7p9jgb9x1lxkhkwq8xlq7an5qbgdq6gsyrbs2xnf5ffa8yx1i2"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.4"; }; fastlane = { dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "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" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04k6pn95qbpvbmqxrs4pngvfyk4pifcv8is3819b33p754pkiqrp"; + sha256 = "1fq1zqvwim939klkx2893cbm1v4gi3a991qrj8933l3qg1y41fx2"; type = "gem"; }; - version = "2.91.0"; + version = "2.105.2"; }; gh_inspector = { source = { @@ -167,22 +167,22 @@ version = "1.1.3"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; + dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y"; + sha256 = "1z925kbqyaxdi6ld3gvaqc9527xfi8k3rr6snq5mvx5kibdi072a"; type = "gem"; }; - version = "0.13.6"; + version = "0.23.9"; }; googleauth = { - dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; + dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; + sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.6"; }; highline = { source = { @@ -225,23 +225,6 @@ }; version = "2.1.0"; }; - little-plugger = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; - type = "gem"; - }; - version = "1.1.4"; - }; - logging = { - dependencies = ["little-plugger" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; - type = "gem"; - }; - version = "2.2.2"; - }; memoist = { source = { remotes = ["https://rubygems.org"]; @@ -254,18 +237,18 @@ dependencies = ["mime-types-data"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; type = "gem"; }; - version = "3.1"; + version = "3.2.2"; }; mime-types-data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; type = "gem"; }; - version = "3.2016.0521"; + version = "3.2018.0812"; }; mini_magick = { source = { @@ -302,26 +285,26 @@ nanaimo = { source = { remotes = ["https://rubygems.org"]; - sha256 = "03x5f7hk0s21hlkj309w0qipjxz34kyd3c5yj25zq3s2yyn57idi"; + sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6"; type = "gem"; }; - version = "0.2.5"; + version = "0.2.6"; }; naturally = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0avn8b2qbfm22afln2p7rky73zns8c444mdhdh4ki8hbjsn0f8cx"; + sha256 = "0dzqdawqr4agx7zr1fr5zxdwl8vb5rhpz57l1lk7d2y46ha6l4l7"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; os = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; type = "gem"; }; - version = "0.9.6"; + version = "1.0.0"; }; plist = { source = { @@ -351,10 +334,10 @@ retriable = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar"; + sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; }; rouge = { source = { @@ -367,10 +350,10 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; security = { source = { @@ -384,19 +367,19 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; + sha256 = "14rhv3riz6ki4ix4l79b6ckq7d015673gxkxvzdcxjl1h8plpdcy"; type = "gem"; }; - version = "0.8.1"; + version = "0.10.0"; }; simctl = { dependencies = ["CFPropertyList" "naturally"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l1hwxkbpgfhla6dbf0f6nhj794c0k6ilxlh07zcm8by3vdrsvib"; + sha256 = "0bbvbpdk955q1g797md960fdznw6p6hmj2pc62yrbpvb1ymag1sf"; type = "gem"; }; - version = "1.6.3"; + version = "1.6.5"; }; slack-notifier = { source = { @@ -426,18 +409,18 @@ tty-cursor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmggqwbikamd4qjwvahrv0vpbznm06bqpl498pb5fy3pra2xyxz"; + sha256 = "1f4rsapf4apaxn11xnqrq7axgrlvn6pdlqxqb2g34jnpfh5yrk1i"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; tty-screen = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19iq03prqjbm0nr7yn0181lph52d994jwbcsqss3lwpwkl20s6bv"; + sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; type = "gem"; }; - version = "0.6.4"; + version = "0.6.5"; }; tty-spinner = { dependencies = ["tty-cursor"]; @@ -476,10 +459,10 @@ unicode-display_width = { source = { remotes = ["https://rubygems.org"]; - sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8"; + sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; word_wrap = { source = { @@ -493,19 +476,19 @@ dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "16743g16mrh47f1lxkbw28xn9mmlf1r0zicin4malalsxxkc7ykz"; + sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7"; type = "gem"; }; - version = "1.5.7"; + version = "1.6.0"; }; xcpretty = { dependencies = ["rouge"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b8x9m53a1hbw0lamffjm4m1ydigj3azl97jc5w7prv1bm27s2y3"; + sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; type = "gem"; }; - version = "0.2.8"; + version = "0.3.0"; }; xcpretty-travis-formatter = { dependencies = ["xcpretty"]; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index dede514729ec..6ce42b69f2cf 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,11 +1,13 @@ -{ fetchurl, perl, stdenv }: +{ fetchFromGitHub, perl, stdenv }: stdenv.mkDerivation rec { - name = "sec-2.8.0"; + name = "sec-${meta.version}"; - src = fetchurl { - url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz"; - sha256 = "0q9fhkkh0n0jya4kf5c54smk4xbnv01hqhip2y6fnnj9imwskymz"; + src = fetchFromGitHub { + owner = "simple-evcorr"; + repo = "sec"; + rev = meta.version; + sha256 = "17qzw7k1r3svagaf6jb7166grwqsyxwd6p23b2m9q9h3ggcwynp9"; }; buildInputs = [ perl ]; @@ -20,10 +22,11 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://simple-evcorr.sourceforge.net/; + homepage = https://simple-evcorr.github.io; license = stdenv.lib.licenses.gpl2; description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; + version = "2.8.1"; }; } diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix new file mode 100644 index 000000000000..5410d0c833df --- /dev/null +++ b/pkgs/tools/admin/sewer/default.nix @@ -0,0 +1,26 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "sewer"; + version = "0.6.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "180slmc2zk4mvjqp25ks0j8kd63ai4y77ds5icm7qd7av865rryp"; + }; + + propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ]; + + postPatch = '' + # The README has non-ascii characters which makes setup.py crash. + sed -i 's/[\d128-\d255]//g' README.md + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/komuw/sewer; + description = "ACME client"; + license = licenses.mit; + maintainers = with maintainers; [ kevincox ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 4886217211df..5430c2cb73e7 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { # I think this is a typo and should be CXX? Either way let's kill it sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits + '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace makefile.machine \ + --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ + --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' ''; preConfigure = '' diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index eb544fc693e4..7ef0793a4831 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -4,10 +4,11 @@ , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, fdk_aac , faad2, flac, ladspaH, ffmpeg, frei0r, dssi -, }: +}: let - version = "1.1.1"; + pname = "liquidsoap"; + version = "1.3.4"; packageFilters = map (p: "-e '/ocaml-${p}/d'" ) [ "gstreamer" "shine" "aacplus" "schroedinger" @@ -15,14 +16,21 @@ let ]; in stdenv.mkDerivation { - name = "liquidsoap-full-${version}"; + name = "${pname}-full-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/savonet/liquidsoap/${version}/liquidsoap-${version}-full.tar.gz"; - sha256 = "1w1grgja5yibph90vsxj7ffkpz1sgzmr54jj52s8889dpy609wqa"; + url = "https://github.com/savonet/${pname}/releases/download/${version}/${pname}-${version}-full.tar.bz2"; + sha256 = "11l1h42sljfxcdhddc8klya4bk99j7a1pndwnzvscb04pvmfmlk0"; }; - preConfigure = "sed ${toString packageFilters} PACKAGES.default > PACKAGES"; + preConfigure = /* we prefer system-wide libs */ '' + sed -i "s|gsed|sed|" Makefile + make bootstrap + # autoreconf -vi # use system libraries + + sed ${toString packageFilters} PACKAGES.default > PACKAGES + ''; + configureFlags = [ "--localstatedir=/var" ]; buildInputs = @@ -35,6 +43,8 @@ stdenv.mkDerivation { ocamlPackages.camomile ]; + hardeningDisable = [ "format" "fortify" ]; + meta = with stdenv.lib; { description = "Swiss-army knife for multimedia streaming"; homepage = http://liquidsoap.fm/; diff --git a/pkgs/tools/audio/mpdsync/default.nix b/pkgs/tools/audio/mpdsync/default.nix new file mode 100644 index 000000000000..51f5ba656168 --- /dev/null +++ b/pkgs/tools/audio/mpdsync/default.nix @@ -0,0 +1,24 @@ +{ stdenv, python2, fetchFromGitHub }: +with python2.pkgs; +stdenv.mkDerivation { + name = "mpdsync-2017-06-15"; + + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "mpdsync"; + rev = "da90058f44dd9578cc5f2fb96a1fb2b26da40d07"; + sha256 = "1mfg3ipqj5dvyyqbgp6ia6sc1ja5gmm2c9mfrwx0jw2dl182if6q"; + }; + + pythonPath = [ mpd2 ]; + + nativeBuildInputs = [ + wrapPython + ]; + + dontBuild = true; + + installPhase = "install -D mpdsync.py $out/bin/mpdsync"; + postFixup = "wrapPythonPrograms"; + +} diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index fe2f771c7227..72f6cd03e038 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }: +{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }: python3Packages.buildPythonApplication rec { pname = "borgbackup"; @@ -9,6 +9,15 @@ python3Packages.buildPythonApplication rec { sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc"; }; + patches = [ + # Workarounds for https://github.com/borgbackup/borg/issues/4093 + # Can be deleted when 1.1.8 comes out + (fetchpatch { + url = "https://github.com/borgbackup/borg/commit/975cc33206e0e3644626fb7204c34d2157715b61.patch"; + sha256 = "0b7apaixpa7bk0sy7g5ycm98cjpkg5gkwcgm7m37xj35lzxdlxhc"; + }) + ]; + nativeBuildInputs = with python3Packages; [ # For building documentation: sphinx guzzle_sphinx_theme diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index b870c08d755f..a96326c76cfd 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.5.16"; + version = "2.5.17"; name = "dar-${version}"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "0fy39y6kfda0lvbymc0dblvzmli5y9bq81q0r8fwjzd105qwjmz9"; + sha256 = "1pw6l9nh7w9n7ysh8m6wdzr3k4i9sd6fkmrprnssay5cz7rsbx3v"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 8f2577c43442..f396cbad955d 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }: stdenv.mkDerivation rec { - name = "xorriso-1.4.8"; + name = "xorriso-1.5.0"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "10c44yr3dpmwxa7rf23mwfsy1bahny3jpcg9ig0xjv090jg0d0pc"; + sha256 = "0aq6lvlwlkxz56l5sbvgycr6j5c82ch2bv6zrnc2345ibfpafgx9"; }; doCheck = true; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 7e29ee2b856a..1cd4c30a3886 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "lz4-${version}"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { - sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2"; + sha256 = "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g"; rev = "v${version}"; repo = "lz4"; owner = "lz4"; diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 0bde9b0b26e1..138f727c3d30 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "disorderfs-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz"; - sha256 = "1zx6248cwfcci5555sk9iwl9lz6x8kzc9qgiq4jv04zjiapivdnq"; + sha256 = "0rp789qll5nmzw0jffx36ppcl9flr6hvdz84ah080mvghqkfdq8y"; }; nativeBuildInputs = [ pkgconfig asciidoc ]; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 20e1853a3af6..a1428a257742 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.11.0"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv"; }; diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index f153e59019e3..762368651d70 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.18"; + name = "mtools-4.0.19"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar"; + sha256 = "1pqhv5l4fqj1d3698vajkccz65xqxs3991wpylbw7hm1kqcrgh8v"; }; # Prevents errors such as "mainloop.c:89:15: error: expected ')'" diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a0bf0a434471..102ffae5f9d0 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv, fetchurl, fetchpatch , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz @@ -33,6 +33,15 @@ stdenv.mkDerivation { inherit (s) url sha256; }; + patches = [ + # Remove when updating from 2.47 to 2.48 + # Compatibility with BoehmGC 7.6.8 + (fetchpatch { + url = "https://github.com/vectorgraphics/asymptote/commit/38a59370dc5ac720c29e1424614a10f7384b943f.patch"; + sha256 = "0c3d11hzxxaqh24kfw9y8zvlid54kk40rx2zajx7jwl12gga05s1"; + }) + ]; + preConfigure = '' export HOME="$PWD" patchShebangs . diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/tools/graphics/fbv/default.nix new file mode 100644 index 000000000000..c7fab1710672 --- /dev/null +++ b/pkgs/tools/graphics/fbv/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, getopt, libjpeg, libpng12, libungif }: + +stdenv.mkDerivation rec { + name = "fbv-1.0b"; + + src = fetchurl { + url = "http://s-tech.elsat.net.pl/fbv/${name}.tar.gz"; + sha256 = "0g5b550vk11l639y8p5sx1v1i6ihgqk0x1hd0ri1bc2yzpdbjmcv"; + }; + + buildInputs = [ getopt libjpeg libpng12 libungif ]; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/{bin,man/man1} + ''; + + meta = with stdenv.lib; { + description = "View pictures on a linux framebuffer device"; + homepage = http://s-tech.elsat.net.pl/fbv/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f2be9fafc605..8de7ca3262cf 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -19,11 +19,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.4"; + name = "gnuplot-5.2.5"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1jvh8xmd2cvrhlsg88kxwh55wkwx31sg50v1n59slfippl0g058m"; + sha256 = "1ajw8xcb1kg2vy8n3rhrz71knjr2yivfavv9lqqzvp1dwv6b5783"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index e2688e930cf6..489442e4c2a4 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,24 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat, +{ stdenv, pkgconfig, glib, libxml2, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, ApplicationServices, - python27, libpng ? null + python27, libpng ? null, + fetchFromGitHub, + autoreconfHook, + gtk-doc, + gobjectIntrospection, }: stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.6.5"; + version = "8.7.0"; - src = fetchurl { - url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7"; + src = fetchFromGitHub { + owner = "libvips"; + repo = "libvips"; + rev = "v${version}"; + sha256 = "1dwcpmpqbgb9lkajnqv50mrsn97mxbxpq6b5aya7fgfkgdnrs9sw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobjectIntrospection ]; buildInputs = [ glib libxml2 fftw orc lcms imagemagick openexr libtiff libjpeg libgsf libexif python27 libpng expat ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; + autoreconfPhase = '' + ./autogen.sh + ''; + meta = with stdenv.lib; { homepage = http://www.vips.ecs.soton.ac.uk; description = "Image processing system for large images"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index c5aaa032b40e..b75ce90cf29f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { name = "ibus-typing-booster-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "01kpxplk9nh56f32fkq3nnsqykbzpi7pcxbfp38dq0prgrhw9a6b"; + sha256 = "0qg49d0hsb1mvq33p14nc6mdw6x3km1ax620gphczfmz9ki5bf4g"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index 6e13b4a949c4..95eea7641875 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, libXaw, freetype }: + stdenv.mkDerivation rec { name = "libotf-0.9.16"; @@ -7,8 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ libXaw freetype ]; + postInstall = + '' + mkdir -p $dev/bin + mv $out/bin/libotf-config $dev/bin/ + ''; + meta = { homepage = http://www.nongnu.org/m17n/; description = "Multilingual text processing library (libotf)"; diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix index 719d86b3a389..ec8ac8845597 100644 --- a/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, pkgconfig, perl, systemd }: stdenv.mkDerivation rec { name = "triggerhappy-${version}"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/wertarbyte/triggerhappy/archive/release/${version}.tar.gz"; - sha256 = "af0fc196202f2d35153be401769a9ad9107b5b6387146cfa8895ae9cafad631c"; + src = fetchFromGitHub { + owner = "wertarbyte"; + repo = "triggerhappy"; + rev = "release/${version}"; + sha256 = "0gb1qhrxwq7i5abd408d01a2dpf28nr1fph1fg7w7n0i5i1nnk90"; }; - buildInputs = [ perl ]; - installFlags = [ "DESTDIR=$(out)" ]; + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ systemd ]; - postPatch = '' - substituteInPlace Makefile --replace "/usr/" "/" - substituteInPlace Makefile --replace "/sbin/" "/bin/" - ''; + makeFlags = [ "PREFIX=$(out)" "BINDIR=$(out)/bin" ]; postInstall = '' install -D -m 644 -t "$out/etc/triggerhappy/triggers.d" "triggerhappy.conf.examples" - install -D -m 644 -t "$out/usr/lib/systemd/system" "systemd/triggerhappy.service" "systemd/triggerhappy.socket" - install -D -m 644 -t "$out/usr/lib/udev/rules.d" "udev/triggerhappy-udev.rules" ''; meta = with stdenv.lib; { @@ -34,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/wertarbyte/triggerhappy/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.taha ]; + maintainers = with maintainers; [ jfrankenau taha ]; }; } diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 0eff3f0c3916..5a69a6ae7ad2 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.78"; + version = "1.80"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = version; - sha256 = "030cnvl83hgynri3jimhhqp238375m1g6liqfiggl0habrnlbck2"; + rev = "v${version}"; + sha256 = "0zmkjpv4dbdr29x95j4i585wz4rxwlrkp6ldfr5wiw83h90n0ilp"; }; setSourceRoot = '' diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 582f8d8f05f9..fe8d1a8380fc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) '' rm $out/share/man/man1/* - cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 + cp ${buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 '' # du: 8.7 M locale + 0.4 M man pages + optionalString minimal '' diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 9b52d3fd3608..e33376243bd6 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, autoreconfHook, tzdata }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.5"; name = "dateutils-${version}"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; - sha256 = "0ky8177is4swgxfqczc78d7yjc13w626k515qw517086n7xjxk59"; + sha256 = "1pnbc186mnvmyb5rndm0ym50sjihsy6m6crz62xxsjbxggza1mhn"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ tzdata ]; # needed for datezone + enableParallelBuilding = true; + + doCheck = true; + meta = with stdenv.lib; { description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; homepage = http://www.fresse.org/dateutils/; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 7e98b7d64d2d..f5091ac9720a 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "duc-${version}"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "zevv"; repo = "duc"; rev = "${version}"; - sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif"; + sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix new file mode 100644 index 000000000000..ea08608da01c --- /dev/null +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -0,0 +1,27 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "1.0.0"; + name = "envdir-${version}"; + + goPackagePath = "github.com/d10n/envdir"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "d10n"; + repo = "envdir"; + sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc"; + }; + + preBuild = '' + # TODO: is there a way to get the commit ref so we can set main.buildCommit? + buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") +''; + + meta = { + description = "A go rewrite of envdir"; + homepage = https://github.com/d10n/envdir; + maintainers = with stdenv.lib.maintainers; [ edude03 ]; + }; +} diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix new file mode 100644 index 000000000000..86f78af25603 --- /dev/null +++ b/pkgs/tools/misc/envsubst/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "envsubst-${version}"; + version = "1.1.0"; + + goPackagePath = "github.com/a8m/envsubst"; + src = fetchFromGitHub { + owner = "a8m"; + repo = "envsubst"; + rev = "v${version}"; + sha256 = "1d6nipagjn40n6iw1p3r489l2km5xjd5db9gbh1vc5sxc617l7yk"; + }; + + meta = with lib; { + description = "Environment variables substitution for Go"; + homepage = https://github.com/a8m/envsubst; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ nicknovitski ]; + }; +} diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index f5ba8b7fe100..87e9814d8993 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,12 +1,10 @@ -{stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}: +{ stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }: -let -in stdenv.mkDerivation { name = "grub-0.97-73"; src = fetchurl { - url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; + url = https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; @@ -29,6 +27,8 @@ stdenv.mkDerivation { passthru.grubTarget = ""; meta = with stdenv.lib; { + homepage = https://www.gnu.org/software/grub; + description = "GRand Unified Bootloader"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index d9c255d2a7a8..339c8dea4606 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform +, Security +}: rustPlatform.buildRustPackage rec { name = "hyperfine-${version}"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "hyperfine"; rev = "refs/tags/v${version}"; - sha256 = "13h43sjp059yq3bmdbb9i1082fkx5yzmhrkf5kpkxhnyn67xbdsg"; + sha256 = "06kghk3gmi47c8g28n8srpb578yym104fa30s4m33ajb60fvwlld"; }; - cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s"; + cargoSha256 = "1rwh8kyrkk5jza4lx7sf1pln68ljwsv4ccyfvzcvc140y7ya8ps0"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "Command-line benchmarking tool"; diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 58c9ee770b7f..e97f4048f0ff 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { name = "journaldriver-${version}"; - version = "1.0.0"; - cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k"; + version = "1.1.0"; + cargoSha256 = "03rq96hzv97wh2gbzi8sz796bqgh6pbpvdn0zy6zgq2f2sgkavsl"; src = fetchFromGitHub { - owner = "aprilabank"; + owner = "tazjin"; repo = "journaldriver"; rev = "v${version}"; - sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc"; + sha256 = "0672iq6s9klb1p37hciyl7snbjgjw98kwrbfkypv07lplc5qcnrf"; }; buildInputs = [ openssl systemd ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Log forwarder from journald to Stackdriver Logging"; - homepage = "https://github.com/aprilabank/journaldriver"; + homepage = "https://github.com/tazjin/journaldriver"; license = licenses.gpl3; maintainers = [ maintainers.tazjin ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index c1b99b315677..cfc13b0e108e 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,15 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, utillinux}: stdenv.mkDerivation rec { - version = "5.53"; + version = "6.33"; name = "profile-sync-daemon-${version}"; src = fetchurl { url = "http://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0m7h9l7dndqgb5k3grpc00f6dpg73p6h4q5sgkf8bvyzvcbdafwx"; + sha256 = "0dzs51xbszzmcg82n2dil6nljj4gn0aw9rqjmhyi4a5frc8g6xmb"; }; - installPhase = "PREFIX=\"\" DESTDIR=$out make install-systemd-all"; + installPhase = '' + PREFIX=\"\" DESTDIR=$out make install + substituteInPlace $out/bin/profile-sync-daemon \ + --replace "/usr/" "$out/" \ + --replace "sudo " "/run/wrappers/bin/sudo " + # $HOME detection fails (and is unnecessary) + sed -i '/^HOME/d' $out/bin/profile-sync-daemon + substituteInPlace $out/bin/psd-overlay-helper \ + --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin" + ''; preferLocalBuild = true; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 1753f52ab1b6..fd641ea613d5 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { stripLen = 1; }); + postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) + # XXX: Awful hack to allow cross-compilation. + '' sed -i ./configure \ + -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' + ''; # " + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam ++ stdenv.lib.optional stdenv.isDarwin utmp; diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix new file mode 100644 index 000000000000..e812d6799fea --- /dev/null +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -0,0 +1,41 @@ +{ stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "systrayhelper-${version}"; + version = "0.0.3"; + rev = "0953942245566bf358ba937af840947100380e15"; + + goPackagePath = "github.com/ssbc/systrayhelper"; + + src = fetchFromGitHub { + inherit rev; + owner = "ssbc"; + repo = "systrayhelper"; + sha256 = "12xmzcw94in4m1hl4hbfdsbvkkaqrljgb67b95m1qwkkjak3q9g6"; + }; + + goDeps = ./deps.nix; + + # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178 + # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time. + buildFlagsArray = [ ''-ldflags= + -X main.version=v${version} + -X main.commit=${rev} + -X main.date="nix-byrev" + -s + -w + '' ]; + + nativeBuildInputs = [ pkgconfig libappindicator-gtk3 ]; + buildInputs = [ libappindicator-gtk3 ]; + + meta = with stdenv.lib; { + description = "A systray utility written in go, using json over stdio for control and events"; + homepage = "https://github.com/ssbc/systrayhelper"; + maintainers = with maintainers; [ cryptix ]; + license = licenses.mit; + # It depends on the inputs, i guess? not sure about solaris, for instance. go supports it though + # I hope nix can figure this out?! ¯\\_(ツ)_/¯ + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/systrayhelper/deps.nix b/pkgs/tools/misc/systrayhelper/deps.nix new file mode 100644 index 000000000000..67ec6662d984 --- /dev/null +++ b/pkgs/tools/misc/systrayhelper/deps.nix @@ -0,0 +1,102 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/getlantern/context"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/context"; + rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775"; + sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b"; + }; + } + { + goPackagePath = "github.com/getlantern/errors"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/errors"; + rev = "e24b7f4ff7c70be59bbefca6b7695d68cda8b399"; + sha256 = "1wshagslgl3r07gniq0g55cqgi1j1gk0yrri5ywjz7wm8da42qcr"; + }; + } + { + goPackagePath = "github.com/getlantern/golog"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/golog"; + rev = "cca714f7feb5df8e455f409b549d384441ac4578"; + sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q"; + }; + } + { + goPackagePath = "github.com/getlantern/hex"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/hex"; + rev = "083fba3033ad473db3dd31c9bb368473d37581a7"; + sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77"; + }; + } + { + goPackagePath = "github.com/getlantern/hidden"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/hidden"; + rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7"; + sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi"; + }; + } + { + goPackagePath = "github.com/getlantern/ops"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/ops"; + rev = "37353306c90844c8e0591956f56611f46299d202"; + sha256 = "0q8j2963jqf3p7fcnsfinkvz71mfylrkk2xjar775zjx5a23sa5i"; + }; + } + { + goPackagePath = "github.com/getlantern/systray"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/systray"; + rev = "3fd1443dac5c8297999189fe28d5836b2b075b66"; + sha256 = "1sb11n27zy8xmq0lvrpqikb53425jvwl5617cp201va6iwk1hgnh"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/oxtoacart/bpool"; + fetch = { + type = "git"; + url = "https://github.com/oxtoacart/bpool"; + rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6"; + sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "c059e472caf75dbe73903f6521a20abac245b17f"; + sha256 = "07xg8ym776j2w0k8445ii82lx8yz358cp1z96r739y13i1anqdzi"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0be0721c37eeb5299f245a996a483160fc36940"; + sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12"; + }; + } +] diff --git a/pkgs/tools/misc/teamocil/Gemfile b/pkgs/tools/misc/teamocil/Gemfile new file mode 100644 index 000000000000..046ba3d536e0 --- /dev/null +++ b/pkgs/tools/misc/teamocil/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'teamocil' diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/tools/misc/teamocil/Gemfile.lock new file mode 100644 index 000000000000..419c2ae49d31 --- /dev/null +++ b/pkgs/tools/misc/teamocil/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + teamocil (1.4.2) + +PLATFORMS + ruby + +DEPENDENCIES + teamocil + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix new file mode 100644 index 000000000000..2215e4d4fee7 --- /dev/null +++ b/pkgs/tools/misc/teamocil/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + inherit ruby; + pname = "teamocil"; + gemdir = ./.; + + meta = with lib; { + description = "A simple tool used to automatically create windows and panes in tmux with YAML files"; + homepage = https://github.com/remiprev/teamocil; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ + zachcoyle + ]; + }; +} diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/pkgs/tools/misc/teamocil/gemset.nix new file mode 100644 index 000000000000..f363d62b6d68 --- /dev/null +++ b/pkgs/tools/misc/teamocil/gemset.nix @@ -0,0 +1,10 @@ +{ + teamocil = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l5f33faipb45xx7ds67s7dqgvjlljlcxgpgig4pg8p002vg06r2"; + type = "gem"; + }; + version = "1.4.2"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/teamocil/update b/pkgs/tools/misc/teamocil/update new file mode 100755 index 000000000000..58a7bd4a4539 --- /dev/null +++ b/pkgs/tools/misc/teamocil/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 -rf ~/.gem +fi diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix new file mode 100644 index 000000000000..2d3eb91250a8 --- /dev/null +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "teleconsole-${version}"; + version = "0.4.0"; + + goPackagePath = "github.com/gravitational/teleconsole"; + + src = fetchFromGitHub { + owner = "gravitational"; + repo = "teleconsole"; + rev = version; + sha256 = "01552422n0bj1iaaw6pvg9l1qr66r69sdsngxbcdjn1xh3mj74sm"; + }; + + goDeps = ./deps.nix; + + CGO_ENABLED = 1; + buildFlags = "-ldflags"; + + meta = with stdenv.lib; { + homepage = "https://www.teleconsole.com/"; + description = "Share your terminal session with people you trust"; + license = licenses.asl20; + platforms = platforms.all; + # Builds for Aarch64 not possible in the current release due to + # incompatibilities further up the dependency chain. + # See: + # - https://github.com/gravitational/teleport/issues/679 + # - https://github.com/kr/pty/issues/27 + broken = stdenv.isAarch64; + maintainers = [ maintainers.kimburgess ]; + }; +} diff --git a/pkgs/tools/misc/teleconsole/deps.nix b/pkgs/tools/misc/teleconsole/deps.nix new file mode 100644 index 000000000000..f13529d4b25a --- /dev/null +++ b/pkgs/tools/misc/teleconsole/deps.nix @@ -0,0 +1,13 @@ +[ + # Teleport v2.0.0-alpha.4 required for build. + # See https://github.com/gravitational/teleconsole/blob/09591f227c2a8df4c68af8bc4adfadfc596f4ed2/Makefile#L8 + { + goPackagePath = "github.com/gravitational/teleport"; + fetch = { + type = "git"; + url = "https://github.com/gravitational/teleport"; + rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; + sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; + }; + } +] diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index dd0fb4de702e..fe31d324087c 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.4.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "1ghi6w0cfgs94zlz304q37h3lga2jalfm0hqi3g2060zfdnb96n7"; + sha256 = "087icp1n1qdf53f1314g5biz16sigrnpqr835xqlr6vj85imm2dm"; }; postPatch = '' diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 411e0324457a..70f304134d90 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" }: rustPlatform.buildRustPackage { - name = "uutils-coreutils-2018-02-09"; + name = "uutils-coreutils-2018-09-30"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; - rev = "f333ab26b03294a32a10c1c203a03c6b5cf8a89a"; - sha256 = "0nkggs5nqvc1mxzzgcsqm1ahchh4ll11xh0xqmcljrr5yg1rhhzf"; + rev = "a161b7e803aef08455ae0547dccd9210e38a4574"; + sha256 = "19j40cma7rz6yf5j6nyid8qslbcmrnxdk6by53hflal2qx3g555z"; }; # too many impure/platform-dependent tests doCheck = false; - cargoSha256 = "0qv2wz1bxhm5xhzbic7cqmn8jj8fyap0s18ylia4fbwpmv89nkc5"; + cargoSha256 = "1a9k7i4829plkxgsflmpji3mrw2i1vln6jsnhxmkl14h554yi5j4"; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage { homepage = https://github.com/uutils/coreutils; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8cc224f475b1..9de0f850d49b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.09.26"; + version = "2018.10.05"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0b26cnzdzai82d2bsy91jy1aas8m8psakdrs789xy0v4kwwgrk3n"; + sha256 = "1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index c8c0ba706c36..140e322c862b 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -2,11 +2,11 @@ yubikey-personalization, libu2f-host, libusb1 }: pythonPackages.buildPythonPackage rec { - name = "yubikey-manager-0.7.0"; + name = "yubikey-manager-1.0.0"; srcs = fetchurl { url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz"; - sha256 = "13vvl3jc5wg6d4h5cpaf969apsbf72dxad560d02ly061ss856zr"; + sha256 = "1qdb2b3mv4wafghnmv3sxw4fh7cjc06hnkdimfnwmqcjafzvbawd"; }; propagatedBuildInputs = diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 9c8f8d31c0cc..c65c59265b56 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.2"; + name = "babeld-1.8.3"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "1p751zb7h75f8w7jz37432dj610f432jnj37lxhmav9q6aqyrv87"; + sha256 = "1gb6fcvi1cyl05sr9zhhasqlcbi927sbc2dns1jbnyz029lcb31n"; }; preBuild = '' diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 8f72976d7dce..381489cc4360 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -9,12 +9,12 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "1.8.13"; + version = "1.8.14"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; - sha256 = "2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1"; + sha256 = "1przpp8xp2ygcklz4ypnm6z56nb73ydwksm3yy5fb1dyg0jl0zmi"; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 55abeb4f583d..101f2a635a4b 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -2,10 +2,10 @@ let wrapper = stdenv.mkDerivation rec { name = "wrapper-${version}"; - version = "3.5.32"; + version = "3.5.35"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "1v388p5jjbpwybw0zjv5glzny17fwdwppaci2lqcsnm6qw0667f1"; + sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2"; }; buildInputs = [ jdk ]; buildPhase = '' @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.35"; + name = "i2p-0.9.37"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "02p76vn1777lgv4zs27r6i9s4yk7b2x61b25i8dqmn6j60y3fa4g"; + sha256 = "1lmqdqavy471s187y0lhckznlxx6id6h0dlwlyif2vr8c0pwv2q9"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 3920405fe4d1..9ecf69637872 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "182iwfaz9ar18pqknrg60w89iinj91rn2651yaz2ap77h2a2psvf"; + sha256 = "02zsig63cambwm479ckw4kl1dk00g1q2sbzsvn9vy1xpjy928n7v"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 8029415a98cf..47352d21c4a2 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "inadyn-${version}"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "1h24yavp1246zn5isypvxrilp6xj2266qr52w2r24qxicr8b320y"; + sha256 = "0izhynqfj4xafsrc653wym8arwps0qim203w8l0g5z9vzfxfnvqw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index f794a4e27c7a..f3cd9ea6a819 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,5 +1,10 @@ -{ stdenv, fetchurl, iptables, libuuid, pkgconfig }: +{ stdenv, lib, fetchurl, iptables, libuuid, pkgconfig +, which, iproute, gnused, coreutils, gawk, makeWrapper +}: +let + scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ]; +in stdenv.mkDerivation rec { name = "miniupnpd-2.1"; @@ -10,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ iptables libuuid ]; - nativeBuildInputs= [ pkgconfig ]; + nativeBuildInputs= [ pkgconfig makeWrapper ]; makefile = "Makefile.linux"; @@ -18,6 +23,13 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; + postFixup = '' + for script in $out/etc/miniupnpd/ip{,6}tables_{init,removeall}.sh + do + wrapProgram $script --set PATH '${scriptBinEnv}:$PATH' + done + ''; + meta = with stdenv.lib; { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 60f7b647eea5..8bebe973522b 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.4"; + version = "0.6.5"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "0nip1gmzxq5kak41n0y0qzbhk2876fypk83q14ssy32fk49lxjly"; + sha256 = "0bcbdiik69g6jnravkkid8gxw2akg01i372msc5x1w9fh9wh2phw"; }; patches = [ ./glibc-2.26.patch ]; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 66a306ffb66c..d911acc58f4d 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret +{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret , withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openvpn"; - version = "1.8.4"; + version = "1.8.6"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"; + sha256 = "1ksij9438f2lrwkg287qjlfaxja6jgmqxqap96585r3nf5zj69ch"; }; patches = [ @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { buildInputs = [ openvpn networkmanager ] ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; - nativeBuildInputs = [ intltool pkgconfig libxml2 ]; + nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; configureFlags = [ "--without-libnm-glib" diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 8c4462c36bcf..de2fb1472aa9 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { "--with-openssl-libdir=${openssl.out}/lib" "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" + "--with-yielding-select=yes" ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index a053c82a8264..ea20306e26f2 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex, rdma-core }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }: stdenv.mkDerivation rec { name = "opensm-${version}"; - version = "3.3.20"; + version = "3.3.21"; - src = fetchgit { - url = git://git.openfabrics.org/~halr/opensm.git; - rev = name; - sha256 = "1hlrn5z32yd4w8bj4z6bsfv84pk178s4rnppbabyjqv1rg3c58wl"; + src = fetchFromGitHub { + owner = "linux-rdma"; + repo = "opensm"; + rev = "${version}"; + sha256 = "0iikw28vslxq3baq9qmmw08yay7l524wciz7dv7km09ylcbx23b7"; }; nativeBuildInputs = [ autoconf automake libtool bison flex ]; buildInputs = [ rdma-core ]; - preConfigure = "bash ./autogen.sh"; + preConfigure = '' + patchShebangs ./autogen.sh + ./autogen.sh + ''; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Infiniband subnet manager"; diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index 970844ea6d6d..5e3bf176b2c9 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.2"; + name = "pcapfix-1.1.3"; src = fetchurl { url = "https://f00l.de/pcapfix/${name}.tar.gz"; - sha256 = "0dl6pgqw6d8i5rhn6xwdx7sny16lpf771sn45c3p0l8z4mfzg6ay"; + sha256 = "0f9g6yh1dc7x1n28xs4lcwlk6sa3mpz0rbw0ddhajqidag2k07sr"; }; postPatch = ''sed -i "s|/usr|$out|" Makefile''; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index a0bac7854c1d..676f1d048554 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -31,13 +31,13 @@ let in buildPythonApplication rec { name = "pykms-${version}"; - version = "20171224"; + version = "20180208"; src = fetchFromGitHub { owner = "ThunderEX"; repo = "py-kms"; - rev = "885f67904f002042d7758e38f9c5426461c5cdc7"; - sha256 = "155khy1285f8xkzi6bsqm9vzz043jsjmp039va1qsh675gz3q9ha"; + rev = "a1666a0ee5b404569a234afd05b164accc9a8845"; + sha256 = "17yj5n8byxp09l5zkap73hpphjy35px84wy68ps824w8l0l8kcd4"; }; propagatedBuildInputs = [ argparse pytz ]; @@ -61,8 +61,8 @@ in buildPythonApplication rec { mv * $siteDir for b in client server ; do - chmod 0755 $siteDir/$b.py makeWrapper ${python.interpreter} $out/bin/$b.py \ + --argv0 $b \ --add-flags $siteDir/$b.py done diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix new file mode 100644 index 000000000000..06e5918dccd8 --- /dev/null +++ b/pkgs/tools/networking/quickserve/default.nix @@ -0,0 +1,35 @@ +{ stdenv, makeWrapper, fetchzip, python3, python3Packages, writeScript }: +let + threaded_servers = python3Packages.buildPythonPackage { + name = "threaded_servers"; + src = fetchzip { + url = https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz; + sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf"; + }; + + # stuff we don't care about pacserve + doCheck = false; + }; + wrappedPython = python3.withPackages (_: [ threaded_servers ]); +in stdenv.mkDerivation { + name = "quickserve"; + version = "2018"; + + unpackPhase = ":"; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + makeWrapper ${wrappedPython}/bin/python $out/bin/quickserve \ + --add-flags -mThreadedServers.PeeredQuickserve + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A simple HTTP server for quickly sharing files."; + homepage = https://xyne.archlinux.ca/projects/quickserve/; + license = licenses.gpl2; + maintainers = with maintainers; [ lassulus ]; + }; +} diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 54d54a76fcb3..2eca68a98f68 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git -, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools -, openssh, which, coreutils, iptables, bash }: +{ lib, stdenv, pythonPackages, fetchgit, fetchFromGitHub, makeWrapper, git +, sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils +, iptables, bash }: let sshuttle-telepresence = lib.overrideDerivation sshuttle (p: { @@ -15,47 +15,35 @@ let postPatch = "rm sshuttle/tests/client/test_methods_nat.py"; postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence"; }); -in stdenv.mkDerivation rec { +in pythonPackages.buildPythonPackage rec { pname = "telepresence"; - version = "0.85"; - name = "${pname}-${version}"; + version = "0.93"; src = fetchFromGitHub { owner = "datawire"; repo = "telepresence"; rev = version; - sha256 = "1iypqrx9pnhaz3p5bvl6g0c0c3d1799dv0xdjrzc1z5wa8diawvj"; + sha256 = "1x8yjcqj8v35a5pxy2rxaixbznb4vk8ll958b4l46gnkfxf1kh1d"; }; - buildInputs = [ makeWrapper python3 ]; - - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - mkdir -p $out/libexec $out/bin - - export PREFIX=$out - substituteInPlace ./install.sh \ - --replace "#!/bin/bash" "#!${stdenv.shell}" \ - --replace '"''${VENVDIR}/bin/pip" -q install "git+https://github.com/datawire/sshuttle.git@telepresence"' "" \ - --replace '"''${VENVDIR}/bin/sshuttle-telepresence"' '"${sshuttle-telepresence}/bin/sshuttle-telepresence"' - ./install.sh + buildInputs = [ makeWrapper ]; + postInstall = '' wrapProgram $out/bin/telepresence \ --prefix PATH : ${lib.makeBinPath [ - python3 sshfs-fuse torsocks conntrack-tools sshuttle-telepresence openssh - which coreutils iptables bash ]} ''; + doCheck = false; + meta = { homepage = https://www.telepresence.io/; description = "Local development against a remote Kubernetes or OpenShift cluster"; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index bf039b653cc6..a17f382557ac 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.34"; + version = "1.0.35"; name = "tinc-${version}"; src = fetchurl { url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0"; + sha256 = "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 09c737c048ae..0cc1fb99455a 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; - version = "1.1pre16"; + version = "1.1pre17"; src = fetchgit { rev = "refs/tags/release-${version}"; url = "git://tinc-vpn.org/tinc"; - sha256 = "03dsm1kxagq8srskzg649xyhbdqbbqxc84pdwrz7yakpa9m6225c"; + sha256 = "12abmx9qglchgn94a1qwgzldf2kaz77p8705ylpggzyncxv6bw2q"; }; outputs = [ "out" "man" "info" ]; diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index f8004ad0068d..8e9a88ad6f94 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -1,19 +1,29 @@ -{ stdenv, fetchFromGitHub, makeWrapper, bash, gawk, curl, netcat, ncurses }: +{ stdenv +, bash +, curl +, fetchFromGitHub +, gawk +, host +, lib +, makeWrapper +, ncurses +, netcat +}: stdenv.mkDerivation rec { name = "twa-${version}"; - version = "1.3.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; rev = version; - sha256 = "16x9nzsrf10waqmjm423vx44820c6mls7gxc8azrdqnz18vdy1h4"; + sha256 = "14pwiq1kza92w2aq358zh5hrxpxpfhg31am03b56g6vlvqzsvib7"; }; dontBuild = true; - buildInputs = [ makeWrapper bash gawk curl netcat ]; + buildInputs = [ makeWrapper bash gawk curl netcat host.dnsutils ]; installPhase = '' install -Dm 0755 twa "$out/bin/twa" @@ -22,13 +32,14 @@ stdenv.mkDerivation rec { install -Dm 0644 README.md "$out/share/doc/twa/README.md" wrapProgram "$out/bin/twa" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses host.dnsutils ]} ''; - meta = { + meta = with lib; { description = "A tiny web auditor with strong opinions"; homepage = https://github.com/trailofbits/twa; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ avaq ]; + license = licenses.mit; + maintainers = with maintainers; [ avaq ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 3f1949d4bb68..493f52bd11b1 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180918"; + version = "0.0.20180925"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0ax6wvapzmn52l7js6n416852npgapa9875yl2ixs271y8m9kv40"; + sha256 = "10k63ld0f5q5aykpcrg9m3xmrsf3qmlkvhiv18q73hnky2cjfx62"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index b5d66bec5cca..d0a81140fc83 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -1,20 +1,21 @@ -{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }: +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl +, Security +}: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "nix-index-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; rev = "v${version}"; - sha256 = "17pms3cq3i3jan1irxgqfr3nrjy6zb21y07pwqp9v08hyrjpfqin"; + sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; }; - cargoSha256 = "0b7xwcgjds80g08sx91lqip8syb52n458si4q4xycvvsand5fa10"; + cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl curl]; + buildInputs = [ openssl curl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; postInstall = '' mkdir -p $out/etc/profile.d @@ -23,7 +24,7 @@ buildRustPackage rec { --replace "@out@" "$out" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A files database for nixpkgs"; homepage = https://github.com/bennofs/nix-index; license = with licenses; [ bsd3 ]; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 2acb39c0b732..5ba387a12f82 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.10"; + version = "1.1.11"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs"; + sha256 = "0zr4b3ax8lcd3wkgj1cybs2cqf38br2nvl91qkw9g2jmzlq6bvic"; }; buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ] diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 2391ea1b859b..750539b3ace8 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -27,8 +27,8 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://cfssl.org/; description = "Cloudflare's PKI and TLS toolkit"; - platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ mbrgm ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 3ef07c44f501..a76e88772bcf 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "duo-unix-${version}"; - version = "1.10.4"; + version = "1.10.5"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "1pbl6ii7sh66i277s5mqpnv092jd2q52qis3ar4lwy4mywfvrhjp"; + sha256 = "1h88gwvbh8vwwga7d65iwa9qrmyx23wh5m0rmlv8qbx4fyj7q1f9"; }; buildInputs = [ pam openssl zlib ]; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 143b95d92c40..cc61cce463ce 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.7"; + version = "4.4.8"; src = fetchFromGitHub { - sha256 = "0b1i4slxw1l2p1gpfhd5v6n1fzwi8qwf4gsbxmrbhj9qxi4c73ci"; + sha256 = "0khpkpfnbin46aqnb9xkhh5d89lvsshgp4kqpdgk95l73lx8kdqp"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index eadfbe230b3f..371a7ca67afd 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -4,14 +4,22 @@ stdenv.mkDerivation { name = "gnupg1compat-${gnupg.version}"; builder = writeScript "gnupg1compat-builder" '' + PATH=${coreutils}/bin # First symlink all top-level dirs - ${coreutils}/bin/mkdir -p $out - ${coreutils}/bin/ln -s "${gnupg}/"* $out + mkdir -p $out + ln -s "${gnupg}/"* $out # Replace bin with directory and symlink it contents - ${coreutils}/bin/rm $out/bin - ${coreutils}/bin/mkdir -p $out/bin - ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin + rm $out/bin + mkdir -p $out/bin + ln -s "${gnupg}/bin/"* $out/bin + + # Add symlinks for any executables that end in 2 and lack any non-*2 version + for f in $out/bin/*2; do + [[ -x $f ]] || continue # ignore failed globs and non-executable files + [[ -e ''${f%2} ]] && continue # ignore commands that already have non-*2 versions + ln -s -- "''${f##*/}" "''${f%2}" + done ''; meta = gnupg.meta // { diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 9404cb1d0655..6ae2bbc436ed 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -12,7 +12,8 @@ with stdenv.lib; assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.0.30"; + name = "gnupg-${version}"; + version = "2.0.30"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index ff153fddf4d3..f5b2ba3803c8 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "2.5.0"; + version = "2.6.0"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "kbfs"; rev = "v${version}"; - sha256 = "196w7vvi49xpmzn9d75qr5a1b8w23931544kx9bkc9bbwbjfc4la"; + sha256 = "0i4f1bc0gcnax572s749m7zcpy53a0f9yzi4lwc312zzxi7krz2f"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index beea202a9562..555244bc38cd 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "2.5.0"; + version = "2.7.3"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "0fa55nizld8q0szhlpsf75ifb53js3crh98xmf8mn4bvms7d0x09"; + sha256 = "1sw6v3vf544vp8grw8p287cx078mr9v0v1wffcj6f9p9shlwj7ic"; }; buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index c8bbe42c9d6a..8831f26a42d5 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -38,10 +38,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.5.0-20180807164805.0fda758997"; + version = "2.7.0-20180926133747.0d62c866fc"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "135sm3h5i2h9j06py827psjbhhiqy1mb133s92p7jp6q1mhr8j1x"; + sha256 = "0a0ax3skfw398vcjl7822qp7160lbll1snwdqsa13dy8qrjl1byp"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index 8f087ef3d93c..80398d2d30cb 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, autoconf, pkgconfig, libtool -, bison, flex, libnl, protobuf, protobufc }: +{ stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which +, libnl, protobuf, protobufc }: stdenv.mkDerivation rec { name = "nsjail-${version}"; - version = "2.2"; + version = "2.7"; src = fetchFromGitHub { owner = "google"; repo = "nsjail"; rev = version; fetchSubmodules = true; - sha256 = "11323j5wd02nm8ibvzbzq7dla70bmcldc71lv5bpk4x7h64ai14v"; + sha256 = "13s1bi2b80rlwrgls1bx4bk140qhncwdamm9q51jd677s0i3xg3s"; }; - nativeBuildInputs = [ autoconf libtool pkgconfig ]; - buildInputs = [ bison flex libnl protobuf protobufc ]; + nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ]; + buildInputs = [ libnl protobuf protobufc ]; enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 5b67a6d89ceb..42f1df8b3842 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -6,17 +6,15 @@ let deps = lib.makeBinPath [ wget coreutils ]; in stdenv.mkDerivation rec { - name = "pcsc-tools-1.4.25"; + name = "pcsc-tools-1.5.3"; src = fetchurl { - url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.gz"; - sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9"; + url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2"; + sha256 = "050x3yqd5ywl385zai3k1zhbm2lz1f5ksalfpm9hd86s50f03ans"; }; buildInputs = [ udev dbus perl pcsclite ]; - makeFlags = [ "DESTDIR=$(out)" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/security/sbsigntool/autoconf.patch b/pkgs/tools/security/sbsigntool/autoconf.patch index 27f5b77c8848..f436a73bca72 100644 --- a/pkgs/tools/security/sbsigntool/autoconf.patch +++ b/pkgs/tools/security/sbsigntool/autoconf.patch @@ -1,17 +1,27 @@ -diff -uNr sbsigntool/configure.ac sbsigntool-new/configure.ac ---- sbsigntool/configure.ac 2015-07-05 12:18:18.932717136 +0200 -+++ sbsigntool-new/configure.ac 2015-07-05 14:51:39.659284938 +0200 -@@ -65,7 +65,7 @@ +--- sbsigntools/configure.ac 2018-09-25 10:30:00.878766256 -0500 ++++ configure.ac.new 2018-09-25 10:34:56.231277375 -0500 +@@ -71,15 +71,16 @@ + # no consistent view of where gnu-efi should dump the efi stuff, so find it + ## + for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi; do +- if test -e $path/crt0-efi-$EFI_ARCH.o; then +- CRTPATH=$path ++ if test -e @@NIX_GNUEFI@@/$path/crt0-efi-$EFI_ARCH.o; then ++ CRTPATH=@@NIX_GNUEFI@@/$path ++ break + fi + done + if test -z "$CRTPATH"; then + AC_MSG_ERROR([cannot find the gnu-efi crt path]) + fi - dnl gnu-efi headers require extra include dirs - EFI_ARCH=$(uname -m) -EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \ +EFI_CPPFLAGS="-I@@NIX_GNUEFI@@/include/efi -I@@NIX_GNUEFI@@/include/efi/$EFI_ARCH \ -DEFI_FUNCTION_WRAPPER" CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS" -@@ -74,5 +74,5 @@ - AC_SUBST(EFI_CPPFLAGS, $EFI_CPPFLAGS) +@@ -90,5 +91,5 @@ + AC_SUBST(CRTPATH, $CRTPATH) AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile] - [docs/Makefile tests/Makefile]) diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index cfe54967cce3..4f4cbf4fb6f5 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { name = "sbsigntool-${version}"; - version = "0.5"; + version = "0.9.1"; src = fetchgit { - url = "git://kernel.ubuntu.com/jk/sbsigntool"; - rev = "951ee95a301674c046f55330cd7460e1314deff2"; - sha256 = "1skqrfhvsaay01l94m57sxxqp909rvn07xwmzc6vzzfcnsh6f2yk"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git"; + rev = "v0.9.1"; + sha256 = "098gxmhjn8acxjw5bq59wq4xhgkpx1xn8kjvxwdzpqkwq9ivrsbp"; }; patches = [ ./autoconf.patch ]; @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { prePatch = "patchShebangs ."; nativeBuildInputs = [ autoconf automake pkgconfig help2man ]; - buildInputs = [ utillinux openssl libuuid gnu-efi libbfd ]; + buildInputs = [ openssl libuuid libbfd gnu-efi ]; configurePhase = '' substituteInPlace configure.ac --replace "@@NIX_GNUEFI@@" "${gnu-efi}" - lib/ccan.git/tools/create-ccan-tree --build-type=automake lib/ccan "talloc read_write_all build_assert array_size" + lib/ccan.git/tools/create-ccan-tree --build-type=automake lib/ccan "talloc read_write_all build_assert array_size endian" touch AUTHORS touch ChangeLog diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 4a4b790181d5..ec5eea52a6f8 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "softhsm-${version}"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { url = "https://dist.opendnssec.org/source/${name}.tar.gz"; - sha256 = "01ysfmq0pzr3g9laq40xwq8vg8w135d4m8n05mr1bkdavqmw3ai6"; + sha256 = "1cijq78jr3mzg7jj11r0krawijp99p253f4qdqr94n728p7mdalj"; }; configureFlags = [ diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index a0f7d0f6287f..597047a679bb 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -11,13 +11,13 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1ydnb9z6rd5ck6wza5ir6927xq375i1a9zh5p2xanp29ly6ijiiz"; + sha256 = "0lckpfp1yw6rfq2cardsp2qjiajg706qjk98cycrlsa5nr2csafa"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index c738b611f946..54303d0c177d 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20180810"; + version = "20180927"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1wqy5kizmlk8y92vqhj387j5j9cfzaxxn55r490jxibl1qfr2hr6"; + sha256 = "1c9d505mw1wyga65y4nmiz55gs357z97wnycx77yvjwvi08qsh6w"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 56b7b26c7bd4..3734fefe60a2 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn"; + sha256 = "0nxx2njjp04ik6msfmf07hprw0j88wg04m0q1sf17mhkliw2d78s"; }; postPatch = '' diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 300778c0935e..ba21fabe4350 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.11.4"; + version = "3.12.0"; src = fetchFromGitHub { - sha256 = "1v134lnh035fpgqqqb7cxvyssvvgxvc42649qzqmsw459di9iqv0"; + sha256 = "1bg044j3dv6kcksy3cyda650ara8s4awdf665k10gaaxa0gwn0jj"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 066848ea7be9..af934b54185a 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.56"; + version = "21.57"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "09zc8k1d9l673bb41vjpz3zrzaxaymqgk8m1v7pccvg70rq005kv"; + sha256 = "1zxc26bljhj04mqzpwnqd6zfnz4dd2syapzn8xcakj882v4a8gnz"; }; patchPhase = '' diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index cd6577694890..a578f9db97a6 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.1.2"; + version = "3.1.3"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "00s7qbmywk3wka985lhhki17xs7d0ll8p172avv1pzmdwfrm703n"; + sha256 = "0mxydn6pwdhky659rz6k1jlh95hy43pmz4nx53kligjwy2v060xq"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 6085e6f841ac..7729bae897c0 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,7 +5,8 @@ export PLAN9_TARGET=$PLAN9 configurePhase() { - echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include -I${freetype_dev}/include\" > LOCAL.config + echo CFLAGS=\"-I${fontconfig_dev}/include -I${xproto_exp}/include -I${xextproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config + echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xproto_exp}/lib -L${xextproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config echo X11=\"${libXt_dev}/include\" >> LOCAL.config for f in `grep -l -r /usr/local/plan9`; do diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index dc588e54aea8..c71c70b57a7a 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -2,24 +2,23 @@ , xproto ? null , xextproto ? null , libXext ? null +, zlib ? null # For building web manuals , perl ? null , samChordingSupport ? true #from 9front }: stdenv.mkDerivation rec { - name = "plan9port-2016-04-18"; + name = "plan9port-2018-09-20"; src = fetchgit { # Latest, same as on github, google code is old - url = "https://plan9port.googlesource.com/plan9"; - rev = "35d43924484b88b9816e40d2f6bff4547f3eec47"; - sha256 = "1dvg580rkav09fra2gnrzh271b4fw6bgqfv4ib7ds5k3j55ahcdc"; + url = "https://github.com/9fans/plan9port.git"; + rev = "a82a8b6368274d77d42f526e379b74e79c137e26"; + sha256 = "1icywcnqv0dz1mkm7giakii536nycp0ajxnmzkx4944dxsmhcwq1"; }; - patches = [ - ./fontsrv.patch - ] ++ stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ]; + patches = stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ]; postPatch = '' #hardcoded path @@ -59,11 +58,24 @@ stdenv.mkDerivation rec { homepage = http://swtch.com/plan9port/; description = "Plan 9 from User Space"; license = licenses.lpl-102; - maintainers = with maintainers; [ ftrvxmtrx kovirobi ]; + maintainers = with maintainers; [ bbarker ftrvxmtrx kovirobi ]; platforms = platforms.unix; }; - + + libX11_dev = libX11.dev; libXt_dev = libXt.dev; + libXext_dev = libXext.dev; fontconfig_dev = fontconfig.dev; freetype_dev = freetype.dev; + zlib_dev = zlib.dev; + + xproto_exp = xproto; + xextproto_exp = xextproto; + libX11_exp = libX11; + libXt_exp = libXt; + libXext_exp = libXext; + freetype_exp = freetype; + zlib_exp = zlib; + + fontconfig_lib = fontconfig.lib; } diff --git a/pkgs/tools/system/plan9port/fontsrv.patch b/pkgs/tools/system/plan9port/fontsrv.patch deleted file mode 100644 index 49fd9c04231b..000000000000 --- a/pkgs/tools/system/plan9port/fontsrv.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r dc0640f14d07 src/cmd/mkfile ---- a/src/cmd/mkfile Tue Mar 25 23:23:10 2014 -0400 -+++ b/src/cmd/mkfile Mon Apr 14 22:36:05 2014 +0530 -@@ -4,8 +4,8 @@ - - <$PLAN9/src/mkmany - --BUGGERED='CVS|faces|factotum|fontsrv|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer' --DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` $FONTSRV -+BUGGERED='CVS|faces|factotum|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer' -+DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` - - <$PLAN9/src/mkdirs - diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index a8670203775a..818c76712c7e 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "thermald-${version}"; - version = "1.7.2"; + version = "1.8"; src = fetchFromGitHub { owner = "01org"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "1cs2pq8xvfnsvrhg2bxawk4kn3z1qmfrnpnhs178pvfbglzh15hc"; + sha256 = "1g1l7k8yxj8bl1ysdx8v6anv1s7xk9j072y44gwki70dy48n7j92"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 2db82c36a72a..dd0d1bbc9410 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --replace /usr $out ''; - buildInputs = [ perl gettext ]; + nativeBuildInputs = [ perl gettext ]; meta = with stdenv.lib; { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 42ba36adf310..7e784b917b42 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "LanguageTool-${version}"; - version = "4.2"; + version = "4.3"; src = fetchzip { url = "https://www.languagetool.org/download/${name}.zip"; - sha256 = "01iy3cq6rwkm8sflj2nwp4ib29hyykd23hfsnrmqxji9csj8pf71"; + sha256 = "0zsz82jc39j5wjwynmjny7h82kjz7clyk37n6pxmi85ibbdm0zn4"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix new file mode 100644 index 000000000000..294aa1576801 --- /dev/null +++ b/pkgs/tools/text/link-grammar/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "5.5.1"; + pname = "link-grammar"; + + outputs = [ "bin" "out" "dev" "man" ]; + + src = fetchurl { + url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; + sha256 = "1x8kj1yr3b7b6qrvc5b8mm90ff3m4qdbdqplvzii2xlkpvik92ff"; + }; + + nativeBuildInputs = [ pkgconfig python3 ]; + buildInputs = [ sqlite libedit zlib ]; + + configureFlags = [ + "--disable-java-bindings" + ]; + + meta = with stdenv.lib; { + description = "A Grammar Checking library"; + homepage = https://www.abisource.com/projects/link-grammar/; + license = licenses.lgpl21; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index c7a686201b0d..5f9ca5212d30 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -28,9 +28,11 @@ stdenv.mkDerivation { ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.nicemice.net/par/; description = "Paragraph reflow for email"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + # See https://fedoraproject.org/wiki/Licensing/Par for license details + license = licenses.free; }; } diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index ac90cb556f90..879f903ade97 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, libreoffice, asciidoc, makeWrapper +{ stdenv, fetchurl, python3, libreoffice-unwrapped, asciidoc, makeWrapper # whether to install odt2pdf/odt2doc/... symlinks to unoconv , installSymlinks ? true }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' sed -i "s|/usr/bin/env python.*|${python3}/bin/${python3.executable}|" "$out/bin/unoconv" - wrapProgram "$out/bin/unoconv" --set UNO_PATH "${libreoffice}/lib/libreoffice/program/" + wrapProgram "$out/bin/unoconv" --set UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/" '' + (if installSymlinks then '' make install-links prefix="$out" '' else ""); diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 4271bf095a14..fbd9bc3fa20a 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool to serve ZIM files using HTTP"; homepage = http://git.wikimedia.org/log/openzim; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ robbinch juliendehos ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index bdf074b558e7..270fd7da1717 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz"; - sha256 = "1hhvg9cifx1v8b5i91lgq5cjdcskzl3rz7vwmwdq7ad0nqnykz82"; + url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; + sha256 = "0hcwpyy97afwq40qn8jq75f1b2p0172lil1v0hs9a0rislpqk5nm"; }; postPatch = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { scdoc is a simple man page generator written for POSIX systems written in C99. ''; - homepage = https://git.sr.ht/~sircmpwn/scdoc/; + homepage = https://git.sr.ht/~sircmpwn/scdoc; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 8a01ac744145..f76b71ced3cf 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -235,6 +235,19 @@ in buildEnv { ln -s -t . ../texmf/doc/"$d"/* ) done + '' + + # MkIV uses its own lookup mechanism and we need to initialize + # caches for it. Unsetting TEXMFCNF is needed to let mtxrun + # determine it from kpathsea so that the config path is given with + # "selfautodir:" as it will be in runtime. This is important because + # the cache is identified by a hash of this path. + '' + if [[ -e "$out/bin/mtxrun" ]]; then + ( + unset TEXMFCNF + mtxrun --generate + ) + fi '' + bin.cleanBrokenLinks ; |