diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
commit | f21211ebfe21797c6f0444d42ec7cb835c737388 (patch) | |
tree | 816465981f650242d4b22e0f01b912917e7008f8 /pkgs/tools | |
parent | b291f2a9953d48d6edc5c73776db9ba289ccf213 (diff) | |
parent | 12ae04518b004adf949a43125954b99c05189e6f (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/vulkan-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/bat/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/lolcat/Gemfile.lock | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/lolcat/gemset.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/q-text-as-data/default.nix | 35 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/minio-client/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/nix/nixos-generators/default.nix | 26 | ||||
-rw-r--r-- | pkgs/tools/text/ispell/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch | 52 | ||||
-rw-r--r-- | pkgs/tools/video/rtmpdump/default.nix | 22 | ||||
-rw-r--r-- | pkgs/tools/virtualization/google-compute-engine/default.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/virtualization/govc/default.nix | 4 |
14 files changed, 128 insertions, 90 deletions
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 9ea1c2d73438..5851e4a2d46a 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.1.106.0"; + version = "1.1.114.0"; src = fetchFromGitHub { owner = "KhronosGroup"; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 205bc196811b..267b820df073 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,25 +1,27 @@ -{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, zlib , Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "0yyvlplskjvxb2cspqsvfsnahd5m0s83psrp777ng0wc0kr1adbw"; + sha256 = "07qxghplqq8km4kp9zas2acw302a77y72x3ix1272kb1zxhw4as6"; fetchSubmodules = true; }; - cargoSha256 = "078n31c0isvxvna0s1m12xv4bkh15rb2nixfyg4c501mlkalb517"; + cargoSha256 = "0j9wxv21a91yfvbbvgn5ms5zi1aipj1k2g42mfdvvw2vsdzqagxz"; - nativeBuildInputs = [ cmake pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig llvmPackages.libclang zlib ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + postInstall = '' install -m 444 -Dt $out/share/man/man1 doc/bat.1 install -m 444 -Dt $out/share/fish/vendor_completions.d assets/completions/bat.fish diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 8ea7a0fa0a2a..3f5485718dc5 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -31,7 +31,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.04-rc1"; + version = "2.04"; in ( @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; rev = "${pname}-${version}"; - sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0"; + sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w"; }; patches = [ diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index f6aa88bbdea1..ed48cc5921b0 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - lolcat (99.9.99) + lolcat (100.0.0) manpages (~> 0.6.1) optimist (~> 3.0.0) - paint (~> 2.0.0) + paint (~> 2.1.0) manpages (0.6.1) optimist (3.0.0) - paint (2.0.3) + paint (2.1.1) PLATFORMS ruby diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index f21e5637993d..2c2bc9cead10 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0422869sf6hif1nrfzi8fwklnrdqj6hxxwg3403xvd9d50yndrn4"; + sha256 = "0k1m2ihcprjq9jdmq2v3xlf27hqbpr2vjnnyfwp3z2zspzbl0nys"; type = "gem"; }; - version = "99.9.99"; + version = "100.0.0"; }; manpages = { groups = ["default"]; @@ -35,9 +35,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ldb269l3pzkihmsws19cr9h3l6naw8c2fqpav8ck3nllnyiv7r2"; + sha256 = "0rrb2p2yk6ffhm0gz8ba431mf63kq7w27gwavxl7n8qd2splj4mh"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; -} +}
\ No newline at end of file diff --git a/pkgs/tools/misc/q-text-as-data/default.nix b/pkgs/tools/misc/q-text-as-data/default.nix new file mode 100644 index 000000000000..dbd4a4c465ca --- /dev/null +++ b/pkgs/tools/misc/q-text-as-data/default.nix @@ -0,0 +1,35 @@ +{ stdenvNoCC, fetchFromGitHub, python2 }: + +stdenvNoCC.mkDerivation rec { + pname = "q-text-as-data"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "harelba"; + repo = "q"; + rev = version; + sha256 = "021c2sd6qscz1ipwzzjf43pfd311dcay7yralksl25rs0r7h3li2"; + }; + + buildInputs = [ python2 ]; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp bin/q $out/bin + chmod +x $out/bin/q + ''; + + meta = with stdenvNoCC.lib; { + description = "Run SQL directly on CSV or TSV files"; + longDescription = '' + q is a command line tool that allows direct execution of SQL-like queries on CSVs/TSVs (and any other tabular text files). + + q treats ordinary files as database tables, and supports all SQL constructs, such as WHERE, GROUP BY, JOINs etc. It supports automatic column name and column type detection, and provides full support for multiple encodings. + ''; + homepage = "http://harelba.github.io/q/"; + license = licenses.gpl3; + maintainers = [ maintainers.taneb ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1fe58f945041..d378e541b503 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/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.08.13"; + version = "2019.09.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj"; + sha256 = "0jbby0x5krww1acc8qxhmmwg0dsqmj6yjnynfm7r6k3rxbvlydqr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index ebd6e7c57993..3c8d15346849 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,7 +2,6 @@ buildGoPackage rec { pname = "minio-client"; - version = "2019-01-30T19-57-22Z"; src = fetchFromGitHub { @@ -14,9 +13,9 @@ buildGoPackage rec { goPackagePath = "github.com/minio/mc"; - buildFlagsArray = [''-ldflags= - -X github.com/minio/mc/cmd.Version=${version} - '']; + preBuild = '' + buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}") + ''; meta = with stdenv.lib; { homepage = https://github.com/minio/mc; diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix new file mode 100644 index 000000000000..4e51b9b46dd3 --- /dev/null +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix }: + +stdenv.mkDerivation rec { + pname = "nixos-generators"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixos-generators"; + rev = version; + sha256 = "10xncifdfhilxclxyf72h7dcfn8yn1h34qbkvdq9l76ghv5qjniq"; + }; + nativeBuildInputs = [ makeWrapper ]; + installFlags = [ "PREFIX=$(out)" ]; + postFixup = '' + wrapProgram $out/bin/nixos-generate \ + --prefix PATH : ${lib.makeBinPath [ jq coreutils findutils nix ] } + ''; + + meta = with stdenv.lib; { + description = "Collection of image builders"; + homepage = "https://github.com/nix-community/nixos-generators"; + license = licenses.mit; + maintainers = with maintainers; [ lassulus ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index dbec8d353d94..2f61536ed2c0 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -1,14 +1,17 @@ { stdenv, fetchurl, bison, ncurses }: stdenv.mkDerivation rec { - name = "ispell-3.3.02"; + pname = "ispell"; + version = "3.4.00"; + src = fetchurl { - url = "http://fmg-www.cs.ucla.edu/geoff/tars/${name}.tar.gz"; + url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz"; sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz"; }; + buildInputs = [ bison ncurses ]; + patches = [ - ./patches/0005-Do-not-reorder-words.patch ./patches/0007-Use-termios.patch ./patches/0008-Tex-backslash.patch ./patches/0009-Fix-FTBFS-on-glibc.patch @@ -21,6 +24,7 @@ stdenv.mkDerivation rec { ./patches/0025-Languages.patch ./patches/0030-Display-whole-multibyte-character.patch ]; + postPatch = '' cat >> local.h <<EOF ${stdenv.lib.optionalString (!stdenv.isDarwin) "#define USG"} @@ -37,11 +41,18 @@ stdenv.mkDerivation rec { #define MINIMENU #define HAS_RENAME EOF - ''; + preBuild = '' for dir in $out/share/emacs/site-lisp $out/share/info $out/share/man/man1 $out/share/man/man4 $out/bin $out/lib; do mkdir -p $dir done ''; + + meta = with stdenv.lib; { + description = "An interactive spell-checking program for Unix"; + homepage = "https://www.cs.hmc.edu/~geoff/ispell.html"; + license = licenses.free; + platforms = platforms.unix; + }; } diff --git a/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch b/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch deleted file mode 100644 index 2d74c078601a..000000000000 --- a/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Geoff Kuenning <geoff@cs.hmc.edu> -Date: Thu, 3 Nov 2005 14:14:15 -0800 -Subject: 0005 Do not reorder words - -ispell reorders words in personal dictionary without good reason. - -The correct approach is to build the internal data structure with variant -spellings stored in the same order as they appear in the personal dictionary. -Fortunately, this is easy, though the patch is to a different file. This one -has been tested (That's what I get for trying to rush out a fix before a -meeting!). ---- - makedent.c | 18 +++++++++++------- - 1 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/makedent.c b/makedent.c -index 0453d11..d121345 100644 ---- a/makedent.c -+++ b/makedent.c -@@ -447,9 +447,10 @@ int combinecaps (hdrp, newp) - if (retval == 0) - { - /* -- ** Couldn't combine the two entries. Add a new variant. For -- ** ease, we'll stick it right behind the header, rather than -- ** at the end of the list. -+ ** Couldn't combine the two entries. Add a new variant. We -+ ** stick it at the end of the variant list because it's -+ ** important to maintain order; this causes the personal -+ ** dictionary to have a stable ordering. - */ - forcevheader (hdrp, oldp, newp); - tdent = (struct dent *) mymalloc (sizeof (struct dent)); -@@ -460,10 +461,13 @@ int combinecaps (hdrp, newp) - return -1; - } - *tdent = *newp; -- tdent->next = hdrp->next; -- hdrp->next = tdent; -- tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS); -- hdrp->flagfield |= MOREVARIANTS; -+ for (oldp = hdrp; -+ oldp->next != NULL && oldp->flagfield & MOREVARIANTS; -+ oldp = oldp->next) -+ ; -+ tdent->next = oldp->next; -+ oldp->next = tdent; -+ oldp->flagfield |= MOREVARIANTS; - combineaffixes (hdrp, newp); - hdrp->flagfield |= (newp->flagfield & KEEP); - if (captype (newp->flagfield) == FOLLOWCASE) --- diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 6636c07b0104..06c035552e54 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, zlib +{ stdenv, fetchgit, fetchpatch, zlib , gnutlsSupport ? false, gnutls ? null, nettle ? null , opensslSupport ? true, openssl ? null }: @@ -11,15 +11,23 @@ assert opensslSupport -> openssl != null && !gnutlsSupport; with stdenv.lib; stdenv.mkDerivation { pname = "rtmpdump"; - version = "2015-12-30"; + version = "2019-03-30"; src = fetchgit { - url = git://git.ffmpeg.org/rtmpdump; + url = "git://git.ffmpeg.org/rtmpdump"; # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') - rev = "fa8646daeb19dfd12c181f7d19de708d623704c0"; - sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig"; + rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3"; + sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb"; }; + patches = [ + # Fix build with OpenSSL 1.1 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch?id=1e7bef484f96e7647f5f0911d3c8caa48131c33b"; + sha256 = "1wds98pk8qr7shkfl8k49iirxiwd972h18w84bamiqln29wv6ql1"; + }) + ]; + makeFlags = [ ''prefix=$(out)'' ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" @@ -32,9 +40,11 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; + separateDebugInfo = true; + meta = { description = "Toolkit for RTMP streams"; - homepage = http://rtmpdump.mplayerhq.hu/; + homepage = "http://rtmpdump.mplayerhq.hu/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 5abdcc23a74c..48255ca68a73 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -22,13 +22,16 @@ buildPythonApplication rec { sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp"; }; + buildInputs = [ bash ]; + propagatedBuildInputs = [ boto setuptools distro ]; + + postPatch = '' for file in $(find google_compute_engine -type f); do substituteInPlace "$file" \ - --replace /bin/systemctl "${systemd}/bin/systemctl" \ + --replace /bin/systemctl "/run/current-system/sw/bin/systemctl" \ --replace /bin/bash "${bashInteractive}/bin/bash" \ --replace /sbin/hwclock "${utillinux}/bin/hwclock" - # SELinux tool ??? /sbin/restorecon done @@ -42,9 +45,13 @@ buildPythonApplication rec { # allows to install the package in `services.udev.packages` in NixOS mkdir -p $out/lib/udev/rules.d cp -r google_config/udev/*.rules $out/lib/udev/rules.d - ''; - propagatedBuildInputs = [ boto setuptools distro ]; + # sysctl snippets will be used by google-compute-config.nix + mkdir -p $out/sysctl.d + cp google_config/sysctl/*.conf $out/sysctl.d + + patchShebangs $out/bin/* + ''; doCheck = false; diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 0d239547752a..b53c211d379f 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.20.0"; + version = "0.21.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "16pgjhlps21vk3cb5h2y0b6skq095rd8kl0618rwrz84chdnzahk"; + sha256 = "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130"; }; meta = { |