diff options
Diffstat (limited to 'pkgs/tools')
38 files changed, 441 insertions, 177 deletions
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index b96235341401..0c64cbefb3ed 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub +{ lib, stdenv, rustPlatform, fetchFromGitLab , xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.4.9"; + version = "0.5.0"; doCheck = false; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "xidlehook"; rev = version; - sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw"; + sha256 = "1qrjwk91i31rww5lwgp84hc4h3b1prm60y45jm1f28g2bbv2qy19"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8"; + cargoSha256 = "1pdhbqnkgwp2v5zyin8z8049aq8c3kfk04v9wsbz8qla34rgi99s"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ]; nativeBuildInputs = [ pkgconfig patchelf ]; diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 2b6877cb25f5..c86a108fc425 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -53,15 +53,20 @@ in rec { }; ansible_2_5 = generic { - version = "2.5.2"; - sha256 = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59"; + version = "2.5.11"; + sha256 = "07rhgkl3a2ba59rqh9pyz1p661gc389shlwa2sw1m6wwifg4lm24"; }; ansible_2_6 = generic { - version = "2.6.2"; - sha256 = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl"; + version = "2.6.7"; + sha256 = "10pakw9k9wd3cy1qk3ah2253ph7c7h3qzpal4k0s5lschzgy2fh0"; }; - ansible2 = ansible_2_6; + ansible_2_7 = generic { + version = "2.7.1"; + sha256 = "0fg95x2nr3j4rwnlyd2n03h91xx9fssi34c32356vk3z6ir395g7"; + }; + + ansible2 = ansible_2_7; ansible = ansible2; } diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 631d9cb9628a..88162a3432d9 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -26,7 +26,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.4) - fastlane (2.105.2) + fastlane (2.107.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -71,10 +71,10 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.9) - googleauth (0.6.6) + googleauth (0.6.7) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - memoist (~> 0.12) + memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) @@ -105,7 +105,7 @@ GEM rouge (2.0.7) rubyzip (1.2.2) security (0.1.3) - signet (0.10.0) + signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) @@ -127,7 +127,7 @@ GEM unf_ext (0.0.7.5) unicode-display_width (1.4.0) word_wrap (1.0.0) - xcodeproj (1.6.0) + xcodeproj (1.7.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index c2133c7c8c9c..5afad1683c99 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -153,10 +153,10 @@ 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 = "1fq1zqvwim939klkx2893cbm1v4gi3a991qrj8933l3qg1y41fx2"; + sha256 = "1d3jv7ik3rivmhxzcapia2lzf9xjmjgi4yxkl60ly6pcbbvhl48w"; type = "gem"; }; - version = "2.105.2"; + version = "2.107.0"; }; gh_inspector = { source = { @@ -179,10 +179,10 @@ dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l"; + sha256 = "1yj7j1rnyamxpn5ybgdgbiw89v9bq2r0h85s2y2jzvqanvm7iflq"; type = "gem"; }; - version = "0.6.6"; + version = "0.6.7"; }; highline = { source = { @@ -367,10 +367,10 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "14rhv3riz6ki4ix4l79b6ckq7d015673gxkxvzdcxjl1h8plpdcy"; + sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4"; type = "gem"; }; - version = "0.10.0"; + version = "0.11.0"; }; simctl = { dependencies = ["CFPropertyList" "naturally"]; @@ -476,10 +476,10 @@ dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7"; + sha256 = "1hy2ihcqfjlsrnf8qkm51m1kk154yp0l0007f269ky8j9z5lyw3p"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; xcpretty = { dependencies = ["rouge"]; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 016ea957f6c7..aa8cc12ece85 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1d5z575vw07jk7528bsqgdd875b3zwayrdnidvxpd2n8j4bip654"; + sha256 = "03ymvfhk8azyvdm6j4pbqx2fsh178kw81yqwkycbhmm6mnyc8yv1"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0ljslvp68ml5mglrl7kakgkqskbzglf3i5jv5d7jld28d0kbzj2c"; + sha256 = "1pw4w3v81mp8alm6vxq10242xxwv8rfs59bjxrmy0pfkjgsr4x4v"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "215.0.0"; + version = "222.0.0"; src = fetchurl (sources name stdenv.hostPlatform.system); diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix new file mode 100644 index 000000000000..be616c1bf9e0 --- /dev/null +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -0,0 +1,83 @@ +{ stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp }: +let + versionMajor = "6.3"; + versionMinor = "6_1"; +in + stdenv.mkDerivation rec { + name = "nomachine-client-${version}"; + version = "${versionMajor}.${versionMinor}"; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_x86_64.tar.gz"; + sha256 = "1035j2z2rqmdfb8cfm1pakd05c575640604b8lkljmilpky9mw5d"; + } + else if stdenv.hostPlatform.system == "i686-linux" then + fetchurl { + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_i686.tar.gz"; + sha256 = "07j9f6mlq9m01ch8ik5dybi283vrp5dlv156jr5n7n2chzk34kf3"; + } + else + throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; + + postUnpack = '' + mv $(find . -type f -name nxclient.tar.gz) . + mv $(find . -type f -name nxplayer.tar.gz) . + rm -r NX/ + tar xf nxclient.tar.gz + tar xf nxplayer.tar.gz + rm $(find . -maxdepth 1 -type f) + ''; + + nativeBuildInputs = [ file makeWrapper autoPatchelfHook ]; + buildInputs = [ jsoncpp ]; + + installPhase = '' + rm bin/nxplayer bin/nxclient + + mkdir -p $out/NX + cp -r bin lib share $out/NX/ + + ln -s $out/NX/bin $out/bin + + for i in share/icons/*; do + if [[ -d "$i" ]]; then + mkdir -p "$out/share/icons/hicolor/$(basename $i)/apps" + cp "$i"/* "$out/share/icons/hicolor/$(basename $i)/apps/" + fi + done + + mkdir $out/share/applications + cp share/applnk/player/xdg/*.desktop $out/share/applications/ + cp share/applnk/client/xdg-mime/*.desktop $out/share/applications/ + + mkdir -p $out/share/mime/packages + cp share/applnk/client/xdg-mime/*.xml $out/share/mime/packages/ + + for i in $out/share/applications/*.desktop; do + substituteInPlace "$i" --replace /usr/NX/bin $out/bin + done + ''; + + postFixup = '' + makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX + makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX + ''; + + dontBuild = true; + dontStrip = true; + + meta = with stdenv.lib; { + description = "NoMachine remote desktop client (nxplayer)"; + homepage = https://www.nomachine.com/; + license = { + fullName = "NoMachine 6 End-User License Agreement"; + url = https://www.nomachine.com/licensing-6; + free = false; + }; + maintainers = with maintainers; [ talyz ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; + } + diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 2d54c182349c..1a215d4ca83b 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.06.23"; + version = "2018.10.25"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0487dlw9v4ayb929w8bk71fs4nbcs1liyk59g6sfr4yn6dx2sl2d"; + sha256 = "0q7yrds1hpis1821mdsz31c2cvn7hs73a10fi1mrk1v4hqql8vv3"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index f24e89fcc840..bf10f556b6bb 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.29.1"; in +let version = "0.29.2"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { repo = "bup"; owner = "bup"; rev = version; - sha256 = "0wdr399jf64zzzsdvldhrwvnh5xpbghjvslr1j2cwr5y4i36znxf"; + sha256 = "17lpbyhf43gcln5s43m2zzgichcx7jq6ragcawfklw6svg1vnj89"; }; buildInputs = [ diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix new file mode 100644 index 000000000000..a8c726c9e161 --- /dev/null +++ b/pkgs/tools/backup/easysnap/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchFromGitHub, zfs }: + +stdenv.mkDerivation rec { + name = "easysnap-${version}"; + version = "unstable-2018-10-28"; + + src = fetchFromGitHub { + owner = "sjau"; + repo = "easysnap"; + rev = "aa2768762da7730aa3eb90fdc2190a8359976edc"; + sha256 = "0csn7capsmlkin4cf1fgl766gvszvqfllqkiyz0g9bvbapxv7nba"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -n easysnap* $out/bin/ + + for i in $out/bin/*; do + substituteInPlace $i \ + --replace zfs ${zfs}/bin/zfs + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/sjau/easysnap; + description = "Customizable ZFS Snapshotting tool with zfs send/recv pulling"; + license = licenses.gpl3; + maintainers = with maintainers; [ sjau ]; + }; + +} diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 0d8f5bfe1bc7..afb6812b3a3a 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { name = "vulkan-tools-${version}"; - version = "1.1.82.0"; + version = "1.1.85.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "1viaqp1zfdgli3hw674rz8mrfzxpgv12vxcd07czwr8nyb19f2g5"; + sha256 = "0f4dfr8g0vy7y1hvs6z9lw52kissailzisby4qnz4akv0zz5y5s5"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 540779477e35..3b6f3c989a33 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true -, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: +, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null +, buildPackages }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh - cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . + cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; preAutoreconf = "touch ChangeLog"; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 4bd4a02c7a2d..d449b3b82f92 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + # https://github.com/NixOS/nixpkgs/issues/49642 + doCheck = !stdenv.isDarwin; + postInstall = '' install -m 444 -Dt $out/share/man/man1 doc/bat.1 diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index dc8f776cef66..b262626b1363 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }: +{ stdenv, fetchurl, xcbuildHook, cf-private, Foundation, AddressBook }: stdenv.mkDerivation rec { version = "1.1a-3"; @@ -10,16 +10,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ Foundation AddressBook ]; + + buildInputs = [ + Foundation AddressBook + # Needed for OBJC_CLASS_$_NSArray symbols. + cf-private + ]; installPhase = '' mkdir -p $out/bin cp Products/Default/contacts $out/bin ''; - ## FIXME: the framework setup hook isn't adding these correctly - NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; - meta = with stdenv.lib; { description = "Access contacts from the Mac address book from command-line"; homepage = http://www.gnufoo.org/contacts/contacts.html; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 48ca8ad65c75..75c7897ac842 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "11x9zqhahgyf0icfnl8xzdb2mn35jrmvxmnz5xzh581mmhs355m2"; + sha256 = "1h7ar1m7w3vmakg9rp1nfmz7q5pqwvd8yyxwj335ixb49gph1zi5"; }; - cargoSha256 = "02r0lvfh37y1bij0fqmgyh8rywap714zvxrk0l108y8cqkq2ghnd"; + cargoSha256 = "0y6xp7fdjfmjfqf9avbq9bdvzvwkf3v1dv7a4k03w5279vxafzi4"; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 3f476cfea941..a692933053df 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -25,10 +25,10 @@ in { aggregates = glPlugin rec { name = "graylog-aggregates-${version}"; pluginName = "graylog-plugin-aggregates"; - version = "2.0.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0crgb49msjkvfpksbfhq2hlkc904j184wm1wp6q0x6lzhn07hm8y"; + sha256 = "0yy455wyr01ci3nqvbhzxs6r4bb3xgac0xcmqaim1wsm1fdfi2ws"; }; meta = { homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; @@ -38,10 +38,10 @@ in { auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "110ag10y0xyf3za6663vf68r5rwdi92315a37vysqvj00y7yak0l"; + sha256 = "0nwzw7ddq2psnvj8jwaxp9i080l7y2daxy198wzb62m7i1srzcp8"; }; meta = { homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; @@ -51,10 +51,10 @@ in { dnsresolver = glPlugin rec { name = "graylog-dnsresolver-${version}"; pluginName = "graylog-plugin-dnsresolver"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "01s7wm6bwcpmdrl35gjp6rrqxixs2s9km2bdgzhv8pn25j5qnw28"; + sha256 = "0djlyd4w4mrrqfbrs20j1xw0fygqsb81snz437v9bf80avmcyzg1"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver; @@ -77,10 +77,10 @@ in { internal-logs = glPlugin rec { name = "graylog-internal-logs-${version}"; pluginName = "graylog-plugin-internal-logs"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "05r4m2gf1hj1b889rmpb6b5a6q2xd0qkl1rpj107yd219j2grzf4"; + sha256 = "1jyy0wkjapv3xv5q957xxv2pcnd4n1yivkvkvg6cx7kv1ip75xwc"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs; @@ -103,10 +103,10 @@ in { jabber = glPlugin rec { name = "graylog-jabber-${version}"; pluginName = "graylog-plugin-jabber"; - version = "2.0.0"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1bqj5g9zjnw08bva7379c2ar3nhmyiilj7kjxd16qvfdn2674r5h"; + sha256 = "0zy27q8y0bv7i5nypsfxad4yiw121sbwzd194jsz2w08jhk3skl5"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-jabber; @@ -168,10 +168,10 @@ in { slack = glPlugin rec { name = "graylog-slack-${version}"; pluginName = "graylog-plugin-slack"; - version = "2.4.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0v8ilfhs8bnx87pjxg1i3p2vxw61rwpg4k3zhga7slavx70y986p"; + sha256 = "067p8g94b007gypwyyi8vb6qhwdanpk8ah57abik54vv14jxg94k"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-slack; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 69d73aafff92..46e460db354f 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala, python3, gnome3, gtk3, granite, gobjectIntrospection, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala_0_40, python3, gnome3, gtk3, granite, gobjectIntrospection, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; - version = "0.2.0"; + version = "1.0.0"; name = "${pname}-${version}"; @@ -10,30 +10,37 @@ stdenv.mkDerivation rec { owner = "artemanufrij"; repo = pname; rev = version; - sha256 = "1d2g7cm7hhs354waidak9xkhhcvqlwnsl9d0bar9p82gfnpjdg7v"; + sha256 = "1ba38qmwdk7vkarsxqn89irbymzx52gbks4isx0klg880xm2z4dv"; }; nativeBuildInputs = [ + desktop-file-utils gobjectIntrospection meson ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + gnome3.libgee granite gtk3 - gnome3.libgee ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + meta = with stdenv.lib; { description = "A simple app for checking usual checksums"; - homepage = https://github.com/artemanufrij/hashit; - license = licenses.gpl2Plus; + homepage = https://github.com/artemanufrij/hashit; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 991066690ee4..0df351bdd560 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.10.4"; + version = "1.11"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "03a2jxv634xy5qwjrk784k3y3pd8f94pndf5m84yg2y7i8dvppnk"; + sha256 = "124n9vgnqqhnwgnms7dqmndp25xrcjaykxrzbi4v4as98kxxi3j1"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/pkgs/tools/misc/openopc/default.nix b/pkgs/tools/misc/openopc/default.nix deleted file mode 100644 index 8d3850745f11..000000000000 --- a/pkgs/tools/misc/openopc/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, python }: - -let - pythonEnv = python.withPackages(ps: [ps.Pyro]); -in stdenv.mkDerivation rec { - name = "openopc-${version}"; - version = "1.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/openopc/openopc/${version}/OpenOPC-${version}.source.tar.bz2"; - sha256 = "0mm77fiipz5zy82l6pr3wk18bfril81milv2rdxr954c4gw5smyd"; - }; - - # There is no setup.py or any other "build system" file in the source archive. - installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/share/doc/openopc" - mkdir -p "$out/${pythonEnv.python.sitePackages}" - mkdir -p "$out/libexec/opc" - - cp src/OpenOPC.py "$out/${pythonEnv.python.sitePackages}" - cp src/opc.py "$out/libexec/opc/" - - cat > "$out/bin/opc" << __EOF__ - #!${stdenv.shell} - export PYTHONPATH="$out/${pythonEnv.python.sitePackages}" - exec ${pythonEnv}/bin/${pythonEnv.python.executable} "$out/libexec/opc/opc.py" "\$@" - __EOF__ - chmod a+x "$out/bin/opc" - - cp -R *.txt doc/* "$out/share/doc/openopc/" - - # Copy these MS Windows tools, for reference. - cp src/OpenOPCService.py src/SystemHealth.py "$out/libexec/opc/" - ''; - - meta = with stdenv.lib; { - description = "OPC (OLE for Process Control) toolkit designed for use with Python"; - homepage = http://openopc.sourceforge.net/; - # """OpenOPC for Python is freely available under the terms of the GNU GPL. - # However, the OpenOPC library module is licensed under the "GPL + linking - # exception" license, which generally means that programs written using the - # OpenOPC library may be licensed under any terms.""" - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 67f805988a3e..3de81d3bd052 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,25 +1,29 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; name = "${pname}-${version}"; - version = "0.1.8"; + version = "0.1.9"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "powerline-rs"; - rev = version; + #rev = version; - sha256 = "018i9qq98afbgv0nxs1n83zb09lqhqxpdrd95f2maic3rr5ngnj5"; + # Support for $COMPLETION_OUT: + rev = "44679385a95dd9f3ebd9b093f9ef8925610e9a23"; + + sha256 = "1mxkw6ydnqjyplbki2j9pbnlhxmkw9qqw54443a3cjmn2g08jyzp"; }; - cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; + cargoSha256 = "1sr9vbfk5bb3n0lv93y19in1clyvbj0w3p1gmp4sbw8lx84zwxhc"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; + COMPLETION_OUT = "out"; postInstall = '' - install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" - install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" + install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/etc/bash_completion.d/${pname}" + install -Dm 755 "${COMPLETION_OUT}/${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index e29e799898c3..5502f2542f12 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip -, rtmpdump }: +, rtmpdump, gitMinimal }: let - inherit (python3Packages) python nose pycrypto requests mock; + inherit (python3Packages) python nose pycrypto pyyaml requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.11"; + version = "2.1"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "14p2362rzyblma9321z4zrcbzfs9m269ry6sz44ly0bv5fik7gdy"; + sha256 = "1cnc32gbhs955391hs1x1jpjsl3b6pqy7ysdydmp9q1i2rw105ln"; }; - pythonPaths = [ pycrypto requests ]; + pythonPaths = [ pycrypto pyyaml requests ]; buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths; - nativeBuildInputs = [ zip ]; + nativeBuildInputs = [ gitMinimal zip ]; postPatch = '' substituteInPlace lib/svtplay_dl/fetcher/rtmp.py \ diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 038b3206ac24..192c5eb0823b 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tmux"; repo = "tmux"; - rev = version; - sha256 = "0n8sjddy00xgh1rvvw968hh72pyslg1gahmzajfc4b3xax87drpi"; + rev = "01918cb0170e07288d3aec624516e6470bf5b7fc"; + sha256 = "1fy87wvxn7r7jzqapvjisc1iizic3kxqk2lv83giqmw1y4g3s7rl"; }; postPatch = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 9de0f850d49b..8c08ee65805c 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,14 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.10.05"; + # The websites youtube-dl deals with are a very moving target. That means that + # downloads break constantly. Because of that, updates should always be backported + # to the latest stable release. + version = "2018.10.29"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw"; + sha256 = "1ndkkpnmjdyz5gjjmvaf18761lxa2c0kypicm9bpqpaj7sdr9s27"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 36bc2a9bc284..73eaa07ac8ff 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "eternal-terminal-${version}"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTCP"; rev = "refs/tags/et-v${version}"; - sha256 = "17ndpkpyh8hwr6v7ac6029sja95nhn9c1g8r93g20rp0vz3r6lpa"; + sha256 = "0fq9a1fn0c77wfpypl3z7y23gbkw295ksy97wi9lhb5zj2m3dkq0"; }; nativeBuildInputs = [ cmake ninja ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; - homepage = https://mistertea.github.io/EternalTCP/; + homepage = https://mistertea.github.io/EternalTerminal/; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.dezgeg ]; }; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index ac69fd992658..56b7320a1b26 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "5.6"; - name = "getmail-${version}"; - namePrefix = ""; + pname = "getmail"; + version = "5.7"; src = fetchurl { - url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6"; + url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz"; + sha256 = "1ygv78ihjyrh60657bl8pc17a5dqawdkfh32h8hrd4kwwxlsd5r4"; }; doCheck = false; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 9ecf69637872..7ab77b2d2ee7 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.21.0"; + version = "2.21.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02zsig63cambwm479ckw4kl1dk00g1q2sbzsvn9vy1xpjy928n7v"; + sha256 = "0j892s9ga9fjc2q1rw3hp5il4mw1jc0aiw60y1rfaiflyv0wd696"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix new file mode 100644 index 000000000000..14f8599f7e97 --- /dev/null +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd +, asciidoctor, python3Packages +}: + +stdenv.mkDerivation rec { + name = "ip2unix-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nixcloud"; + repo = "ip2unix"; + rev = "v${version}"; + sha256 = "1s6gyrrzgifr6gagcw4vx9xznxvdl14y14r0d1xc72j69b00zc4q"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig asciidoctor + python3Packages.pytest python3Packages.pytest-timeout + ]; + + buildInputs = [ libyamlcpp systemd ]; + + doCheck = true; + + meta = { + homepage = https://github.com/nixcloud/ip2unix; + description = "Turn IP sockets into Unix domain sockets"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl3; + maintainers = [ stdenv.lib.maintainers.aszlig ]; + }; +} diff --git a/pkgs/tools/networking/ntp/seccomp.patch b/pkgs/tools/networking/ntp/seccomp.patch index 872bf8e7fcc2..c75536dac7fb 100644 --- a/pkgs/tools/networking/ntp/seccomp.patch +++ b/pkgs/tools/networking/ntp/seccomp.patch @@ -1,7 +1,18 @@ -diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c ---- ntp-4.2.8p10.orig/ntpd/ntpd.c 2017-04-02 20:21:17.371319663 +0200 -+++ ntp-4.2.8p10/ntpd/ntpd.c 2017-04-02 21:26:02.766178723 +0200 -@@ -1157,10 +1157,12 @@ +From 881e427f3236046466bdb8235edf86e6dfa34391 Mon Sep 17 00:00:00 2001 +From: Michael Bishop <cleverca22@gmail.com> +Date: Mon, 11 Jun 2018 08:30:48 -0300 +Subject: [PATCH] fix the seccomp filter to include a few previously missed + syscalls + +--- + ntpd/ntpd.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c +index 2c7f02ec5..4c59dc2ba 100644 +--- a/ntpd/ntpd.c ++++ b/ntpd/ntpd.c +@@ -1140,10 +1140,12 @@ int scmp_sc[] = { SCMP_SYS(close), SCMP_SYS(connect), SCMP_SYS(exit_group), @@ -14,15 +25,16 @@ diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c SCMP_SYS(getsockname), SCMP_SYS(ioctl), SCMP_SYS(lseek), -@@ -1179,6 +1181,7 @@ +@@ -1162,6 +1164,8 @@ int scmp_sc[] = { SCMP_SYS(sendto), SCMP_SYS(setitimer), SCMP_SYS(setsid), -+ SCMP_SYS(setsockopt), ++ SCMP_SYS(setsockopt), ++ SCMP_SYS(openat), SCMP_SYS(socket), SCMP_SYS(stat), SCMP_SYS(time), -@@ -1195,9 +1198,11 @@ +@@ -1178,9 +1182,11 @@ int scmp_sc[] = { SCMP_SYS(clock_settime), SCMP_SYS(close), SCMP_SYS(exit_group), @@ -34,12 +46,12 @@ diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), -@@ -1211,6 +1216,8 @@ +@@ -1194,6 +1200,8 @@ int scmp_sc[] = { SCMP_SYS(select), SCMP_SYS(setitimer), SCMP_SYS(setsid), -+ SCMP_SYS(setsockopt), -+ SCMP_SYS(openat), ++ SCMP_SYS(setsockopt), ++ SCMP_SYS(openat), SCMP_SYS(sigprocmask), SCMP_SYS(sigreturn), SCMP_SYS(socketcall), diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix new file mode 100644 index 000000000000..d84a85071df7 --- /dev/null +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, callPackage, fetchFromGitHub, rustPlatform, darwin }: + +rustPlatform.buildRustPackage rec { + name = "nixdoc-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tazjin"; + repo = "nixdoc"; + rev = "v${version}"; + sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + + cargoSha256 = "1bfn1x1jhpyidai4cjwip5r1ibkqp26ivmqq3vjm71l00m6avb94"; + + meta = with stdenv.lib; { + description = "Generate documentation for Nix functions"; + homepage = https://github.com/tazjin/nixdoc; + license = [ licenses.gpl3 ]; + maintainers = [ maintainers.tazjin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index 90f2ad71fc21..dd7d88ff848c 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "cargo-tree-${version}"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "197kbr7q7aqzv5l8xilz60m50rbkmfwfswyd6ka7w83j5bi88jw3"; + sha256 = "0vr1mv8ns67kslxgwkvic8w86fvmqasxs6yd4yn21j49zg23866k"; }; - cargoSha256 = "1v84cj42ch49jrigrkivg99hzxa79jii8s3fddjk23hi1xx1c35y"; + cargoSha256 = "0924bpcwz15zlp4vjaqap05s4nynw9mqz0np1kph3vx7aj9rsaw6"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 24672296506d..59ec714261b1 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz }: +{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }: rustPlatform.buildRustPackage rec { name = "nix-du-${version}"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; rev = "v${version}"; - sha256 = "1n1qgqjbwbb59xnzgz0dn8h8pckh6yq3crh0w6x2sngijwh678x8"; + sha256 = "1x6qpivxbn94034jfdxb97xi97fhcdv2z7llq2ccfc80mgd0gz8l"; }; - cargoSha256 = "1qidbrkdpf4kliyvy2040qi3a67s8mr2r46rjcblr1v2gar0xgs0"; + cargoSha256 = "0sva4lnhccm6ly7pa6m99s3fqkmh1dzv7r2727nsg2f55prd4kxc"; - # switch to true when nix includes https://github.com/NixOS/nix/pull/2223 and - # https://github.com/NixOS/nix/pull/2234 - doCheck = false; + doCheck = true; checkInputs = [ graphviz ]; buildInputs = [ boost nix - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = with stdenv.lib; { description = "A tool to determine which gc-roots take space in your nix store"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 030571d6a911..ea03570bb3e5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -160,12 +160,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-2.2${suffix}"; - suffix = "pre6520_18b4c53f"; + suffix = "pre6526_9f99d624"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "18b4c53f71dfc626f5f5ffa0282afd1b9faad6a4"; - sha256 = "1hn7bjrf6x7024nald7nk1c9m8fyddkzhazl7pwf6ssmiv12apxh"; + rev = "9f99d62480cf7c58c0a110b180f2096b7d25adab"; + sha256 = "0fkmx7gmgg0yij9kw52fkyvib88hj1jsj90vbpy13ccfwknh1044"; }; fromGit = true; })) // { perl-bindings = perl-bindings { diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 4acdd6cb897e..8168aa94b3d2 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }: +{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses, cf-private }: stdenv.mkDerivation rec { name = "pinentry-mac-0.9.4"; @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ libiconv Cocoa ncurses ]; + + buildInputs = [ + libiconv Cocoa ncurses + # Needed for OBJC_CLASS_$_NSArray symbols. + cf-private + ]; installPhase = '' mkdir -p $out/Applications diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 047706cd8a68..e90517f1581b 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "saml2aws-${version}"; - version = "2.6.1"; + version = "2.10.0"; goPackagePath = "github.com/versent/saml2aws"; goDeps = ./deps.nix; @@ -15,7 +15,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "Versent"; repo = "saml2aws"; - sha256 = "0sg5qm1gyrisna247lmxfgpa22y6rnz9vd6yg92kxlcwr4ji8l1j"; + sha256 = "00m8x57fgry601w5f9dxnxdqbbqjiv7c0rsx47iv9qsp0w7l50c5"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d7344884951c..d43b8598c18b 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -14,11 +14,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.4.8"; + name = "tor-0.3.4.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2"; + sha256 = "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 5789f51abd9c..a5bf2d261e1c 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0a9sxifzsbj24kjnpc0525i91ni2vkwizhgvwx1m9shvfkiisnc6"; }; + patches = [ ./use-source-date-epoch.patch ]; + postPatch = '' substituteInPlace Makefile \ --replace "-static" "" \ diff --git a/pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch b/pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch new file mode 100644 index 000000000000..5a2496d63583 --- /dev/null +++ b/pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch @@ -0,0 +1,75 @@ +diff --git a/src/main.c b/src/main.c +index 14b08d2..e2cc33e 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -3,6 +3,7 @@ + #include <stdbool.h> + #include <stdio.h> + #include <stdlib.h> ++#define __USE_XOPEN + #include <time.h> + #include <unistd.h> + #include "string.h" +@@ -66,10 +67,17 @@ static void parse_preamble(struct parser *p) { + int section = -1; + uint32_t ch; + char date[256]; +- time_t now; +- time(&now); +- struct tm *now_tm = localtime(&now); +- strftime(date, sizeof(date), "%F", now_tm); ++ char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); ++ if (source_date_epoch != NULL) { ++ struct tm source_date_epoch_tm; ++ strptime(source_date_epoch, "%s", &source_date_epoch_tm); ++ strftime(date, sizeof(date), "%F", &source_date_epoch_tm); ++ } else { ++ time_t now; ++ time(&now); ++ struct tm *now_tm = localtime(&now); ++ strftime(date, sizeof(date), "%F", now_tm); ++ } + while ((ch = parser_getch(p)) != UTF8_INVALID) { + if ((ch < 0x80 && isalnum(ch)) || ch == '_' || ch == '-' || ch == '.') { + assert(str_append_ch(name, ch) != -1); +diff --git a/test/preamble b/test/preamble +index 03e2d0c..eeb734b 100755 +--- a/test/preamble ++++ b/test/preamble +@@ -38,31 +38,31 @@ EOF + end 0 + + begin "Writes the appropriate header" +-scdoc <<EOF | grep '^\.TH "test" "8" "'"$(date +'%F')"'"' >/dev/null ++scdoc <<EOF | grep '^\.TH "test" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'"' >/dev/null + test(8) + EOF + end 0 + + begin "Preserves dashes" +-scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'"' >/dev/null ++scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'"' >/dev/null + test-manual(8) + EOF + end 0 + + begin "Handles extra footer field" +-scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'" "Footer"' >/dev/null ++scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'" "Footer"' >/dev/null + test-manual(8) "Footer" + EOF + end 0 + + begin "Handles both extra fields" +-scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'" "Footer" "Header"' >/dev/null ++scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'" "Footer" "Header"' >/dev/null + test-manual(8) "Footer" "Header" + EOF + end 0 + + begin "Emits empty footer correctly" +-scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'" "" "Header"' >/dev/null ++scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'" "" "Header"' >/dev/null + test-manual(8) "" "Header" + EOF + end 0 diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index f76b71ced3cf..ea2926748198 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -218,9 +218,30 @@ in buildEnv { ln -sv "$(realpath $s)" "$out/bin/$tName" # wrapped below done ) + '' + + # A hacky way to provide repstopdf + # * Copy is done to have a correct "$0" so that epstopdf enables the restricted mode + # * ./bin/repstopdf needs to be a symlink to be processed by wrapBin + '' + if [[ -e ./bin/epstopdf ]]; then + cp $(realpath ./bin/epstopdf) ./share/texmf/scripts/repstopdf + ln -s "$out"/share/texmf/scripts/repstopdf ./bin/repstopdf + fi + '' + + # finish up the wrappers + '' rm "$out"/bin/*-sys wrapBin '' + + # Perform a small test to verify that the restricted mode get enabled when + # needed (detected by checking if it disallows --gscmd) + '' + if [[ -e ./bin/epstopdf ]]; then + echo "Testing restricted mode for {,r}epstopdf" + ! (epstopdf --gscmd echo /dev/null 2>&1 || true) | grep forbidden + (repstopdf --gscmd echo /dev/null 2>&1 || true) | grep forbidden + fi + '' + # TODO: a context trigger https://www.preining.info/blog/2015/06/debian-tex-live-2015-the-new-layout/ # http://wiki.contextgarden.net/ConTeXt_Standalone#Unix-like_platforms_.28Linux.2FMacOS_X.2FFreeBSD.2FSolaris.29 diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 701850758bcb..74f4c562102c 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, autoreconfHook, zlib, darwin }: +{ stdenv, fetchhg, autoreconfHook, zlib, cf-private, Cocoa }: stdenv.mkDerivation rec { name = "atomicparsley-${version}"; @@ -9,10 +9,14 @@ stdenv.mkDerivation rec { sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm"; }; - buildInputs = - [ autoreconfHook - zlib - ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ zlib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + Cocoa + # Needed for OBJC_CLASS_$_NSDictionary symbols. + cf-private + ]; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; |