diff options
Diffstat (limited to 'pkgs/tools')
38 files changed, 366 insertions, 188 deletions
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/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/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/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/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/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 e94f255f7224..de97e94ae42e 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 3a4c7813c695..270fd7da1717 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "scdoc-${version}"; version = "1.5.1"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/scdoc"; - rev = version; - sha256 = "0fm3x6ma1pzlajfcy32ayqrcab8lwl64nxfaqgc6019mxw87y1ja"; + src = fetchurl { + url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; + sha256 = "0hcwpyy97afwq40qn8jq75f1b2p0172lil1v0hs9a0rislpqk5nm"; }; postPatch = '' @@ -26,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 ]; |