diff options
Diffstat (limited to 'nixpkgs/pkgs/tools')
110 files changed, 1086 insertions, 566 deletions
diff --git a/nixpkgs/pkgs/tools/X11/primus/lib.nix b/nixpkgs/pkgs/tools/X11/primus/lib.nix index 5c4c65bc17a2..13d7e06c7304 100644 --- a/nixpkgs/pkgs/tools/X11/primus/lib.nix +++ b/nixpkgs/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, libX11, libGL, mesa_noglu +, libX11, libGL, mesa , nvidia_x11 ? null , libglvnd }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { makeFlags = [ "LIBDIR=$(out)/lib" "PRIMUS_libGLa=${aPackage}/lib/libGL.so" "PRIMUS_libGLd=${libGL}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so" + "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" ]; installPhase = '' diff --git a/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix b/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix index 1d4786bd6ecc..a7a7c2b6c0d5 100644 --- a/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix +++ b/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xsecurelock-${version}"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; rev = "v${version}"; - sha256 = "17666b0ah5pfspxbfx9cw3lfmzx6b47r54bacwzzhfq6wbw6ci6k"; + sha256 = "1l9xk3hb5fxp4sqlxjldm4j6cvmxa39a7a37hw8f7vbpmcqy6n6w"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/X11/xtrace/default.nix b/nixpkgs/pkgs/tools/X11/xtrace/default.nix index 1905ed9752ca..8db15a8f0334 100644 --- a/nixpkgs/pkgs/tools/X11/xtrace/default.nix +++ b/nixpkgs/pkgs/tools/X11/xtrace/default.nix @@ -1,31 +1,30 @@ -{ stdenv, autoreconfHook, fetchgit, libX11, xauth, makeWrapper }: +{ stdenv, autoreconfHook, fetchFromGitLab, libX11, xauth, makeWrapper }: -let version = "1.3.1"; in -stdenv.mkDerivation { - name = "xtrace-${version}"; - src = fetchgit { - url = "git://git.debian.org/xtrace/xtrace.git"; - rev = "refs/tags/xtrace-1.3.1"; - sha256 = "1g26hr6rl7bbb9cwqk606nbbapslq3wnsy8j28azrgi8hgfqhjfi"; +stdenv.mkDerivation rec { + pname = "xtrace"; + version = "1.4.0"; + + src = fetchFromGitLab rec { + domain = "salsa.debian.org"; + owner = "debian"; + repo = pname; + rev = "xtrace-${version}"; + sha256 = "1yff6x847nksciail9jly41mv70sl8sadh0m5d847ypbjmxcwjpq"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 makeWrapper ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ libX11 ]; - preConfigure = '' - ./autogen.sh + postInstall = '' + wrapProgram "$out/bin/xtrace" \ + --prefix PATH ':' "${xauth}/bin" ''; - postInstall = - '' wrapProgram "$out/bin/xtrace" \ - --prefix PATH ':' "${xauth}/bin" - ''; - - meta = { - homepage = http://xtrace.alioth.debian.org/; + meta = with stdenv.lib; { + homepage = "https://salsa.debian.org/debian/xtrace"; description = "Tool to trace X11 protocol connections"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/tools/admin/dehydrated/default.nix b/nixpkgs/pkgs/tools/admin/dehydrated/default.nix index c9c879becaa0..699c86b5fe31 100644 --- a/nixpkgs/pkgs/tools/admin/dehydrated/default.nix +++ b/nixpkgs/pkgs/tools/admin/dehydrated/default.nix @@ -1,7 +1,7 @@ { stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: let pkgName = "dehydrated"; - version = "0.6.2"; + version = "0.6.5"; in stdenv.mkDerivation rec { name = pkgName + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "lukas2511"; repo = "dehydrated"; rev = "v${version}"; - sha256 = "19d4kam0dl6l9wfd0v54w4d085jdgi1ljksnqpjj67d6sm23f2l4"; + sha256 = "14k7ykry16zp09i0bqb5pqaclvnjcb6p3x8knm9v5q0bdvlplkjv"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index e04e49c62e74..1370049d42bc 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "eksctl"; - version = "0.1.35"; + version = "0.1.38"; src = fetchFromGitHub { owner = "weaveworks"; repo = "eksctl"; rev = version; - sha256 = "0b3s7vh85k68wawmsdp96q9l4yhikwhyjn1c7cwxys0aia4i8wkv"; + sha256 = "1nhsy4d1a1vh7g2ibcxnzgxnldfyh51hiq4v4vy123487b6ndqd0"; }; goPackagePath = "github.com/weaveworks/eksctl"; diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 3abd189d0f97..0b3b5d287271 100644 --- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -36,16 +36,18 @@ in stdenv.mkDerivation rec { buildInputs = [ python makeWrapper ]; - phases = [ "installPhase" "fixupPhase" ]; + doBuild = false; + + patches = [ + ./gcloud-path.patch + ]; installPhase = '' - mkdir -p "$out" - tar -xzf "$src" -C "$out" google-cloud-sdk + mkdir -p $out/google-cloud-sdk + cp -R * .install $out/google-cloud-sdk/ - mkdir $out/google-cloud-sdk/lib/surface/alpha + mkdir -p $out/google-cloud-sdk/lib/surface/{alpha,beta} cp ${./alpha__init__.py} $out/google-cloud-sdk/lib/surface/alpha/__init__.py - - mkdir $out/google-cloud-sdk/lib/surface/beta cp ${./beta__init__.py} $out/google-cloud-sdk/lib/surface/beta/__init__.py # create wrappers with correct env @@ -68,8 +70,8 @@ in stdenv.mkDerivation rec { disable_update_check = true" >> $out/google-cloud-sdk/properties # setup bash completion - mkdir -p "$out/etc/bash_completion.d/" - mv "$out/google-cloud-sdk/completion.bash.inc" "$out/etc/bash_completion.d/gcloud.inc" + mkdir -p $out/etc/bash_completion.d + mv $out/google-cloud-sdk/completion.bash.inc $out/etc/bash_completion.d/gcloud.inc # This directory contains compiled mac binaries. We used crcmod from # nixpkgs instead. diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch new file mode 100644 index 000000000000..64ec6cdb1b65 --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch @@ -0,0 +1,47 @@ +From b69fee70154a861637c82e98e18be01bbb96423b Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Wed, 12 Jun 2019 17:03:09 +0200 +Subject: [PATCH] kubeconfig: don't store absolute path to gcloud binary +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The `gcloud beta container clusters get-credentials $cluster \ +--region $region --project $project` +command can be used to write kubectl config files. + +In that file, normally the absolute path to the `gcloud` binary is +stored. + +This is a bad idea in NixOS. We might eventually garbage-collect that +specific gcloud binary - and in general, would expect a nix-shell +provided gcloud to be used. + +In its current state, token renewal would just start to break with the +following error message: + +Unable to connect to the server: error executing access token command "/nix/store/…/gcloud config config-helper --format=json": err=fork/exec /nix/store/…/gcloud: no such file or directory output= stderr= + +Avoid this by storing just `gcloud` inside `cmd-path`, which causes +kubectl to lookup the gcloud command from $PATH, which is more likely to +keep working. +--- + lib/googlecloudsdk/api_lib/container/kubeconfig.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/lib/googlecloudsdk/api_lib/container/kubeconfig.py +index 4330988d6..37424b841 100644 +--- a/lib/googlecloudsdk/api_lib/container/kubeconfig.py ++++ b/lib/googlecloudsdk/api_lib/container/kubeconfig.py +@@ -255,7 +255,7 @@ def _AuthProvider(name='gcp'): + raise Error(SDK_BIN_PATH_NOT_FOUND) + cfg = { + # Command for gcloud credential helper +- 'cmd-path': os.path.join(sdk_bin_path, bin_name), ++ 'cmd-path': bin_name, + # Args for gcloud credential helper + 'cmd-args': 'config config-helper --format=json', + # JSONpath to the field that is the raw access token +-- +2.21.0 + diff --git a/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 0251c5494c46..12734cdcf9a6 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "0.17.14"; + version = "0.17.17"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "0pqmmd0p000qax5y1z83h6k292yad0cm8i1s4kb4z2kddn0p9nnv"; + sha256 = "1h1z8bngix1gvma3hahfyprrx3af5yncgvrsvr1cdsaa79bzvc5c"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "0cgc41l8jf7raqqkdpn3yapvllmr43v17wly0rxqk47csh8905hd"; + sha256 = "0pipykwpqqnhqg28s27lnkbrm55rshf25ikil7ycwq05p9ynf5gq"; }; }; diff --git a/nixpkgs/pkgs/tools/admin/sec/default.nix b/nixpkgs/pkgs/tools/admin/sec/default.nix index 6ce42b69f2cf..f6f5923eb4ab 100644 --- a/nixpkgs/pkgs/tools/admin/sec/default.nix +++ b/nixpkgs/pkgs/tools/admin/sec/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "simple-evcorr"; repo = "sec"; rev = meta.version; - sha256 = "17qzw7k1r3svagaf6jb7166grwqsyxwd6p23b2m9q9h3ggcwynp9"; + sha256 = "025cz3mr5yrdgs0i3h8v2znhvjkyh78kba1rzvl03ns2b1c49168"; }; buildInputs = [ perl ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; - version = "2.8.1"; + version = "2.8.2"; }; } diff --git a/nixpkgs/pkgs/tools/archivers/unp/default.nix b/nixpkgs/pkgs/tools/archivers/unp/default.nix index 79c8e2f20ecc..6880a49b4db7 100644 --- a/nixpkgs/pkgs/tools/archivers/unp/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unp/default.nix @@ -1,11 +1,16 @@ -{ stdenv, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }: +{ stdenv, lib, fetchurl, makeWrapper, perl +, unzip, gzip, file +# extractors which are added to unp’s PATH +, extraBackends ? [] +}: -stdenv.mkDerivation rec { +let + runtime_bins = [ file unzip gzip ] ++ extraBackends; + +in stdenv.mkDerivation rec { name = "unp-${version}"; version = "2.0-pre7"; - - runtime_bins = [ file unrar unzip gzip ] ++ extraBackends; - buildInputs = [ perl makeWrapper ] ++ runtime_bins; + buildInputs = [ perl makeWrapper ]; src = fetchurl { # url = "http://http.debian.net/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2"; @@ -18,10 +23,10 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' mkdir -p $out/bin - mkdir -p $out/share/man - cp unp $out/bin/ - cp ucat $out/bin/ - cp debian/unp.1 $out/share/man + mkdir -p $out/share/man/man1 + install ./unp $out/bin/unp + install ./ucat $out/bin/ucat + cp debian/unp.1 $out/share/man/man1 wrapProgram $out/bin/unp \ --prefix PATH : ${lib.makeBinPath runtime_bins} diff --git a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 9082ac329eb3..e9727e101a06 100644 --- a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.06.06"; + version = "2019.06.14"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "1vmz2vj6asvy254y2ap89ah46lxr4pcw7bb827wrs3rzcysmcwjf"; + sha256 = "1z503k2j6504h4p205q7wjrvh5x9jhkvsapfz322m3r905l2vc2b"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix b/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix index ba3437c08cdb..f7e96971ab19 100644 --- a/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix +++ b/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix @@ -9,13 +9,15 @@ python3.pkgs.buildPythonApplication rec { sha256 = "5b2e9fdde8781a6d226984f0b61add2415a3804123ceeecb20fcc8527de9389d"; }; + patches = [ ./loguru.patch ]; + propagatedBuildInputs = with python3.pkgs; [ appdirs audio-metadata google-music google-music-proto google-music-utils - #loguru + loguru pendulum natsort tomlkit @@ -29,6 +31,5 @@ python3.pkgs.buildPythonApplication rec { description = "A CLI utility for interacting with Google Music"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; - broken = true; # 2019-03-15, missing dependency loguru }; } diff --git a/nixpkgs/pkgs/tools/audio/google-music-scripts/loguru.patch b/nixpkgs/pkgs/tools/audio/google-music-scripts/loguru.patch new file mode 100644 index 000000000000..141ce044c431 --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/google-music-scripts/loguru.patch @@ -0,0 +1,22 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -24,7 +24,7 @@ audio-metadata = "^0.4" + google-music = "^3.0" + google-music-proto = "^2.4" + google-music-utils = "^2.1" +-loguru = "^0.2" ++loguru = "^0.3" + pendulum = "^2.0" + natsort = ">=5.0,<7.0" + tomlkit = "^0.5" +--- a/setup.py ++++ b/setup.py +@@ -16,7 +16,7 @@ install_requires = \ + 'google-music-proto>=2.4,<3.0', + 'google-music-utils>=2.1,<3.0', + 'google-music>=3.0,<4.0', +- 'loguru>=0.2,<0.3', ++ 'loguru>=0.3,<0.4', + 'natsort>=5.0,<7.0', + 'pendulum>=2.0,<3.0', + 'tomlkit>=0.5,<0.6'] diff --git a/nixpkgs/pkgs/tools/audio/video2midi/default.nix b/nixpkgs/pkgs/tools/audio/video2midi/default.nix new file mode 100644 index 000000000000..4452aea280a6 --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/video2midi/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python2Packages, opencv3 }: + +let + opencv3_ = python2Packages.toPythonModule (opencv3.override { + enablePython = true; + pythonPackages = python2Packages; + enableFfmpeg = true; + }); +in stdenv.mkDerivation rec { + pname = "video2midi"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "svsdval"; + repo = pname; + rev = version; + sha256 = "00ms9iqam3ml6fxf8djki3gyifn8sfzfkkfrdgrvs0sq47wrkc39"; + }; + + pythonPath = with python2Packages; [ opencv3_ midiutil pygame pyopengl ]; + nativeBuildInputs = with python2Packages; [ python wrapPython ]; + + installPhase = '' + install -Dm755 v2m.py $out/bin/v2m.py + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Youtube synthesia video to midi conversion tool"; + homepage = src.meta.homepage; + license = licenses.gpl3; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/backup/duplicati/default.nix b/nixpkgs/pkgs/tools/backup/duplicati/default.nix index d36ef7ea64fb..c774711b874c 100644 --- a/nixpkgs/pkgs/tools/backup/duplicati/default.nix +++ b/nixpkgs/pkgs/tools/backup/duplicati/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "duplicati-${version}"; - version = "2.0.3.3"; + version = "2.0.4.5"; channel = "beta"; - build_date = "2018-04-02"; + build_date = "2018-11-28"; src = fetchzip { url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - sha256 = "0hwdpsgrvm3gq648mg9g0z0rk49g71dd8r5i1a8w83pwdqv0hn9c"; + sha256 = "118rhzm8vk1092214vq7kxnmrnz4jl32lk8j90965a8pg05m53gn"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/backup/iceshelf/default.nix b/nixpkgs/pkgs/tools/backup/iceshelf/default.nix new file mode 100644 index 000000000000..546339ca002a --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/iceshelf/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, git, awscli, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "iceshelf"; + version = "unstable-2019-07-03"; + + format = "other"; + + src = fetchFromGitHub { + owner = "mrworf"; + repo = pname; + rev = "26768dde3fc54fa412e523eb8f8552e866b4853b"; + sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm"; + }; + + propagatedBuildInputs = [ + git + awscli + python3.pkgs.python-gnupg + ]; + + installPhase = '' + mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages} + cp -v iceshelf iceshelf-restore $out/bin + cp -v iceshelf.sample.conf $out/share/doc/${pname}/ + cp -rv modules $out/${python3.sitePackages} + ''; + + meta = with lib; { + description = "A simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage"; + license = licenses.lgpl2; + homepage = "https://github.com/mrworf/iceshelf"; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix index 5c44ef239630..5fc614de4a7f 100644 --- a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "avfs-${version}"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; - sha256 = "1hz39f7p5vw647xqk161v3nh88qnd599av6nfidpmkh1d9vkl6jc"; + sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix b/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix index cb17a10cb738..6ecc65149c49 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix @@ -167,6 +167,7 @@ stdenv.mkDerivation { license = licenses.lgpl21; maintainers = with maintainers; [ adev ak ]; platforms = platforms.unix; + broken = true; }; passthru.version = version; diff --git a/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/nixpkgs/pkgs/tools/filesystems/f3/default.nix index 7fb9ed3c97ae..598263c8895e 100644 --- a/nixpkgs/pkgs/tools/filesystems/f3/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/f3/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "f3"; - version = "7.1"; + version = "7.2"; enableParallelBuilding = true; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "AltraMayor"; repo = pname; rev = "v${version}"; - sha256 = "0zglsmz683jg7f9wc6vmgljyg9w87pbnjw5x4w6x02w8233zvjqf"; + sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy"; }; buildInputs = [ parted udev ]; diff --git a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index a5f5f632c682..dbdd0bf1790e 100644 --- a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.4"; + version = "0.4.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1hm1swgv9fi4kdwqssb6rh83i62qyfzv0yrh0z73kwrwdbqbg8m9"; + sha256 = "1qjkzpxv7zy9i6lvcrn8yp8dfsqak6c7ffx8g0xfavdx7am458ns"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix index ed4a271acd3c..43c7c167b5ef 100644 --- a/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.27.1"; + version = "2.28.1"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "0p8yb9dbbjp388kdi86lg1rg2zdqbjr0q5ka1f04h64s8vmkw41l"; + sha256 = "18yc80ccpqf785gah5xw6jg5524wfra8bf3pcjr7idzdz4ca7nvf"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index 102ffae5f9d0..1d77bfe42500 100644 --- a/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, fetchpatch , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv + , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin }: @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut libGLU libGL mesa_noglu.osmesa ] + [ freeglut libGLU libGL mesa.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; diff --git a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index 566d6f48e1cc..1331e38aef7e 100644 --- a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, - python27, wayland, udev, mesa_noglu, wafHook }: + python27, wayland, udev, mesa, wafHook }: stdenv.mkDerivation rec { name = "glmark2-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu + libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa ]; wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; diff --git a/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix b/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix index 4f3e5271183d..2a467854cf0f 100644 --- a/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pstoedit-3.73"; + name = "pstoedit-3.74"; src = fetchurl { url = "mirror://sourceforge/pstoedit/${name}.tar.gz"; - sha256 = "147jkgvm9n6mbkl6ndqnm9x74x5y9agbxkfwj0jrw6yxyhxx2cdd"; + sha256 = "034rcrsi69vyh01rcqh7jy3bw4la4m6jl4niav4c6wrs9bx44cim"; }; # diff --git a/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/nixpkgs/pkgs/tools/graphics/scrot/default.nix index e3c7254457db..035e135a2e40 100644 --- a/nixpkgs/pkgs/tools/graphics/scrot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/scrot/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://linuxbrit.co.uk/scrot/; description = "A command-line screen capture utility"; platforms = platforms.linux; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index c762334c1b75..2b2cc1a34992 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/nixpkgs/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.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "09zlrkbv1bh6h08an5wihbsl8qqawxhdp2vcbjqrx2v8gqm1zidm"; + sha256 = "0013njl539knp78iciv860fkpl15bkwarjwd2vjrmr5dbb0h15yc"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index 14835b9dd67e..8a269e3eb4b3 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.2.7"; + version = "3.2.8"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0dnxas0nca10vbqgspy27gn81izrpl5nqy66zxbkh4pfxmi7zqdk"; + sha256 = "1ymyl12fzxc5jjfbw4pfmgzp036w0dai76f7anilw2bnwfzq5g62"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/catimg/default.nix b/nixpkgs/pkgs/tools/misc/catimg/default.nix index 1d85fdfd292c..ac2f3f3411a2 100644 --- a/nixpkgs/pkgs/tools/misc/catimg/default.nix +++ b/nixpkgs/pkgs/tools/misc/catimg/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "catimg"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "posva"; repo = pname; rev = version; - sha256 = "0n74iczzgxrcq3zpa7ndycb9rinm829yvf81c747q4ngv5q6pzcm"; + sha256 = "0g9ywbgy162wiam9hc3yqpq5q4gyxa8fj4jskr3fdz8z8jjaabzz"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index f83a2b940719..c80bb64d0bbd 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh + # Some target platforms, especially when building inside a container have + # issues with the inotify test. + sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail-2/inotify-dir-recreate.sh + # sandbox does not allow setgid sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh substituteInPlace ./tests/install/install-C.sh \ diff --git a/nixpkgs/pkgs/tools/misc/dbacl/default.nix b/nixpkgs/pkgs/tools/misc/dbacl/default.nix index 747d7b26669b..9107debfd12c 100644 --- a/nixpkgs/pkgs/tools/misc/dbacl/default.nix +++ b/nixpkgs/pkgs/tools/misc/dbacl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dbacl.sourceforge.net/; longDescription = "a digramic Bayesian classifier for text recognition."; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = []; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix new file mode 100644 index 000000000000..07a1807e9a71 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "dua"; + version = "2.1.5"; + + src = fetchFromGitHub { + owner = "Byron"; + repo = "dua-cli"; + rev = "v${version}"; + sha256 = "0xiprpk74l0q5w3j82lx1l3jy4mi015nvlixih9z1lam4qi1yq0p"; + }; + + cargoSha256 = "1jg1ljm5h21shkyfrq0ivz9m0c25dxc0kd6cipf5i2dbnzcszmhh"; + + meta = with lib; { + description = "A tool to conveniently learn about the disk usage of directories, fast!"; + homepage = "https://github.com/Byron/dua-cli"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ killercup ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ffsend/Cargo.lock.patch b/nixpkgs/pkgs/tools/misc/ffsend/Cargo.lock.patch deleted file mode 100644 index 4d95a43cfb06..000000000000 --- a/nixpkgs/pkgs/tools/misc/ffsend/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 2344bfd..08413d8 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -614,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "ffsend" --version = "0.2.45" -+version = "0.2.46" - dependencies = [ - "chbs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/nixpkgs/pkgs/tools/misc/ffsend/default.nix index 2eca6de7b61e..22697cfb24d3 100644 --- a/nixpkgs/pkgs/tools/misc/ffsend/default.nix +++ b/nixpkgs/pkgs/tools/misc/ffsend/default.nix @@ -16,25 +16,22 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.46"; + version = "0.2.49"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "048kmhy8l2dy7v1b3vzlhcw5qhnz82y1wki6wpd2nz8siyd7dnpi"; + sha256 = "08x0kakhn75yzajxpvpdp1ml9z77i2x2k02kqcx3ssr6mbc7xnpf"; }; - cargoSha256 = "09i44vpxbww972zyv393xxwk7wz26cnqzq4gi1mg4703h02jkpjk"; + cargoSha256 = "1dmkij25gj0ya1i6h5l7pkjnqvj02zvsx15hddbjn1q06pihcsjm"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) ; - # Patch for v0.2.45 only - patches = [ ./Cargo.lock.patch ]; - preBuild = stdenv.lib.optionalString (x11Support && usesX11) ( if preferXsel && xsel != null then '' export XSEL_PATH="${xsel}/bin/xsel" diff --git a/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/nixpkgs/pkgs/tools/misc/goaccess/default.nix index fce9f8272f01..0430f010e97a 100644 --- a/nixpkgs/pkgs/tools/misc/goaccess/default.nix +++ b/nixpkgs/pkgs/tools/misc/goaccess/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = https://goaccess.io; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ ederoyd46 garbas ]; + maintainers = with stdenv.lib.maintainers; [ ederoyd46 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/lazydocker/default.nix b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix new file mode 100644 index 000000000000..f0c1227274e2 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "lazydocker"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "jesseduffield"; + repo = "lazydocker"; + rev = "v${version}"; + sha256 = "0f062xn58dbci22pg6y4ifcdfs8whzlv2jjprxxk2ygzixrrjwnc"; + }; + + modSha256 = "02n0lg28icy11a2j2rrlmp70blby0kmjas5j48jwh9h9a0yplqic"; + + subPackages = [ "." ]; + + meta = with stdenv.lib; { + description = "A simple terminal UI for both docker and docker-compose"; + homepage = https://github.com/jesseduffield/lazydocker; + license = licenses.mit; + maintainers = with maintainers; [ das-g ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/less/default.nix b/nixpkgs/pkgs/tools/misc/less/default.nix index c961ea938bab..e98b085c78d5 100644 --- a/nixpkgs/pkgs/tools/misc/less/default.nix +++ b/nixpkgs/pkgs/tools/misc/less/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, ncurses, lessSecure ? false }: stdenv.mkDerivation rec { - name = "less-530"; + pname = "less"; + version = "551"; src = fetchurl { - url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "1qpj2z38c53qmvqn8jaa0kq26q989cfbfjj4y0s6z17l1amr2gsh"; + url = "http://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0ggyjl3yzn7c450zk1rixi9ls6asdhgqynhk34zsd0ckhmsm45pz"; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. @@ -18,6 +19,6 @@ stdenv.mkDerivation rec { description = "A more advanced file pager than ‘more’"; platforms = platforms.unix; license = licenses.gpl3; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ eelco dtzWill ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/mc/default.nix b/nixpkgs/pkgs/tools/misc/mc/default.nix index a86b7fecc436..7f0cdac1dbfa 100644 --- a/nixpkgs/pkgs/tools/misc/mc/default.nix +++ b/nixpkgs/pkgs/tools/misc/mc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mc-${version}"; - version = "4.8.22"; + version = "4.8.23"; src = fetchurl { url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; - sha256 = "060kh3dmk8fmmsibn1l815qjazzfxzbhgqggrhncz604pbbnhy7f"; + sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/misc/odyssey/default.nix b/nixpkgs/pkgs/tools/misc/odyssey/default.nix index 13958332138d..160474f81523 100644 --- a/nixpkgs/pkgs/tools/misc/odyssey/default.nix +++ b/nixpkgs/pkgs/tools/misc/odyssey/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "odyssey"; - version = "unstable-2019-03-12"; + version = "1.0rc1"; src = fetchFromGitHub { owner = "yandex"; repo = pname; - rev = "af015839b03f30260c75d8f565521910c0694ed6"; - sha256 = "1cnnypvk78wp1qmqfriky40ls0grkp4v46mypyaq5kl8ppknvnvs"; + rev = version; + sha256 = "0p9zzazx3bhwz7sz8l757lwdj8qx0ij2k3g0d12prs0xfi1qhcmz"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index 7663da094196..49611aa0c3f8 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20190522"; + name = "parallel-20190622"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0y3z9wybs3gak3zwgsby8r5gg6dwd3qlrkch0q4fn0i1j1jhmijv"; + sha256 = "1v5fbrxw9l1navmvxapb1raa2jr19vfjw3i28h7fgdqd8n6gs79z"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 7bd7ac0ee029..42d03c06b87b 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2019.6"; + version = "1.2019.7"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0sxpk7n96a3vwf0dlf62zs0rgm01gf36k62rbr8cyjf62qgf61lb"; + sha256 = "1md8dyjlvwfg4hbvigcvzipj1gf8hb39rqqh825aa2swchs8nvhm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix index 10972d9fa894..2c9ed7be039e 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix @@ -1,21 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "powerline-go"; - version = "1.12.1"; + version = "1.13.0"; name = "${pname}-${version}"; - rev = "v${version}"; - - goPackagePath = "github.com/justjanne/powerline-go"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; - inherit rev; - sha256 = "0r2n3hjgr7c7nwwcph7i2lv3709z9cyc8gmsinlzjwny998akyf4"; + rev = "v${version}"; + sha256 = "0hgc0ji9jcsq5qnvx54dvpq8qx80mgdbvkllzavnvqr7md638zk9"; }; - goDeps = ./deps.nix; + modSha256 = "0800r08rawv4fz08d332z0fy6pd16l1dyflz3h91ba00g59wc2ah"; meta = with stdenv.lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix b/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix deleted file mode 100644 index 85bf229a2697..000000000000 --- a/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix +++ /dev/null @@ -1,57 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; - sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "2cbc9195c892b304060269ef280375236d2fcac9"; - sha256 = "1m66hhh37lxn525y2gnmh4ipc88c3wfiixr5ydywa9v1z90wxw5r"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f"; - sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "4b34438f7a67ee5f45cc6132e2bad873a20324e9"; - sha256 = "1xnsiaikz62wqjpaly1j4nqwp504gih5mgw9wdj1pp1d4bmx0vl0"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f4905fbd45b6790792202848439271c74074bbfd"; - sha256 = "184d6ap2g92jvx0532lymdqbnx9vi9ips4dq5lnqbby0caccc6r1"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/misc/psrecord/default.nix b/nixpkgs/pkgs/tools/misc/psrecord/default.nix new file mode 100644 index 000000000000..7df2b47497f0 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/psrecord/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonApplication, fetchPypi, psutil, matplotlib, pytest }: +buildPythonApplication rec { + pname = "psrecord"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "151rynca97v5wq1drl2yfrqmqil1km72cizn3159c2ip14626mp6"; + }; + + propagatedBuildInputs = [ + psutil matplotlib + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + runHook preCheck + pytest psrecord + runHook postCheck + ''; + + meta = { + description = "Record the CPU and memory activity of a process"; + homepage = "https://github.com/astrofrog/psrecord"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ johnazoidberg ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/skim/default.nix b/nixpkgs/pkgs/tools/misc/skim/default.nix index fe1061b446c5..5072bfb69343 100644 --- a/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.6.4"; + version = "0.6.8"; src = fetchFromGitHub { owner = "lotabout"; repo = pname; rev = "v${version}"; - sha256 = "0ywrqfxxqv7mpm4szw8n3hcvc4jn9a490j9s7qh3vzqgrsx2sxk3"; + sha256 = "00sx1pyj0a9hkv9b8g3iykkw303vnqziddp2600nvfr8x8pd01gi"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "1rwb0yvqpxp1pikdw6345n035krx0qcx4f5di89841fhr123zv0w"; + cargoSha256 = "1kqawnyddv4pjyiaizw3ydqk6hl4ng6xfw9ixy58rb1vk591kq8w"; patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim diff --git a/nixpkgs/pkgs/tools/misc/slurp/default.nix b/nixpkgs/pkgs/tools/misc/slurp/default.nix index 35233d97d564..bc0e86f1b518 100644 --- a/nixpkgs/pkgs/tools/misc/slurp/default.nix +++ b/nixpkgs/pkgs/tools/misc/slurp/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "slurp"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${version}"; - sha256 = "15fqspg3cjl830l95ibibprxf9p13mc2rpyf9bdwsdx2f4qrkq62"; + sha256 = "0580m6kaiilgsrcj608r837r37sl6a25y7w21p7d6ij20fs3gvg1"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/stow/default.nix b/nixpkgs/pkgs/tools/misc/stow/default.nix index 0a460b3c4763..a4d322ae1841 100644 --- a/nixpkgs/pkgs/tools/misc/stow/default.nix +++ b/nixpkgs/pkgs/tools/misc/stow/default.nix @@ -1,17 +1,26 @@ -{ stdenv, fetchurl, perl, perlPackages }: +{ stdenv, fetchurl, perl, perlPackages, makeWrapper }: let - version = "2.2.2"; + pname = "stow"; + version = "2.3.0"; in stdenv.mkDerivation { - name = "stow-${version}"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnu/stow/stow-${version}.tar.bz2"; - sha256 = "1zd6g9cm3whvy5f87j81j4npl7q6kxl25f7z7p9ahiqfjqs200m0"; + sha256 = "1fnn83wwx3yaxpqkq8xyya3aiibz19fwrfj30nsiikm7igmwgiv5"; }; - buildInputs = with perlPackages; [ perl IOStringy TestOutput ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with perlPackages; [ perl IOStringy TestOutput HashMerge Clone CloneChoose ]; + + postFixup = '' + wrapProgram "$out"/bin/stow \ + --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; makePerlPath [ + HashMerge Clone CloneChoose + ]}" + ''; doCheck = true; diff --git a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index bb9c30360a07..b794e46b2585 100644 --- a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.5.1"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "1s2jmi46z1as5f7124zxjd88crbgb427jqf9987nz0csbpbb12qa"; + sha256 = "0vxnq5r3h32dvznh4lal29q5ny70rd861r7435gn7sa6v5ajs2f1"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/units/default.nix b/nixpkgs/pkgs/tools/misc/units/default.nix index fa208154eaa0..374e1b9eaf63 100644 --- a/nixpkgs/pkgs/tools/misc/units/default.nix +++ b/nixpkgs/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.18"; + version = "2.19"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4"; + sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2"; }; buildInputs = [ readline ]; diff --git a/nixpkgs/pkgs/tools/misc/venus/default.nix b/nixpkgs/pkgs/tools/misc/venus/default.nix index 228747880d16..c51d3cc27027 100644 --- a/nixpkgs/pkgs/tools/misc/venus/default.nix +++ b/nixpkgs/pkgs/tools/misc/venus/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://intertwingly.net/code/venus/docs/index.html; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = []; }; } diff --git a/nixpkgs/pkgs/tools/misc/xiccd/default.nix b/nixpkgs/pkgs/tools/misc/xiccd/default.nix index b749274b5231..f51746e312e5 100644 --- a/nixpkgs/pkgs/tools/misc/xiccd/default.nix +++ b/nixpkgs/pkgs/tools/misc/xiccd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xiccd-${version}"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "agalakhov"; repo = "xiccd"; rev = "v${version}"; - sha256 = "0dhv913njzm80g5lwak5znmxllfa6rrkifwja8vk133lyxnarqra"; + sha256 = "159fyz5535lcabi5bzmxgmjdgxlqcjaiqgzr00mi3ax0i5fdldwn"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index f714d62ff4da..8aaa8e22994d 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # 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 = "2019.06.08"; + version = "2019.07.02"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0dq8k28bl48xrnzf3mpi7lwyfiq8v2f78sy6py4jbiynxh38ani7"; + sha256 = "1ci09m2fg23vk92sk3wkg0b2jkph8d06spyn2s3fgr1rwzwazgir"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 6eda3e6e436a..a1d0b185a0a9 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0hcfl0mh4gqy9c8ghmi58asqr8v009n6li0mgcy3r8fyjr7qryvy"; + sha256 = "01ax8zjrahs2sjbgsys2ahh57sdcap0ij3y1r1bbvsgzr7xxm2q8"; }; nativeBuildInputs = [ makeWrapper python3.pkgs.wrapPython qmake ]; diff --git a/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix b/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix index 7c0c69e1de01..f367d2817cd1 100644 --- a/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix +++ b/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = http://www.aircrack-ng.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar garbas ]; + maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index 65d4d368b106..6d14789e7f42 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix - name = "dhcpcd-7.2.2"; + name = "dhcpcd-7.2.3"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "17m0ig9n4p6m98j8wp4dwnl2cfg2rg3v6vqpsahls9x9rccgzdrx"; + sha256 = "0vjnd27y6jm5q2v7fkyxmsn77dcpvpzyzb5bq9lfkas8flbkiavl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index c4ff9d301678..62ac791252d8 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { hardware. ''; homepage = http://haproxy.1wt.eu; - maintainers = with stdenv.lib.maintainers; [ fuzzy-id garbas ]; + maintainers = with stdenv.lib.maintainers; [ fuzzy-id ]; platforms = with stdenv.lib.platforms; linux ++ darwin; license = stdenv.lib.licenses.gpl2; }; diff --git a/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/nixpkgs/pkgs/tools/networking/i2pd/default.nix index dfe8f6d1d60b..050f1c9cd4a5 100644 --- a/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.25.0"; + version = "2.26.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1jqfgpwg83prikjg67farl854mhyjiy4lz6i8kahp765m6kp8gaq"; + sha256 = "1za7h449dnnw9h6nx33s5ai3qkakah37yg686a2sp8qynrb0h93h"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/nixpkgs/pkgs/tools/networking/ip2unix/default.nix b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix index e85cfb52553d..549461fe5d0b 100644 --- a/nixpkgs/pkgs/tools/networking/ip2unix/default.nix +++ b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ip2unix-${version}"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "1x2nfv15a1hg8vrw5vh8fqady12v9hfrb4p3cfg0ybx52y0xs48a"; + sha256 = "1hbc7csicgza1w43aq1q189w8gzwkc2v5mxpnhaiwggwsa5vvkl0"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/iperf/3.nix b/nixpkgs/pkgs/tools/networking/iperf/3.nix index 46e0154a0042..2f06180128a8 100644 --- a/nixpkgs/pkgs/tools/networking/iperf/3.nix +++ b/nixpkgs/pkgs/tools/networking/iperf/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { - name = "iperf-3.6"; + name = "iperf-3.7"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/${name}.tar.gz"; - sha256 = "0vllfmyqiy6nxgbagsx1zrs4pmfawyalzm5l1xcwqq64dpj52pfy"; + sha256 = "033is7b5grfbiil98jxlz4ixp9shm44x6hy8flpsyz1i4h108inq"; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/nixpkgs/pkgs/tools/networking/lldpd/default.nix index d4ded1142d83..a8e4f2dc83f5 100644 --- a/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "lldpd-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; - sha256 = "0q63wiaan85a6d204jgk87w6dw5c9x0rb2z7pwb580b8a4wyvz1r"; + sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix index 82b961b6a12a..84b31bd5d40c 100644 --- a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix +++ b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix @@ -28,8 +28,8 @@ let }; in { miniupnpc_2 = generic { - version = "2.1.20190408"; - sha256 = "1v0l2m8j7r6jiy871d6v11ls243xqn6s3856iwd3bmk5c37npi50"; + version = "2.1.20190625"; + sha256 = "1yqp0d8x5ldjfma5x2vhpg1aaafdg0470ismccixww3rzpbza8w7"; }; miniupnpc_1 = generic { version = "1.9.20160209"; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/default.nix index e6940d2332ca..f2c83c661ae3 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/default.nix @@ -11,11 +11,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19lb5afx4iq8dgfsy26x9j4194v8f64vwr3nq6dk1ix3wljxzs66"; + sha256 = "07vg2ryyjaxs5h8kmkwqhk4ki750c4di98g0i7h7zglfs16psiqd"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix index 5050b8db023d..16734df1fb0d 100644 --- a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix +++ b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix @@ -2,14 +2,14 @@ asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { - version = "7.2.3"; + version = "7.2.4"; pname = "offlineimap"; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "18sdnhjldn8zs03bgqy1qa3ikmlfvyxcvwp3nbnv1a74biccqbpa"; + sha256 = "0h5q5nk2p2vx86w6rrbs7v70h81dpqqr68x6l3klzl3m0yj9agb1"; }; postPatch = '' @@ -35,6 +35,6 @@ python2Packages.buildPythonApplication rec { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; homepage = http://offlineimap.org; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = []; }; } diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 4b30c8979678..4f2a26de3271 100644 --- a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.0.1"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "0011cks5qizq1rl8iwm683gmb9dlx134p8az32vqm8sbivggv9c1"; + sha256 = "1fglvn6ricvb0csbrjkjfp902y6drjf6cby5fihmr5v9m7pjym1y"; }; phases = [ "installPhase" ]; diff --git a/nixpkgs/pkgs/tools/networking/openconnect/default.nix b/nixpkgs/pkgs/tools/networking/openconnect/default.nix index b0c4a0199c43..154788b3c5d3 100644 --- a/nixpkgs/pkgs/tools/networking/openconnect/default.nix +++ b/nixpkgs/pkgs/tools/networking/openconnect/default.nix @@ -4,13 +4,13 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { pname = "openconnect"; - version = "8.02"; + version = "8.03"; src = fetchurl { urls = [ "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz" ]; - sha256 = "04p0vzc1791h68hd9803wsyb64zrwm8qpdqx0szhj9pig71g5a0w"; + sha256 = "1wlypi68kqqg2mdck8wvf6aanhrmf9i7z6lngyxvcrp23jdzz34h"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index dcab89cc2b97..2672996a0952 100644 --- a/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.9.0"; + version = "1.10.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1nf992wjx5n2883b31hgxrb6y0n3p5yz7h42bwripwrfpdjaaqcv"; + sha256 = "1d9mp03dxz9j6pwd3d5z2pa7i1sqx5psshli1inqs0cq8zjmbzrw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix index a51f911b40bf..26e932fc5d5e 100644 --- a/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "shadowsocks-libev"; - version = "3.2.5"; + version = "3.3.0"; # Git tag includes CMake build files which are much more convenient. src = fetchFromGitHub { owner = "shadowsocks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "09z20y35zjzsx5fd5cnnxxgbfcrh2bp0z7m15l59wlmlsfp7r2pw"; + sha256 = "0f6fk7p49b1m78v4ipacbl522nma9b3qzrvihzp2mmsa6j3cysgr"; fetchSubmodules = true; }; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { postInstall = '' cp lib/* $out/lib - chmod +x $out/bin/* - mv $out/pkgconfig $out/lib ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/nixpkgs/pkgs/tools/networking/stunnel/default.nix index 04b79b9d394f..66a6c28d92a8 100644 --- a/nixpkgs/pkgs/tools/networking/stunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.54"; + version = "5.55"; src = fetchurl { url = "https://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "00krr0h3vsyi93mqhrbgfgn8v47l4l3hzdg1ccfnpd3lqak8i1ay"; + sha256 = "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix index 524736cec9eb..8ddb8eb231b3 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix @@ -4,23 +4,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - sha256 = "1z51zvv3sim5mcmr57akzzlkr5phb5f2a9zawff3s7a6lnz9rjzz"; + sha256 = "05b64bm9441crw74xlywjg2y3psljk2kf9xsrixaqwbnnahi0mm5"; }; - cargoSha256 = "1xy5xcfzfqrgvk5g97qab4ddd3i76nqn8vr0lsfpbbqfc2sm737a"; + cargoSha256 = "1hjjw3i35vqr6nxsv2m3izq4x8c2a6wvl5c2kjlpg6shy9j2mjaa"; nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig; buildInputs = lib.optional (!stdenv.isDarwin) openssl; propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - patches = [ ./disable-network-based-test.patch ]; - meta = with lib; { description = "A utility for managing cargo dependencies from the command line"; homepage = https://github.com/killercup/cargo-edit; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch b/nixpkgs/pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch deleted file mode 100644 index d1044a7fc539..000000000000 --- a/nixpkgs/pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cargo-edit.org/tests/cargo-upgrade.rs 2018-09-11 20:59:04.609532299 +0100 -+++ cargo-edit/tests/cargo-upgrade.rs 2018-09-11 20:59:50.829435331 +0100 -@@ -302,6 +302,7 @@ - } - - #[test] -+#[ignore] // requires network - fn upgrade_prints_messages() { - let (_tmpdir, manifest) = clone_out_test("tests/fixtures/upgrade/Cargo.toml.source"); - diff --git a/nixpkgs/pkgs/tools/package-management/cargo-graph/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-graph/default.nix new file mode 100644 index 000000000000..5e635f0fc26f --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/cargo-graph/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + name = "cargo-graph-${version}"; + version = "0.2.0-d895af1"; + + src = fetchFromGitHub { + owner = "kbknapp"; + repo = "cargo-graph"; + # The last release (v0.2.0) is from 2015. Since then there have been some + # bug fixes committed that would be good to have. + rev = "d895af1b7840c7ae8eddaf4e990bfa594c22ba01"; + sha256 = "0myg26cssmbakz53dl61lswsbaqnjqlbc30c2571pq8f7gvz2qv5"; + }; + + cargoSha256 = "1k4byg77s1iqhry96pl57mbsvd32sbnvf60dlbd62pvan39rispg"; + + meta = with lib; { + description = "A cargo subcommand for creating GraphViz DOT files and dependency graphs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ basvandijk ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/cargo-license/add-Cargo.lock.patch b/nixpkgs/pkgs/tools/package-management/cargo-license/add-Cargo.lock.patch new file mode 100644 index 000000000000..7137f8b7fb18 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/cargo-license/add-Cargo.lock.patch @@ -0,0 +1,297 @@ +commit ed7cd525d00a0f8517894cfec6e3e277f630b15f +Author: Bas van Dijk <v.dijk.bas@gmail.com> +Date: Mon Jun 24 00:13:13 2019 +0200 + + Add Cargo.lock + +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..b552c16 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,285 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ansi_term" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "autocfg" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cargo-license" ++version = "0.2.0" ++dependencies = [ ++ "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "csv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cargo_metadata" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "csv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "csv-core" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "error-chain" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "getopts" ++version = "0.2.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.58" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ryu" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" ++"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" ++"checksum backtrace 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)" = "e0f77aa27f55a4beb477ff6bc4d9bf72f90eb422b19c1d8e5a644b8aeb674d66" ++"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" ++"checksum cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1b4d380e1bab994591a24c2bdd1b054f64b60bef483a8c598c7c345bc3bbe" ++"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum csv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9044e25afb0924b5a5fc5511689b0918629e85d68ea591e5e87fbf1e85ea1b3b" ++"checksum csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5cdef62f37e6ffe7d1f07a381bc0db32b7a3ff1cac0de56cb0d81e71f53d65" ++"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"checksum getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "72327b15c228bfe31f1390f93dd5e9279587f0463836393c9df719ce62a3e450" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" ++"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" ++"checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" ++"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)" = "960e29cf7004b3b6e65fc5002981400eb3ccc017a08a2406940823e58e7179a9" ++"checksum serde_derive 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)" = "c4cce6663696bd38272e90bf34a0267e1226156c33f52d3f3915a2dd5d802085" ++"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" ++"checksum syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)" = "37ea458a750f59ab679b47fef9b6722c586c5742f4cfe18a120bbc807e5e01fd" ++"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" ++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" diff --git a/nixpkgs/pkgs/tools/package-management/cargo-license/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-license/default.nix new file mode 100644 index 000000000000..619fbb115976 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/cargo-license/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + name = "cargo-license-${version}"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "onur"; + repo = "cargo-license"; + rev = "v${version}"; + sha256 = "0xxgl9d695ncrxz29125wag285dwxpwc3fym0ixgj5fqbnkbx75g"; + }; + + cargoPatches = [ ./add-Cargo.lock.patch ]; + + cargoSha256 = "0jc84v8fxzzyfkcnfr9vrdblw5vdk54nzpch5lcarzfsarncqxw7"; + + meta = with lib; { + description = "Cargo subcommand to see license of dependencies"; + homepage = "https://github.com/onur/cargo-license"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ basvandijk ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix index b54f67b0fd4d..71567df94036 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libiconv, curl, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; @@ -17,6 +17,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + libiconv + curl ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/package-management/conda/default.nix b/nixpkgs/pkgs/tools/package-management/conda/default.nix index f3021b111d10..5ddcee6d1d33 100644 --- a/nixpkgs/pkgs/tools/package-management/conda/default.nix +++ b/nixpkgs/pkgs/tools/package-management/conda/default.nix @@ -28,10 +28,10 @@ # $ conda-shell # $ conda install spyder let - version = "4.3.31"; + version = "4.6.14"; src = fetchurl { url = "https://repo.continuum.io/miniconda/Miniconda3-${version}-Linux-x86_64.sh"; - sha256 = "1rklq81s9v7xz1q0ha99w2sl6kyc5vhk6b21cza0jr3b8cgz0lam"; + sha256 = "1gn43z1y5zw4yv93q1qajwbmmqs83wx5ls5x4i4llaciba4j6sqd"; }; conda = runCommand "conda-install" { buildInputs = [ makeWrapper ]; } @@ -48,7 +48,7 @@ let ''; in buildFHSUserEnv { - name = "conda-shell-${version}"; + name = "conda-shell"; targetPkgs = pkgs: (builtins.concatLists [ [ conda ] condaDeps extraPkgs]); profile = '' # Add conda to PATH diff --git a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index 40c9fcc769b2..f13256d33bfb 100644 --- a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ perl zlib bzip2 xz ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper perl ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index ca3fa8eca962..ffa9f427dc2f 100644 --- a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2019-05-24"; + version = "2019-06-25"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "d726afd9e45246fe68cfff0af80600ea26bd79fe"; - sha256 = "1pwq475s6bbzhqbdx5v68gnlh02654r7apskl1s9lpxb9s5rg0hf"; + rev = "95d55b8da152f1efffb7713c82ead83a3fcf476d"; + sha256 = "1zbx051rc0b880wjl832m9sliwrhrm1dbdxw8734gvc0pfz6qwn1"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index 744d795cb781..8749ae009da3 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -181,12 +181,12 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; - suffix = "pre6631_e58a7144"; + suffix = "pre6779_324a5dc9"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "e58a71442ad4a538b48fc7a9938c3690628c4741"; - sha256 = "1hbjhnvjbh8bi8cjjgyrj4z1gw03ws12m2wi5azzj3rmhnh4c802"; + rev = "324a5dc92f8e50e6b637c5e67dea48c80be10837"; + sha256 = "1g8gbam585q4kx8ilbx23ip64jw0r829i374qy0l8kvr8mhvj55r"; }; fromGit = true; diff --git a/nixpkgs/pkgs/tools/security/duo-unix/default.nix b/nixpkgs/pkgs/tools/security/duo-unix/default.nix index 88c570eb75e6..10e2138494e5 100644 --- a/nixpkgs/pkgs/tools/security/duo-unix/default.nix +++ b/nixpkgs/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "duo-unix-${version}"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "1krpk6ngl9vmvax8qax2iqcjdkvgdq5bxs079qy6c33ql40ra96i"; + sha256 = "11467kk8blg777vss0hsgz6k8f5m43p50zqs7yhx2sgbh9ygnn6y"; }; buildInputs = [ pam openssl zlib ]; diff --git a/nixpkgs/pkgs/tools/security/enpass/default.nix b/nixpkgs/pkgs/tools/security/enpass/default.nix index 97a692d7f332..c33e433448f5 100644 --- a/nixpkgs/pkgs/tools/security/enpass/default.nix +++ b/nixpkgs/pkgs/tools/security/enpass/default.nix @@ -2,7 +2,7 @@ , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk3, pango , makeWrapper , python, pythonPackages, lib -, lsof, curl, libuuid, cups, mesa_drivers +, lsof, curl, libuuid, cups, mesa }: let @@ -18,7 +18,7 @@ let # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ - mesa_drivers + mesa.drivers libGLU_combined fontconfig freetype diff --git a/nixpkgs/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch b/nixpkgs/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch new file mode 100644 index 000000000000..061fb0e8de9c --- /dev/null +++ b/nixpkgs/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch @@ -0,0 +1,34 @@ +From 1c9cc97e9d47d73763810dcb4a36b6cdf31a2254 Mon Sep 17 00:00:00 2001 +From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> +Date: Sun, 30 Jun 2019 11:54:35 -0400 +Subject: [PATCH] dirmngr: Only use SKS pool CA for SKS pool + +* dirmngr/http.c (http_session_new): when checking whether the +keyserver is the HKPS pool, check specifically against the pool name, +as ./configure might have been used to select a different default +keyserver. It makes no sense to apply Kristian's certificate +authority to anything other than the literal host +hkps.pool.sks-keyservers.net. + +Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> +GnuPG-Bug-Id: 4593 +--- + dirmngr/http.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dirmngr/http.c b/dirmngr/http.c +index 384f2569d..8e5d53939 100644 +--- a/dirmngr/http.c ++++ b/dirmngr/http.c +@@ -767,7 +767,7 @@ http_session_new (http_session_t *r_session, + + is_hkps_pool = (intended_hostname + && !ascii_strcasecmp (intended_hostname, +- get_default_keyserver (1))); ++ "hkps.pool.sks-keyservers.net")); + + /* If the user has not specified a CA list, and they are looking + * for the hkps pool from sks-keyservers.net, then default to +-- +2.22.0 + diff --git a/nixpkgs/pkgs/tools/security/gnupg/22.nix b/nixpkgs/pkgs/tools/security/gnupg/22.nix index b360992c6bef..ecb1df73e397 100644 --- a/nixpkgs/pkgs/tools/security/gnupg/22.nix +++ b/nixpkgs/pkgs/tools/security/gnupg/22.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror -, libiconv, npth, gettext, texinfo, pcsclite, sqlite +{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba +, libgpgerror, libiconv, npth, gettext, texinfo, pcsclite, sqlite , buildPackages # Each of the dependencies below are optional. @@ -32,8 +32,12 @@ stdenv.mkDerivation rec { patches = [ ./fix-libusb-include-path.patch + ./0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' + postPatch = '' + sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \ + configure doc/dirmngr.texi doc/gnupg.info-1 + '' + stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( diff --git a/nixpkgs/pkgs/tools/security/kbfs/default.nix b/nixpkgs/pkgs/tools/security/kbfs/default.nix deleted file mode 100644 index 9cd6ccca388c..000000000000 --- a/nixpkgs/pkgs/tools/security/kbfs/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "kbfs-${version}"; - version = "2.11.0"; - - goPackagePath = "github.com/keybase/kbfs"; - subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; - - dontRenameImports = true; - - src = fetchFromGitHub { - owner = "keybase"; - repo = "kbfs"; - rev = "v${version}"; - sha256 = "1qlns7vpyj3ivm7d3vvlmx3iksl7hpcg87yh30f3n64c8jk0xc83"; - }; - - buildFlags = [ "-tags production" ]; - - meta = with stdenv.lib; { - homepage = https://www.keybase.io; - description = "The Keybase FS FUSE driver"; - platforms = platforms.unix; - maintainers = with maintainers; [ rvolosatovs bennofs np ]; - license = licenses.bsd3; - }; -} diff --git a/nixpkgs/pkgs/tools/security/keybase/default.nix b/nixpkgs/pkgs/tools/security/keybase/default.nix index 02a322a18021..8b832bf00d65 100644 --- a/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -1,20 +1,22 @@ -{ stdenv, lib, buildGoPackage, fetchurl, cf-private +{ stdenv, lib, buildGoPackage, fetchFromGitHub, cf-private , AVFoundation, AudioToolbox, ImageIO, CoreMedia , Foundation, CoreGraphics, MediaToolbox }: buildGoPackage rec { name = "keybase-${version}"; - version = "4.0.0"; + version = "4.1.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; dontRenameImports = true; - src = fetchurl { - url = "https://github.com/keybase/client/archive/v${version}.tar.gz"; - sha256 = "14c0876mxz3xa2k4d665kf8j6k3hc6qybkj0gr4pr9c9gs70cgjh"; + src = fetchFromGitHub { + owner = "keybase"; + repo = "client"; + rev = "v${version}"; + sha256 = "00mxyy4jhdbcvbwabf4yvq4h5mpnlfp2z93gy2266kz6gkd5myzk"; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/tools/security/keybase/gui.nix b/nixpkgs/pkgs/tools/security/keybase/gui.nix index 843b9a57c8de..f84f0039347e 100644 --- a/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/nixpkgs/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20190508150240.6614a49937"; + versionSuffix = "20190612201656.952fee6c59"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "4.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "4.1.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "1fj92gxwfd6909r79prsq760b9s50js1iip5c01621hz9y39jd6m"; + sha256 = "0jwxw75yz7sbvfqw2aksa3p7jlcv817743fl59qk6rq1x9ag6qpx"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/keybase/kbfs.nix b/nixpkgs/pkgs/tools/security/keybase/kbfs.nix new file mode 100644 index 000000000000..302e996213dd --- /dev/null +++ b/nixpkgs/pkgs/tools/security/keybase/kbfs.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, keybase }: + +buildGoPackage rec { + pname = "kbfs"; + + inherit (keybase) src version; + + goPackagePath = "github.com/keybase/client"; + subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/kbfsgit/git-remote-keybase" ]; + + dontRenameImports = true; + + buildFlags = [ "-tags production" ]; + + meta = with stdenv.lib; { + homepage = "https://keybase.io/docs/kbfs"; + description = "The Keybase filesystem"; + platforms = platforms.unix; + maintainers = with maintainers; [ rvolosatovs bennofs np ]; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/tools/security/lynis/default.nix b/nixpkgs/pkgs/tools/security/lynis/default.nix index 198e33c8500e..7579636cfbf5 100644 --- a/nixpkgs/pkgs/tools/security/lynis/default.nix +++ b/nixpkgs/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.7.4"; + version = "2.7.5"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "1jjk5hcxmp4f4ppsljiq95l2ln6b03azydap3b35lsvxkjybv88k"; + sha256 = "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix b/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix index ac9ea6c7013f..6140159dcb50 100644 --- a/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix +++ b/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = https://github.com/carnager/rofi-pass; - maintainers = with stdenv.lib.maintainers; [ the-kenny garbas ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/security/sshguard/default.nix b/nixpkgs/pkgs/tools/security/sshguard/default.nix index 4774e5cef139..18f010ee1ecb 100644 --- a/nixpkgs/pkgs/tools/security/sshguard/default.nix +++ b/nixpkgs/pkgs/tools/security/sshguard/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4.0"; name = "sshguard-${version}"; src = fetchurl { url = "mirror://sourceforge/sshguard/${name}.tar.gz"; - sha256 = "18i0kmjvym9xym3ysg5kap0298nzcprar9y96k54p3zpdpi5b43n"; + sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06"; }; doCheck = true; diff --git a/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix index 1d4cb4f21854..1a6c8aaaa5d2 100644 --- a/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0cv09wnf7sw17z1n898w0zmk58y8b1why58m63hqx5d7x4054l9g"; + sha256 = "057gg84zly6gjp6ypj6bv6zzmnr77cqsygl8x0147cylwa1ywydd"; }; nativeBuildInputs = [ pandoc pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/security/vault/default.nix b/nixpkgs/pkgs/tools/security/vault/default.nix index 1aa42dc75f3a..3f366a583204 100644 --- a/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vault-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1916zqmh4cam9nw3k95wiqizlpkbbm5qhfz4lblqba8pzc2y9v32"; + sha256 = "0dylwvs95crvn1p7pbyzib979rxzp4ivzvi5k4f5ivp4ygnp597s"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/nixpkgs/pkgs/tools/security/vulnix/default.nix b/nixpkgs/pkgs/tools/security/vulnix/default.nix index 96c3e78b6a7c..2f7986c128b5 100644 --- a/nixpkgs/pkgs/tools/security/vulnix/default.nix +++ b/nixpkgs/pkgs/tools/security/vulnix/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.8.1"; + version = "1.8.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1kpwqsnz7jisi622halzl4s5q42d76nbq6ra800gscnfx48hqw9r"; + sha256 = "0zn21j15vd1z7s40s45zr5wri3r770yvazxqmm60fqpzc5sg552y"; }; outputs = [ "out" "doc" "man" ]; diff --git a/nixpkgs/pkgs/tools/system/bfs/default.nix b/nixpkgs/pkgs/tools/system/bfs/default.nix index a0575067482a..9c6f21009ee3 100644 --- a/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/nixpkgs/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.4.1"; + version = "1.5"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "1y5w8gws4j1i334ap4rsl64scr0hlyrdkdl7ffaghs8fqa6mjmsb"; + sha256 = "0lyrxbmfr4ckz4hx5dgz8xbq479l5rlyrqf205v6c82cap4zyv4x"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/nixpkgs/pkgs/tools/system/ctop/default.nix b/nixpkgs/pkgs/tools/system/ctop/default.nix index 533f0ab11e40..effc879e4789 100644 --- a/nixpkgs/pkgs/tools/system/ctop/default.nix +++ b/nixpkgs/pkgs/tools/system/ctop/default.nix @@ -1,25 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "ctop-unstable-${version}"; - version = "2017-05-28"; - rev = "b4e1fbf29073625ec803025158636bdbcf2357f4"; - - goPackagePath = "github.com/bcicen/ctop"; +buildGoModule rec { + pname = "ctop"; + version = "0.7.2"; src = fetchFromGitHub { - inherit rev; owner = "bcicen"; - repo = "ctop"; - sha256 = "162pc7gds66cgznqlq9gywr0qij5pymn7xszlq9rn4w2fm64qgg3"; + repo = pname; + rev = "v${version}"; + sha256 = "0mm6hl5qklfv0yffj6cgypsgcrk4fq6p60djycfgj20yhz9cmf9x"; }; - goDeps = ./deps.nix; + modSha256 = "0ad1gvamckg94r7f68cnjdbq9nyz6c3hh339hy4hghxd3rd1qskn"; - meta = with stdenv.lib; { - description = "Concise commandline monitoring for containers"; - homepage = https://ctop.sh/; + meta = with lib; { + description = "Top-like interface for container metrics"; + homepage = "https://ctop.sh/"; license = licenses.mit; - maintainers = with maintainers; [ apeyroux ]; + maintainers = with maintainers; [ apeyroux marsam ]; }; } diff --git a/nixpkgs/pkgs/tools/system/ctop/deps.nix b/nixpkgs/pkgs/tools/system/ctop/deps.nix deleted file mode 100644 index 4fb75cdcd3df..000000000000 --- a/nixpkgs/pkgs/tools/system/ctop/deps.nix +++ /dev/null @@ -1,120 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "599f207b45e74648a8a6a7ac87d77e40930504e9"; - sha256 = "1n0r9ahcx5h2f97ap5fy5hgnpamzzrgihknx7wgvvpm4hrzxm31r"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52"; - sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii"; - }; - } - { - goPackagePath = "github.com/fsouza/go-dockerclient"; - fetch = { - type = "git"; - url = "https://github.com/fsouza/go-dockerclient"; - rev = "c933ed18bef34ec2955de03de8ef9a3bb996e3df"; - sha256 = "1qci2m5ifmz3lcmc4y6k9baz9z1i77xnrrcq6zi9mpclhhfr0qzd"; - }; - } - { - goPackagePath = "github.com/gizak/termui"; - fetch = { - type = "git"; - url = "https://github.com/gizak/termui"; - rev = "ea10e6ccee219e572ffad0ac1909f1a17f6db7d6"; - sha256 = "1nxihx4vwxwgq3vnccc8a1v34raqvvsl0p10v1nlvs61rjvs9g32"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "3573b8b52aa7b37b9358d966a898feb387f62437"; - sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr"; - }; - } - { - goPackagePath = "github.com/jgautheron/codename-generator"; - fetch = { - type = "git"; - url = "https://github.com/jgautheron/codename-generator"; - rev = "16d037c7cc3c9b552fe4af9828b7338d752dbaf9"; - sha256 = "0v6fji5swnrdjlp3bahv65chnbhxzl25j3hwwnyvvbb4iwa9a376"; - }; - } - { - goPackagePath = "github.com/maruel/panicparse"; - fetch = { - type = "git"; - url = "https://github.com/maruel/panicparse"; - rev = "ae43f192cef2add653fe1481a3070ed00a4a6981"; - sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; - sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; - sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "7994c181db7761ca3c67a217068cf31826113f5f"; - sha256 = "0ssc54wamn3h8z68kv4fdgvk3kjii95psi2kk0slsilmg5v6jzhj"; - }; - } - { - goPackagePath = "github.com/nu7hatch/gouuid"; - fetch = { - type = "git"; - url = "https://github.com/nu7hatch/gouuid"; - rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; - sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; - }; - } - { - goPackagePath = "github.com/op/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/op/go-logging"; - rev = "970db520ece77730c7e4724c61121037378659d9"; - sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "3da985ce5951d99de868be4385f21ea6c2b22f24"; - sha256 = "0mhqa53pyj9gxg4m0c9s0f4r5jp0rihlni1nrpkd1d921xxzh714"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/system/di/default.nix b/nixpkgs/pkgs/tools/system/di/default.nix index 135436e8f112..7d366dc9bd7f 100644 --- a/nixpkgs/pkgs/tools/system/di/default.nix +++ b/nixpkgs/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "di-${version}"; - version = "4.47"; + version = "4.47.1"; src = fetchurl { url = "http://gentoo.com/di/${name}.tar.gz"; - sha256 = "0zlapxlzjizwzwa8xwrwibhcbkh0wx7n74gvjpp6wlwq7cgiq0xm"; + sha256 = "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/system/localtime/default.nix b/nixpkgs/pkgs/tools/system/localtime/default.nix index 45cf378a14ed..39e1bc7b6e7d 100644 --- a/nixpkgs/pkgs/tools/system/localtime/default.nix +++ b/nixpkgs/pkgs/tools/system/localtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, systemd, polkit, fetchFromGitHub, buildGoPackage, m4}: +{ stdenv, fetchFromGitHub, buildGoPackage, m4 }: buildGoPackage rec { name = "localtime-2017-11-07"; @@ -11,18 +11,20 @@ buildGoPackage rec { }; goPackagePath = "github.com/Stebalien/localtime"; - buildInputs = [ systemd polkit m4 ]; + buildInputs = [ m4 ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "BINDIR=${placeholder "bin"}/bin" + ]; buildPhase = '' cd go/src/${goPackagePath} - make localtimed + make $makeFlags ''; installPhase = '' - mkdir -p $bin/bin - install -Dm555 localtimed $bin/bin + make install $makeFlags ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index ec30c1d070cd..a749595b4154 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -1,29 +1,52 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit, lm_sensors }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig +, CoreFoundation, IOKit, libossp_uuid +, curl, libcap, libuuid, lm_sensors, zlib +, withCups ? false, cups +, withDBengine ? true, libuv, lz4, judy +, withIpmi ? (!stdenv.isDarwin), freeipmi +, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct +, withSsl ? true, openssl +, withDebug ? false +}: -stdenv.mkDerivation rec{ - version = "1.11.1"; +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "1.15.0"; name = "netdata-${version}"; src = fetchurl { url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; - sha256 = "0djph4586cc14vavj6za6k255lscf3b415dx8k45q3nsc2hb4l01"; + sha256 = "04frfy08k6m70y3s8j3gvnfnqqd9d5mwj3j6krk9dsh34332abvx"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ zlib ] - ++ (if stdenv.isDarwin then [ libossp_uuid CoreFoundation IOKit ] else [ libuuid ]); + buildInputs = [ curl.dev zlib.dev ] + ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] + ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] + ++ optionals withCups [ cups ] + ++ optionals withDBengine [ libuv lz4.dev judy ] + ++ optionals withIpmi [ freeipmi ] + ++ optionals withNetfilter [ libmnl libnetfilter_acct ] + ++ optionals withSsl [ openssl.dev ]; patches = [ ./no-files-in-etc-and-var.patch ]; - postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) '' + NIX_CFLAGS_COMPILE = optional withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; + + postInstall = optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ - $out/libexec/netdata/plugins.d/apps.plugin.org + $out/libexec/netdata/plugins.d/apps.plugin.org + ${optionalString withIpmi '' + mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ + $out/libexec/netdata/plugins.d/freeipmi.plugin.org + ''} ''; - preConfigure = '' + preConfigure = optionalString (!stdenv.isDarwin) '' substituteInPlace collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \ --replace 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; @@ -37,7 +60,7 @@ stdenv.mkDerivation rec{ rm -r $out/sbin ''; - meta = with stdenv.lib; { + meta = { description = "Real-time performance monitoring tool"; homepage = https://my-netdata.io/; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index bf9b6c19e7c3..c3927c29dd24 100644 --- a/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,14 +1,15 @@ -diff -ruN orig/Makefile.am new/Makefile.am ---- orig/Makefile.am 2018-11-02 08:56:21.000000000 -0500 -+++ new/Makefile.am 2018-11-16 10:30:22.000000000 -0500 -@@ -99,10 +99,10 @@ +diff --git a/Makefile.am b/Makefile.am +index f2087bb..7a70cfb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -116,10 +116,10 @@ AM_CFLAGS = \ $(NULL) sbin_PROGRAMS = --dist_cache_DATA = installer/.keep --dist_varlib_DATA = installer/.keep --dist_registry_DATA = installer/.keep --dist_log_DATA = installer/.keep +-dist_cache_DATA = packaging/installer/.keep +-dist_varlib_DATA = packaging/installer/.keep +-dist_registry_DATA = packaging/installer/.keep +-dist_log_DATA = packaging/installer/.keep +dist_cache_DATA = +dist_varlib_DATA = +dist_registry_DATA = @@ -16,64 +17,70 @@ diff -ruN orig/Makefile.am new/Makefile.am plugins_PROGRAMS = LIBNETDATA_FILES = \ -diff -ruN orig/collectors/charts.d.plugin/Makefile.am new/collectors/charts.d.plugin/Makefile.am ---- orig/collectors/charts.d.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500 -+++ new/collectors/charts.d.plugin/Makefile.am 2018-11-16 11:16:47.000000000 -0500 -@@ -32,7 +32,6 @@ +diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am +index 2989b4b..64de7d6 100644 +--- a/collectors/charts.d.plugin/Makefile.am ++++ b/collectors/charts.d.plugin/Makefile.am +@@ -32,7 +32,6 @@ dist_charts_DATA = \ userchartsconfigdir=$(configdir)/charts.d dist_userchartsconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .keep \ $(NULL) chartsconfigdir=$(libconfigdir)/charts.d -diff -ruN orig/collectors/node.d.plugin/Makefile.am new/collectors/node.d.plugin/Makefile.am ---- orig/collectors/node.d.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500 -+++ new/collectors/node.d.plugin/Makefile.am 2018-11-16 11:16:42.000000000 -0500 -@@ -23,7 +23,6 @@ +diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am +index 3b5a0a5..b7abe01 100644 +--- a/collectors/node.d.plugin/Makefile.am ++++ b/collectors/node.d.plugin/Makefile.am +@@ -23,7 +23,6 @@ dist_noinst_DATA = \ usernodeconfigdir=$(configdir)/node.d dist_usernodeconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .keep \ $(NULL) nodeconfigdir=$(libconfigdir)/node.d -diff -ruN orig/collectors/python.d.plugin/Makefile.am new/collectors/python.d.plugin/Makefile.am ---- orig/collectors/python.d.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500 -+++ new/collectors/python.d.plugin/Makefile.am 2018-11-16 10:56:06.000000000 -0500 -@@ -29,7 +29,6 @@ +diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am +index 652a35d..cf4b2cc 100644 +--- a/collectors/python.d.plugin/Makefile.am ++++ b/collectors/python.d.plugin/Makefile.am +@@ -29,7 +29,6 @@ dist_python_DATA = \ userpythonconfigdir=$(configdir)/python.d dist_userpythonconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .keep \ $(NULL) pythonconfigdir=$(libconfigdir)/python.d -diff -ruN orig/collectors/statsd.plugin/Makefile.am new/collectors/statsd.plugin/Makefile.am ---- orig/collectors/statsd.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500 -+++ new/collectors/statsd.plugin/Makefile.am 2018-11-16 10:53:04.000000000 -0500 -@@ -15,6 +15,5 @@ +diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am +index e63bf98..0f59782 100644 +--- a/collectors/statsd.plugin/Makefile.am ++++ b/collectors/statsd.plugin/Makefile.am +@@ -14,6 +14,5 @@ dist_statsdconfig_DATA = \ userstatsdconfigdir=$(configdir)/statsd.d dist_userstatsdconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .keep \ $(NULL) -diff -ruN orig/health/Makefile.am new/health/Makefile.am ---- orig/health/Makefile.am 2018-11-02 08:56:21.000000000 -0500 -+++ new/health/Makefile.am 2018-11-16 10:56:30.000000000 -0500 -@@ -16,7 +16,6 @@ +diff --git a/health/Makefile.am b/health/Makefile.am +index 62a4c6d..4d651df 100644 +--- a/health/Makefile.am ++++ b/health/Makefile.am +@@ -16,7 +16,6 @@ dist_noinst_DATA = \ userhealthconfigdir=$(configdir)/health.d dist_userhealthconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .keep \ $(NULL) healthconfigdir=$(libconfigdir)/health.d -diff -ruN orig/system/Makefile.am new/system/Makefile.am ---- orig/system/Makefile.am 2018-11-02 08:56:21.000000000 -0500 -+++ new/system/Makefile.am 2018-11-16 10:29:21.000000000 -0500 -@@ -17,10 +17,6 @@ +diff --git a/system/Makefile.am b/system/Makefile.am +index b085dca..ccfa588 100644 +--- a/system/Makefile.am ++++ b/system/Makefile.am +@@ -17,10 +17,6 @@ CLEANFILES = \ include $(top_srcdir)/build/subst.inc SUFFIXES = .in diff --git a/nixpkgs/pkgs/tools/system/osquery/default.nix b/nixpkgs/pkgs/tools/system/osquery/default.nix index 36d28098b0be..80341e88dd06 100644 --- a/nixpkgs/pkgs/tools/system/osquery/default.nix +++ b/nixpkgs/pkgs/tools/system/osquery/default.nix @@ -144,5 +144,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ma27 ]; + broken = true; }; } diff --git a/nixpkgs/pkgs/tools/system/syslog-ng/default.nix b/nixpkgs/pkgs/tools/system/syslog-ng/default.nix index 6999be1c92f4..dcc9942a0611 100644 --- a/nixpkgs/pkgs/tools/system/syslog-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.21.1"; + version = "3.22.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "09fdjschp3shy8xp0hh5fh6qv25433zd0biv0igkmkvrmnjks5ld"; + sha256 = "1j3l9pn3lf9w87vvwbnxk098gprbqzmfpfw1rch46mgsfqvl8mh6"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/nixpkgs/pkgs/tools/text/languagetool/default.nix b/nixpkgs/pkgs/tools/text/languagetool/default.nix index 00ccfceb31bf..1ccba80cb3e6 100644 --- a/nixpkgs/pkgs/tools/text/languagetool/default.nix +++ b/nixpkgs/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "LanguageTool-${version}"; - version = "4.4"; + version = "4.6"; src = fetchzip { url = "https://www.languagetool.org/download/${name}.zip"; - sha256 = "0cdrh59jcwrj5zp2lhbi9wp29pzabp35i8f7lbrs6z1wib6mgmp1"; + sha256 = "1z3i6kz1dz7dw2ykyk1yamrv8h5h330sfyl037hhyy9hw6p30rhg"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/nixpkgs/pkgs/tools/text/link-grammar/default.nix b/nixpkgs/pkgs/tools/text/link-grammar/default.nix index 2f7d63c99270..32aeed7499f3 100644 --- a/nixpkgs/pkgs/tools/text/link-grammar/default.nix +++ b/nixpkgs/pkgs/tools/text/link-grammar/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.6.1"; + version = "5.6.2"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; - sha256 = "1y0zydcr501nlw3r1vh68z6fqj1kjgrc2l8d1hmdv3ipynadqwm2"; + sha256 = "1jc6j5kxdv3y4mm82q0rrjvlak8p26fqh92dzw5bkwxnvjmjjg1k"; }; nativeBuildInputs = [ pkgconfig python3 ]; diff --git a/nixpkgs/pkgs/tools/text/sd/default.nix b/nixpkgs/pkgs/tools/text/sd/default.nix index 6a279b834661..3b4a6edba0ff 100644 --- a/nixpkgs/pkgs/tools/text/sd/default.nix +++ b/nixpkgs/pkgs/tools/text/sd/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.5.0"; + version = "0.6.5"; src = fetchFromGitHub { owner = "chmln"; repo = pname; - rev = "sd-${version}"; - sha256 = "1y44qizciir75d1srwm1mlskhflab2b6153d19vblw410in82f5d"; + rev = version; + sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj"; }; - cargoSha256 = "1gls68lw8a2c3gsav70l2wasrgav68q5w1nf50jsrbqq9kb4i7nb"; + cargoSha256 = "1shqphbpn3ib28hnyib7mh1i5q56nshj864jm209s8qggbp96wp1"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "Intuitive find & replace CLI (sed alternative)"; - homepage = https://github.com/chmln/sd; + homepage = "https://github.com/chmln/sd"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.amar1729 ]; diff --git a/nixpkgs/pkgs/tools/text/vale/default.nix b/nixpkgs/pkgs/tools/text/vale/default.nix index 3d911271ba91..3e436b80be8a 100644 --- a/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vale-${version}"; - version = "1.4.2"; + version = "1.4.3"; goPackagePath = "github.com/errata-ai/vale"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "180532jp6m2ryppkjszs8b8gmvx9h54c8423par3907bgdxyzqj8"; + sha256 = "1dgh2frf577048cacwnrl0xx5hha055z42sqq38lf07ybwyxdxms"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/text/wgetpaste/default.nix b/nixpkgs/pkgs/tools/text/wgetpaste/default.nix index c3db482d271a..20cd5066e808 100644 --- a/nixpkgs/pkgs/tools/text/wgetpaste/default.nix +++ b/nixpkgs/pkgs/tools/text/wgetpaste/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { - version = "2.28"; + version = "2.29"; name = "wgetpaste-${version}"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "1hh9svyypqcvdg5mjxyyfzpdzhylhf7s7xq5dzglnm4injx3i3ak"; + sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22"; }; # currently zsh-autocompletion support is not installed diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile index 4edebabc4cdd..f9329a80a815 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile @@ -2,6 +2,8 @@ source 'https://rubygems.org' gem 'asciidoctor' gem 'asciidoctor-diagram' gem 'asciidoctor-pdf' +gem 'asciidoctor-epub3' gem 'asciidoctor-mathematical' gem 'coderay' gem 'pygments.rb' +gem 'rouge' diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 7416bd0268e2..02081e117d6e 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -8,6 +8,11 @@ GEM asciidoctor (2.0.10) asciidoctor-diagram (1.5.18) asciidoctor (>= 1.5.0, < 3.x) + asciidoctor-epub3 (1.5.0.alpha.9) + asciidoctor (>= 1.5.0, < 3.0.0) + concurrent-ruby (~> 1.1.5) + gepub (~> 1.0.2) + thread_safe (~> 0.3.6) asciidoctor-mathematical (0.3.0) asciidoctor (~> 2.0, >= 2.0.0) mathematical (~> 1.5, >= 1.5.8) @@ -27,12 +32,18 @@ GEM concurrent-ruby (1.1.5) css_parser (1.7.0) addressable + gepub (1.0.4) + nokogiri (>= 1.8.2, < 1.11) + rubyzip (>= 1.1.1) hashery (2.1.2) i18n (1.6.0) concurrent-ruby (~> 1.0) mathematical (1.6.12) ruby-enum (~> 0.4) + mini_portile2 (2.4.0) multi_json (1.13.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) pdf-core (0.7.0) pdf-reader (2.2.0) Ascii85 (~> 1.0.0) @@ -54,12 +65,14 @@ GEM prawn-templates (0.1.1) pdf-reader (~> 2.0) prawn (~> 2.2) - public_suffix (3.1.0) + public_suffix (3.1.1) pygments.rb (1.2.1) multi_json (>= 1.0.0) + rouge (3.5.1) ruby-enum (0.7.2) i18n ruby-rc4 (0.1.5) + rubyzip (1.2.3) safe_yaml (1.0.5) thread_safe (0.3.6) treetop (1.5.3) @@ -72,10 +85,12 @@ PLATFORMS DEPENDENCIES asciidoctor asciidoctor-diagram + asciidoctor-epub3 asciidoctor-mathematical asciidoctor-pdf coderay pygments.rb + rouge BUNDLED WITH 1.17.2 diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix index 760cc41609e5..2f1c7e461545 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,53 +1,46 @@ -{ stdenv, lib, bundlerApp, ruby - # Dependencies of the 'mathematical' package -, cmake, bison, flex, glib, pkgconfig, cairo -, pango, gdk_pixbuf, libxml2, python3, patchelf +{ lib, bundlerApp, makeWrapper, + # Optional dependencies, can be null + epubcheck, kindlegen, + # For the update shell + mkShell, bundix }: -bundlerApp { - inherit ruby; - pname = "asciidoctor"; - gemdir = ./.; +let + app = bundlerApp { + pname = "asciidoctor"; + gemdir = ./.; - exes = [ - "asciidoctor" - "asciidoctor-pdf" - "asciidoctor-safe" - ]; + exes = [ + "asciidoctor" + "asciidoctor-pdf" + "asciidoctor-safe" + "asciidoctor-epub3" + ]; - gemConfig = { - mathematical = attrs: { - buildInputs = [ - cmake - bison - flex - glib - pkgconfig - cairo - pango - gdk_pixbuf - libxml2 - python3 - ]; + buildInputs = [ makeWrapper ]; - # The ruby build script takes care of this - dontUseCmakeConfigure = true; - - # For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here - postFixup = lib.optionalString stdenv.isLinux '' - soPath="$out/${ruby.gemPath}/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" - ${patchelf}/bin/patchelf \ - --set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(${patchelf}/bin/patchelf --print-rpath "$soPath")" \ - "$soPath" + postBuild = '' + wrapProgram "$out/bin/asciidoctor-epub3" \ + ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"} \ + ${lib.optionalString (kindlegen != null) "--set KINDLEGEN ${kindlegen}/bin/kindlegen"} ''; + + passthru = { + inherit updateShell; + }; + + meta = with lib; { + description = "A faster Asciidoc processor written in Ruby"; + homepage = https://asciidoctor.org/; + license = licenses.mit; + maintainers = with maintainers; [ gpyh ]; + platforms = platforms.unix; }; }; - meta = with lib; { - description = "A faster Asciidoc processor written in Ruby"; - homepage = https://asciidoctor.org/; - license = licenses.mit; - maintainers = with maintainers; [ gpyh ]; - platforms = platforms.unix; + updateShell = mkShell { + inputsFrom = lib.attrValues app.gems; + buildInputs = [ bundix ]; }; -} +in + app diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix index aef9061e1302..02700962eb28 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -51,6 +51,17 @@ }; version = "1.5.18"; }; + asciidoctor-epub3 = { + dependencies = ["asciidoctor" "concurrent-ruby" "gepub" "thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "056yp0z64b1fhhkzz2kaiqsd11gpbgx2d1yjgq7cqma9c70bbxa5"; + type = "gem"; + }; + version = "1.5.0.alpha.9"; + }; asciidoctor-mathematical = { dependencies = ["asciidoctor" "mathematical" "ruby-enum"]; groups = ["default"]; @@ -104,6 +115,17 @@ }; version = "1.7.0"; }; + gepub = { + dependencies = ["nokogiri" "rubyzip"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kg2h0mscb2hq6l3wjzq5fp5vw4552nglq8n9pawm7bzacf1gzyf"; + type = "gem"; + }; + version = "1.0.4"; + }; hashery = { groups = ["default"]; platforms = []; @@ -136,6 +158,16 @@ }; version = "1.6.12"; }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + type = "gem"; + }; + version = "2.4.0"; + }; multi_json = { groups = ["default"]; platforms = []; @@ -146,6 +178,17 @@ }; version = "1.13.1"; }; + nokogiri = { + dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + type = "gem"; + }; + version = "1.10.3"; + }; pdf-core = { groups = ["default"]; platforms = []; @@ -237,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; + sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; "pygments.rb" = { dependencies = ["multi_json"]; @@ -253,6 +296,16 @@ }; version = "1.2.1"; }; + rouge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + type = "gem"; + }; + version = "3.5.1"; + }; ruby-enum = { dependencies = ["i18n"]; groups = ["default"]; @@ -274,6 +327,16 @@ }; version = "0.1.5"; }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; + type = "gem"; + }; + version = "1.2.3"; + }; safe_yaml = { groups = ["default"]; platforms = []; diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/update.sh b/nixpkgs/pkgs/tools/typesetting/asciidoctor/update.sh new file mode 100755 index 000000000000..1f7e5541ceec --- /dev/null +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +nix-shell ../../../.. -A asciidoctor.updateShell --run ' + rm gemset.nix Gemfile.lock + bundix -m --bundle-pack-path $TMPDIR/asciidoctor-ruby-bundle + rm -r .bundle +' |