public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into openssl-1.1

Browse Source
This commit is contained in:
Robin Gloster
2019-08-21 14:25:13 +02:00
parent 9135412b63 609d408970
commit f4fc845e5b
1739 changed files with 138825 additions and 193125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/X11/ckbcomp/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "ckbcomp-${version}";
version = "1.192";
version = "1.193";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
sha256 = "1s570y8qwwy71ag9wgpznrhakps6rmw6j7p05hibns1spn2mxd5x";
sha256 = "107nl6vpy4036km3gr9z5f3mq1i6x169v0z0a0ywavj3zjqy23rp";
};
buildInputs = [ perl ];

4
pkgs/tools/X11/nx-libs/default.nix
View File

@@ -2,12 +2,12 @@
libpng, libtool, libxml2, pkgconfig, which, xorg }:
stdenv.mkDerivation rec {
name = "nx-libs-${version}";
version = "3.5.99.20";
version = "3.5.99.21";
src = fetchFromGitHub {
owner = "ArcticaProject";
repo = "nx-libs";
rev = version;
sha256 = "1c3xjbmnylw53h04g77lk9va1sk1dgg7zhirwz3mpn73r6dkyzix";
sha256 = "10xid8mhhid5mrap5jb51k9fm63cm03ss4k4sfymc8zsn0wrqnr9";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig which

2
pkgs/tools/X11/xcalib/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
description = "A tiny monitor calibration loader for X and MS-Windows";
license = licenses.gpl2;
maintainers = [ maintainers.rickynils ];
maintainers = [];
platforms = platforms.linux;
};
}

6
pkgs/tools/X11/xkbvalidate/default.nix
View File

@@ -5,11 +5,11 @@ runCommandCC "xkbvalidate" {
meta = {
description = "NixOS tool to validate X keyboard configuration";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.aszlig ];
};
} ''
mkdir -p "$out/bin"
gcc -std=gnu11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \
-o "$out/bin/validate"
$CC -std=c11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \
-o "$out/bin/xkbvalidate"
''

21
pkgs/tools/X11/xkbvalidate/xkbvalidate.c
View File

@@ -1,4 +1,3 @@
#define _GNU_SOURCE
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
@@ -14,6 +13,9 @@ static bool log_alloc_success = true;
static void add_log(struct xkb_context *ctx, enum xkb_log_level level,
const char *fmt, va_list args)
{
size_t buflen;
va_list tmpargs;
log_buffer_size++;
if (log_buffer == NULL)
@@ -28,11 +30,24 @@ static void add_log(struct xkb_context *ctx, enum xkb_log_level level,
return;
}
if (vasprintf(&log_buffer[log_buffer_size - 1], fmt, args) == -1) {
/* Unfortunately, vasprintf() is a GNU extension and thus not very
* portable, so let's first get the required buffer size using a dummy
* vsnprintf and afterwards allocate the returned amount of bytes.
*
* We also need to make a copy of the args, because the value of the args
* will be indeterminate after the return.
*/
va_copy(tmpargs, args);
buflen = vsnprintf(NULL, 0, fmt, tmpargs);
va_end(tmpargs);
log_buffer[log_buffer_size - 1] = malloc(++buflen);
if (vsnprintf(log_buffer[log_buffer_size - 1], buflen, fmt, args) == -1) {
perror("log line alloc");
log_alloc_success = false;
return;
}
va_end(args);
}
static void print_logs(void)

4
pkgs/tools/admin/acme.sh/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }:
stdenv.mkDerivation rec {
name = "acme.sh-${version}";
version = "2.8.1";
version = "2.8.2";
src = fetchFromGitHub {
owner = "Neilpang";
repo = "acme.sh";
rev = version;
sha256 = "1xpci41494jrwf2qfnv83zwd1jd99ddpy1ardrshj9n4jdnzd19w";
sha256 = "07bq6axgq33djp87kkx7c5cv8n80gclvj247n9j514zqly6abdxy";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/admin/analog/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "analog";
version = "6.0.15";
version = "6.0.16";
src = fetchFromGitHub {
owner = "c-amie";
repo = "analog-ce";
rev = version;
sha256 = "1clrx2xr3n5zh6gaavvdxkc127hayssxrplrd2qvw70givywza0m";
sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk";
};
configurePhase = ''

4
pkgs/tools/admin/aws-google-auth/default.nix
View File

@@ -19,7 +19,7 @@
buildPythonApplication rec {
pname = "aws-google-auth";
version = "0.0.29";
version = "0.0.32";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
# https://github.com/cevoaustralia/aws-google-auth/issues/120
@@ -27,7 +27,7 @@ buildPythonApplication rec {
owner = "cevoaustralia";
repo = "aws-google-auth";
rev = version;
sha256 = "06dalrwjy1sbc5wvj5ip4h999izlb0j5g6b6f3l5znnsm0vfvfia";
sha256 = "0blsvdkb28g1s3c7f8brjjai7lq9ij76xqr5z6zlxxafc4qqwhh3";
};
propagatedBuildInputs = [

12
pkgs/tools/admin/eksctl/default.nix
View File

@@ -2,24 +2,20 @@
buildGoModule rec {
pname = "eksctl";
version = "0.2.1";
version = "0.3.1";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "0f8rj7jw8ym97bjqaxzn1rnhp5nfx3jf5f51jwczljvr67ik9q75";
sha256 = "1xinkr9xnbfbr58ci7hprabqv0p292x016knbb7fqxzb8043f9lh";
};
modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f";
modSha256 = "1y0pkd588wsqhqywlv1yd5mlr4limybfpdj2g3pbxw09hv18ysa4";
subPackages = [ "cmd/eksctl" ];
buildFlags =
''
-tags netgo
-tags release
'';
buildFlags = [ "-tags netgo" "-tags release" ];
postInstall =
''

2
pkgs/tools/admin/lxd/default.nix
View File

@@ -51,7 +51,7 @@ buildGoPackage rec {
description = "Daemon based on liblxc offering a REST API to manage containers";
homepage = https://linuxcontainers.org/lxd/;
license = licenses.asl20;
maintainers = with maintainers; [ globin fpletz ];
maintainers = with maintainers; [ fpletz ];
platforms = platforms.linux;
};
}

6
pkgs/tools/admin/pulumi/default.nix
View File

@@ -4,17 +4,17 @@ with lib;
let
version = "0.17.17";
version = "0.17.27";
# 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 = "1h1z8bngix1gvma3hahfyprrx3af5yncgvrsvr1cdsaa79bzvc5c";
sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw";
};
"x86_64-darwin" = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
sha256 = "0pipykwpqqnhqg28s27lnkbrm55rshf25ikil7ycwq05p9ynf5gq";
sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48";
};
};

8
pkgs/tools/archivers/ctrtool/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ctrtool";
version = "0.15";
version = "0.16";
src = fetchFromGitHub {
owner = "profi200";
owner = "jakcron";
repo = "Project_CTR";
rev = version;
sha256 = "1l6z05x18s1crvb283yvynlwsrpa1pdx1nbijp99plw06p88h4va";
rev = "v${version}";
sha256 = "1n3j3fd1bqd39v5bdl9mhq4qdrcl1k4ib1yzl3qfckaz3y8bkrap";
};
sourceRoot = "source/ctrtool";

4
pkgs/tools/audio/abcm2ps/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "abcm2ps-${version}";
version = "8.14.4";
version = "8.14.5";
src = fetchFromGitHub {
owner = "leesavide";
repo = "abcm2ps";
rev = "v${version}";
sha256 = "0k53yf8plkkwsgg2vk468fkhvvwxnz5jk77n1159l0g362k36p0n";
sha256 = "1i6db49khqy8bqg21cn90b1fvyw8mh1asdswzssr6dr2g8bhdwmq";
};
configureFlags = [

4
pkgs/tools/audio/abcmidi/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "abcMIDI-${version}";
version = "2019.06.14";
version = "2019.08.11";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
sha256 = "1z503k2j6504h4p205q7wjrvh5x9jhkvsapfz322m3r905l2vc2b";
sha256 = "0rkqmavg7iv9080jdqs0qz80nanhizv6jk0fg9d5xvq3gnmfvnj1";
};
# There is also a file called "makefile" which seems to be preferred by the standard build phase

4
pkgs/tools/audio/opl3bankeditor/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, qttools, alsaLib }:
{ stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }:
stdenv.mkDerivation rec {
mkDerivation rec {
version = "1.5";
pname = "OPL3BankEditor";

2
pkgs/tools/backup/bacula/default.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"--with-logdir=/var/log/bacula"
"--with-working-dir=/var/lib/bacula"
"--mandir=\${out}/share/man"
];
] ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes";
installFlags = [
"logdir=\${out}/logdir"

27
pkgs/tools/backup/bdsync/default.nix
View File

@@ -1,35 +1,33 @@
{ stdenv, fetchFromGitHub, openssl, coreutils, which }:
{ stdenv, fetchFromGitHub
, openssl
, pandoc
, which
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "bdsync";
version = "0.10.1";
version = "0.11.1";
src = fetchFromGitHub {
owner = "TargetHolding";
repo = pname;
rev = "v${version}";
sha256 = "144hlbk3k29l7sja6piwhd2jsnzzsak13fcjbahd6m8yimxyb2nf";
sha256 = "11grdyc6fgw93jvj965awsycqw5qbzsdys7n8farqnmya8qv8gac";
};
nativeBuildInputs = [ pandoc which ];
buildInputs = [ openssl ];
postPatch = ''
patchShebangs ./tests.sh
patchShebangs ./tests/
'';
buildInputs = [ openssl coreutils which ];
doCheck = true;
checkPhase = ''
make test
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/man/man1
cp bdsync $out/bin/
cp bdsync.1 $out/share/man/man1/
install -Dm755 bdsync -t $out/bin/
install -Dm644 bdsync.1 -t $out/share/man/man1/
'';
meta = with stdenv.lib; {
@@ -39,5 +37,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ jluttine ];
};
}

2
pkgs/tools/backup/borg/default.nix
View File

@@ -66,6 +66,6 @@ python3.pkgs.buildPythonApplication rec {
homepage = https://www.borgbackup.org;
license = licenses.bsd3;
platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
maintainers = with maintainers; [ flokli dotlambda ];
maintainers = with maintainers; [ flokli dotlambda globin ];
};
}

8
pkgs/tools/backup/btrbk/default.nix
View File

@@ -1,16 +1,16 @@
{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
, utillinux, asciidoc, makeWrapper }:
, utillinux, asciidoc, asciidoctor, makeWrapper }:
stdenv.mkDerivation rec {
name = "btrbk-${version}";
version = "0.28.0";
version = "0.28.3";
src = fetchurl {
url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz";
sha256 = "1bqgcbkdd5s3l3ba1ifa9l523r8cr5y3arjdy9f6rmm840kn7xzf";
sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz";
};
nativeBuildInputs = [ asciidoc makeWrapper ];
nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ];
buildInputs = with perlPackages; [ perl DateCalc ];

8
pkgs/tools/backup/pyznap/default.nix
View File

@@ -1,21 +1,17 @@
{ lib
, buildPythonApplication
, fetchPypi
, paramiko
, configparser
}:
buildPythonApplication rec {
pname = "pyznap";
version = "1.1.2";
version = "1.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "9ac0da5d7f6461d1d6f128362786e297144b415f9e3a2f1835642ab3dda82d55";
sha256 = "0pnngr4zdxkf6b570ikzvkrm3a8fr47w6crjaw7ln094qkniywvj";
};
propagatedBuildInputs = [ configparser paramiko ];
# tests aren't included in the PyPI packages
doCheck = false;

22
pkgs/tools/backup/s3ql/default.nix
View File

@@ -1,33 +1,35 @@
{ stdenv, fetchurl, python3Packages, sqlite, which }:
{ stdenv, fetchFromGitHub, python3Packages, sqlite, which }:
python3Packages.buildPythonApplication rec {
name = "${pname}-${version}";
pname = "s3ql";
version = "2.26";
version = "3.2";
src = fetchurl {
url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
sha256 = "0xs1jbak51zwjrd6jmd96xl3a3jpw0p1s05f7sw5wipvvg0xnmfn";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "release-${version}";
sha256 = "01ky0jc1s3w9dry5siz9b69jf2maiargz99axgxvyihap0d7qs52";
};
buildInputs = [ which ]; # tests will fail without which
checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]);
propagatedBuildInputs = with python3Packages; [
sqlite apsw pycrypto requests defusedxml dugong llfuse
cython pytest pytest-catchlog
cython pytest pytest-catchlog google_auth google-auth-oauthlib
];
preBuild = ''
# https://bitbucket.org/nikratio/s3ql/issues/118/no-module-named-s3qldeltadump-running#comment-16951851
${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace
'';
checkPhase = ''
# Removing integration tests
rm tests/t{4,5,6}_*
pytest tests
'';
meta = with stdenv.lib; {
description = "A full-featured file system for online data storage";
homepage = https://bitbucket.org/nikratio/s3ql;
homepage = "https://github.com/s3ql/s3ql/";
license = licenses.gpl3;
maintainers = with maintainers; [ rushmorem ];
platforms = platforms.linux;

2
pkgs/tools/backup/wal-e/default.nix
View File

@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
meta = {
description = "A Postgres WAL-shipping disaster recovery and replication toolkit";
homepage = https://github.com/wal-e/wal-e;
maintainers = [ stdenv.lib.maintainers.rickynils ];
maintainers = [];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux;
};

42
pkgs/tools/backup/zfs-replicate/default.nix Normal file
View File

@@ -0,0 +1,42 @@
{ buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest
, pytestcov, pytestrunner, stdenv, stringcase
}:
buildPythonApplication rec {
pname = "zfs-replicate";
version = "1.1.11";
src = fetchPypi {
inherit pname version;
sha256 = "0386xc6rw6bhzw2a08g90afb3snqhm1ikx65bjfh22ha69fwmga8";
};
checkInputs = [
hypothesis
mypy
pytest
pytestcov
];
buildInputs = [
pytestrunner
];
propagatedBuildInputs = [
click
stringcase
];
doCheck = true;
checkPhase = ''
pytest --doctest-modules
'';
meta = with stdenv.lib; {
homepage = https://github.com/alunduil/zfs-replicate;
description = "ZFS Snapshot Replication";
license = licenses.bsd2;
maintainers = with maintainers; [ alunduil ];
};
}

4
pkgs/tools/compression/zstd/default.nix
View File

@@ -5,10 +5,10 @@
stdenv.mkDerivation rec {
pname = "zstd";
version = "1.4.1";
version = "1.4.3";
src = fetchFromGitHub {
sha256 = "1f2nvhsx1fsd6zbnwvc6bbrm9ghkcvamqqg79fxgk5284rc6nynv";
sha256 = "0mmgs98cfh92gcbjyv37vz8nq7x4x7fbzymlxyqd9awwpv9v0i5n";
rev = "v${version}";
repo = "zstd";
owner = "facebook";

2
pkgs/tools/compression/zsync/default.nix
View File

@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b";
};
makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
meta = {
homepage = http://zsync.moria.org.uk/;
description = "File distribution system using the rsync algorithm";

26
pkgs/tools/filesystems/apfs-fuse/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }:
stdenv.mkDerivation rec {
pname = "apfs-fuse-unstable";
version = "2019-07-23";
src = fetchFromGitHub {
owner = "sgan81";
repo = "apfs-fuse";
rev = "309ecb030f38edac4c10fa741a004c5eb7a23e15";
sha256 = "0wq6rlqi00m5dp5gbzy65i1plm40j6nsm7938zvfgx5laal4wzr2";
fetchSubmodules = true;
};
buildInputs = [ fuse3 bzip2 zlib attr ];
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
homepage = "https://github.com/sgan81/apfs-fuse";
description = "FUSE driver for APFS (Apple File System)";
license = licenses.gpl2;
maintainers = with maintainers; [ ealasu ];
platforms = platforms.linux;
};
}

4
pkgs/tools/filesystems/avfs/default.nix
View File

@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "avfs-${version}";
version = "1.1.0";
version = "1.1.1";
src = fetchurl {
url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7";
sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/tools/filesystems/btrfs-progs/default.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "btrfs-progs-${version}";
version = "5.1.1";
version = "5.2.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "06xybs7rglxjqkbzl2409acb3rgmnc5zc0xhyaxsc2p1x5yipfcw";
sha256 = "0crjv3i20nyj2dagfw6q7byshscpn6j7wlqch3apkzzzk00lmb1n";
};
nativeBuildInputs = [

4
pkgs/tools/filesystems/fuse-overlayfs/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
version = "0.4.1";
version = "0.5.1";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "1qjkzpxv7zy9i6lvcrn8yp8dfsqak6c7ffx8g0xfavdx7am458ns";
sha256 = "03sdnnq0x44jlwf41snrrma4hxdiixmhynw35gjhm84slpljnngp";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

35
pkgs/tools/filesystems/glusterfs/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,
{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
@@ -15,25 +15,26 @@ let
# The command
# find /nix/store/...-glusterfs-.../ -name '*.py' -executable
# can help with finding new Python scripts.
version = "4.0.0";
version = "6.5";
name="${baseName}-${version}";
url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
sha256 = "0af3fwiixddds6gdwhkyq3l214mmjl2wpjc2qayp5rpz79lnclq3";
sha256 = "17vdrw71ys1n5g9pdmzipmr706bslq0gbxxjhacxnrgsz8r4rl6a";
};
buildInputs = [
fuse bison flex_2_5_35 openssl ncurses readline
autoconf automake libtool pkgconfig zlib libaio libxml2
acl sqlite liburcu attr makeWrapper
(python2.withPackages (pkgs: [
acl sqlite liburcu attr makeWrapper utillinux
(python3.withPackages (pkgs: [
pkgs.flask
pkgs.prettytable
pkgs.requests
pkgs.pyxattr
]))
# NOTE: `python2` has to be *AFTER* the above `python2.withPackages`,
# NOTE: `python3` has to be *AFTER* the above `python3.withPackages`,
# to ensure that the packages are available but the `toPythonPath`
# shell function used in `postFixup` is also still available.
python2
python3
];
# Some of the headers reference acl
propagatedBuildInputs = [
@@ -65,21 +66,15 @@ rec {
inherit (s) name version;
inherit buildInputs propagatedBuildInputs;
patches = [
# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed
./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
];
postPatch = ''
sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
'';
patches = [
# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450546 is fixed
./glusterfs-use-PATH-instead-of-hardcodes.patch
# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450593 is fixed
./glusterfs-python-remove-find_library.patch
# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed
./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1559130 is fixed
./glusterfs-glusterfind-log-remote-node_cmd-error.patch
];
# Note that the VERSION file is something that is present in release tarballs
# but not in git tags (at least not as of writing in v3.10.1).
# That's why we have to create it.
@@ -92,6 +87,7 @@ rec {
preConfigure = ''
echo "v${s.version}" > VERSION
./autogen.sh
export PYTHON=${python3}/bin/python
'';
configureFlags = [
@@ -178,6 +174,9 @@ rec {
# on a real TTY for testing purposes.
echo "" | (mkdir -p nix-test-dir-for-gfid_to_path && touch b && $out/libexec/glusterfs/gfind_missing_files/gfid_to_path.py nix-test-dir-for-gfid_to_path)
$out/share/glusterfs/scripts/eventsdash.py --help
# this gets falsely loaded as module by glusterfind
rm -r $out/bin/conf.py
'';
src = fetchurl {

6
pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
View File

@@ -18,10 +18,10 @@ index f87d8a454..b4d3f5d10 100644
fi
GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs"
-GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd"
+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd"
+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/lib/misc/glusterfsd"
prefix=$old_prefix
exec_prefix=$old_exec_prefix
--
--
2.12.0

49
pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch
View File

@@ -1,49 +0,0 @@
From 92a6b84a37e7e2e0ec0655ca45cedb64ab72080e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 8 Sep 2017 02:40:01 +0200
Subject: [PATCH] glusterfind: Log remote stderr on `node_cmd` error.
The problem of lost stderr was introduced in
commit feea851fad4f89b48bfe89fe3b75250cc7bd6501.
Change-Id: Ic98f9bc9682ae3bd9c3ebea3855667fc8ba2843d
---
tools/glusterfind/src/main.py | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py
index c125f970a..6fffce4b3 100644
--- a/tools/glusterfind/src/main.py
+++ b/tools/glusterfind/src/main.py
@@ -75,12 +75,27 @@ def node_cmd(host, host_uuid, task, cmd, args, opts):
cmd = ["ssh",
"-oNumberOfPasswordPrompts=0",
"-oStrictHostKeyChecking=no",
+ # We force TTY allocation (-t -t) so that Ctrl+C is handed
+ # through; see:
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1382236
+ # Note that this turns stderr of the remote `cmd`
+ # into stdout locally.
"-t",
"-t",
"-i", pem_key_path,
"root@%s" % host] + cmd
- execute(cmd, exit_msg="%s - %s failed" % (host, task), logger=logger)
+ (returncode, err, out) = execute(cmd, logger=logger)
+ if returncode != 0:
+ # Because the `-t -t` above turns the remote stderr into
+ # local stdout, we need to log both stderr and stdout
+ # here to print all error messages.
+ fail("%s - %s failed; stdout (including remote stderr):\n"
+ "%s\n"
+ "stderr:\n"
+ "%s" % (host, task, out, err),
+ returncode,
+ logger=logger)
if opts.get("copy_outfile", False) and not localdir:
cmd_copy = ["scp",
--
2.12.0

156
pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
View File

@@ -1,156 +0,0 @@
From e6293e367f56833457291e32a4df7b21a52365a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 13 May 2017 18:54:36 +0200
Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593
`find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6.
Change-Id: Iee26085cb5d14061001f19f032c2664d69a378a8
---
api/examples/getvolfile.py | 2 +-
geo-replication/syncdaemon/libcxattr.py | 3 +--
geo-replication/syncdaemon/libgfchangelog.py | 6 ++----
tests/features/ipctest.py | 10 ++--------
tests/utils/libcxattr.py | 5 ++---
tools/glusterfind/src/libgfchangelog.py | 3 +--
.../features/changelog/lib/examples/python/libgfchangelog.py | 3 +--
7 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py
index 0c95213f0..32c2268b3 100755
--- a/api/examples/getvolfile.py
+++ b/api/examples/getvolfile.py
@@ -3,7 +3,7 @@
import ctypes
import ctypes.util
-api = ctypes.CDLL(ctypes.util.find_library("gfapi"))
+api = ctypes.CDLL("libgfapi.so")
api.glfs_get_volfile.argtypes = [ctypes.c_void_p,
ctypes.c_void_p,
ctypes.c_ulong]
diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py
index 3671e102c..f576648b7 100644
--- a/geo-replication/syncdaemon/libcxattr.py
+++ b/geo-replication/syncdaemon/libcxattr.py
@@ -10,7 +10,6 @@
import os
from ctypes import CDLL, create_string_buffer, get_errno
-from ctypes.util import find_library
class Xattr(object):
@@ -25,7 +24,7 @@ class Xattr(object):
sizes we expect
"""
- libc = CDLL(find_library("c"), use_errno=True)
+ libc = CDLL("libc.so.6", use_errno=True)
@classmethod
def geterrno(cls):
diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py
index 334f5e9ea..093ae157a 100644
--- a/geo-replication/syncdaemon/libgfchangelog.py
+++ b/geo-replication/syncdaemon/libgfchangelog.py
@@ -9,14 +9,12 @@
#
import os
-from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, \
- get_errno, byref, c_ulong
-from ctypes.util import find_library
+from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong
from syncdutils import ChangelogException, ChangelogHistoryNotAvailable
class Changes(object):
- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL,
+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL,
use_errno=True)
@classmethod
diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py
index 5aff319b8..933924861 100755
--- a/tests/features/ipctest.py
+++ b/tests/features/ipctest.py
@@ -1,14 +1,8 @@
#!/usr/bin/python
import ctypes
-import ctypes.util
-
-# find_library does not lookup LD_LIBRARY_PATH and may miss the
-# function. In that case, retry with less portable but explicit name.
-libgfapi = ctypes.util.find_library("gfapi")
-if libgfapi == None:
- libgfapi = "libgfapi.so"
-api = ctypes.CDLL(libgfapi,mode=ctypes.RTLD_GLOBAL)
+
+api = ctypes.CDLL("libgfapi.so",mode=ctypes.RTLD_GLOBAL)
api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ]
api.glfs_ipc.restype = ctypes.c_int
diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py
index 149db72e6..4e6e6c46d 100644
--- a/tests/utils/libcxattr.py
+++ b/tests/utils/libcxattr.py
@@ -11,7 +11,6 @@
import os
import sys
from ctypes import CDLL, c_int, create_string_buffer
-from ctypes.util import find_library
class Xattr(object):
@@ -28,9 +27,9 @@ class Xattr(object):
if sys.hexversion >= 0x02060000:
from ctypes import DEFAULT_MODE
- libc = CDLL(find_library("libc"), DEFAULT_MODE, None, True)
+ libc = CDLL("libc.so.6", DEFAULT_MODE, None, True)
else:
- libc = CDLL(find_library("libc"))
+ libc = CDLL("libc.so.6")
@classmethod
def geterrno(cls):
diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py
index 0f6b40d6c..9ca3f326b 100644
--- a/tools/glusterfind/src/libgfchangelog.py
+++ b/tools/glusterfind/src/libgfchangelog.py
@@ -11,14 +11,13 @@
import os
from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref
from ctypes import RTLD_GLOBAL
-from ctypes.util import find_library
class ChangelogException(OSError):
pass
-libgfc = CDLL(find_library("gfchangelog"), use_errno=True, mode=RTLD_GLOBAL)
+libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL)
def raise_oserr():
diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py
index 10e73c02b..2cdbf1152 100644
--- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py
+++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py
@@ -1,9 +1,8 @@
import os
from ctypes import *
-from ctypes.util import find_library
class Changes(object):
- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True)
+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True)
@classmethod
def geterrno(cls):
--
2.12.0

138
pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
View File

@@ -1,138 +0,0 @@
From 616381bc25b0e90198683fb049f994e82d467d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 13 May 2017 02:45:49 +0200
Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes
#1450546.
Instead, rely on programs to be in PATH, as gluster already
does in many places across its code base.
Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246
---
contrib/fuse-lib/mount-common.c | 8 ++++----
xlators/mgmt/glusterd/src/glusterd-ganesha.c | 6 +++---
xlators/mgmt/glusterd/src/glusterd-quota.c | 6 +++---
xlators/mgmt/glusterd/src/glusterd-snapshot.c | 4 ++--
xlators/mgmt/glusterd/src/glusterd-utils.c | 14 +-------------
5 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c
index e9f80fe81..6380dd867 100644
--- a/contrib/fuse-lib/mount-common.c
+++ b/contrib/fuse-lib/mount-common.c
@@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt,
exit (1);
}
#ifdef GF_LINUX_HOST_OS
- execl ("/bin/umount", "/bin/umount", "-i", rel_mnt,
+ execl ("umount", "umount", "-i", rel_mnt,
lazy ? "-l" : NULL, NULL);
- GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s",
+ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
progname, strerror (errno));
#elif __NetBSD__
/* exitting the filesystem causes the umount */
exit (0);
#else
- execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL);
- GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s",
+ execl ("umount", "umount", "-f", rel_mnt, NULL);
+ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
progname, strerror (errno));
#endif /* GF_LINUX_HOST_OS */
exit (1);
diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
index 0e6629cf0..fcb4738b7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
@@ -30,7 +30,7 @@
#ifndef _PATH_SETFATTR
# ifdef GF_LINUX_HOST_OS
-# define _PATH_SETFATTR "/usr/bin/setfattr"
+# define _PATH_SETFATTR "setfattr"
# endif
# ifdef __NetBSD__
# define _PATH_SETFATTR "/usr/pkg/bin/setfattr"
@@ -335,7 +335,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
if (type == GF_QUOTA_OPTION_TYPE_ENABLE ||
type == GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS)
- runner_add_args (&runner, "/usr/bin/find", ".", NULL);
+ runner_add_args (&runner, "find", ".", NULL);
else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) {
@@ -351,7 +351,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1",
"{}", "\\", ";", NULL);
#else
- runner_add_args (&runner, "/usr/bin/find", ".",
+ runner_add_args (&runner, "find", ".",
"-exec", _PATH_SETFATTR, "-n",
VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v",
"1", "{}", "\\", ";", NULL);
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
index da0152366..f0d135350 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
@@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname,
}
runinit (&runner);
- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "vg_name",
+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "vg_name",
device, NULL);
runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
snprintf (msg, sizeof (msg), "Get volume group for device %s", device);
@@ -1982,7 +1982,7 @@ glusterd_is_thinp_brick (char *device, uint32_t *op_errno)
runinit (&runner);
- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "pool_lv",
+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "pool_lv",
device, NULL);
runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
runner_log (&runner, this->name, GF_LOG_DEBUG, msg);
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 51db13df0..6fa7b92f9 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -6027,7 +6027,6 @@ static struct fs_info {
char *fs_tool_pattern;
char *fs_tool_pkg;
} glusterd_fs[] = {
- /* some linux have these in /usr/sbin/and others in /sbin/? */
{ "xfs", "xfs_info", NULL, "isize=", "xfsprogs" },
{ "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
{ "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
@@ -6048,7 +6047,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
char *trail = NULL;
runner_t runner = {0, };
struct fs_info *fs = NULL;
- char fs_tool_name[256] = {0, };
static dict_t *cached_fs = NULL;
memset (key, 0, sizeof (key));
@@ -6085,17 +6083,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
cur_word = "N/A";
goto cached;
}
-
- snprintf (fs_tool_name, sizeof (fs_tool_name),
- "/usr/sbin/%s", fs->fs_tool_name);
- if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
- runner_add_arg (&runner, fs_tool_name);
- else {
- snprintf (fs_tool_name, sizeof (fs_tool_name),
- "/sbin/%s", fs->fs_tool_name);
- if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
- runner_add_arg (&runner, fs_tool_name);
- }
+ runner_add_arg (&runner, fs->fs_tool_name);
break;
}
}
--
2.12.0

4
pkgs/tools/filesystems/moosefs/default.nix
View File

@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "moosefs";
version = "3.0.104";
version = "3.0.105";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "057xg7zy872w4hczk9b9ckmqyah3qhgysvxddqizr204cyadicxh";
sha256 = "0wphpdll0j4i6d4yxykaz2bamv83y0sj7j3cfv4br1zamdyprfwx";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];

6
pkgs/tools/graphics/argyllcms/default.nix
View File

@@ -2,7 +2,7 @@
, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
, libXdmcp, libXau, lib, openssl }:
let
version = "2.1.0";
version = "2.1.1";
in
stdenv.mkDerivation rec {
name = "argyllcms-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
# while on me. It might be good to find a mirror
url = "https://www.argyllcms.com/Argyll_V${version}_src.zip";
sha256 = "02zxy6ipp84hrd1p5nspp3f9dzphr0qwlq8s557jn746cf866bv3";
sha256 = "0zq3fipky44xg536kdhg9bchi6s9ka7n1q73fwf9ja766s8rj99m";
# The argyllcms web server doesn't like curl ...
curlOpts = "--user-agent 'Mozilla/5.0'";
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
homepage = http://www.argyllcms.com;
description = "Color management system (compatible with ICC)";
license = licenses.gpl3;
maintainers = [ maintainers.rickynils ];
maintainers = [];
platforms = platforms.linux;
};
}

2
pkgs/tools/graphics/scrot/default.nix
View File

@@ -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; [ ];
maintainers = with maintainers; [ globin ];
license = licenses.mit;
};
}

9
pkgs/tools/graphics/wkhtmltopdf/default.nix
View File

@@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, qt5, fontconfig, freetype, libpng, zlib, libjpeg
{ mkDerivation, lib, fetchFromGitHub, qtwebkit, qtsvg, qtxmlpatterns
, fontconfig, freetype, libpng, zlib, libjpeg
, openssl, libX11, libXext, libXrender }:
stdenv.mkDerivation rec {
mkDerivation rec {
version = "0.12.5";
name = "wkhtmltopdf-${version}";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
fontconfig freetype libpng zlib libjpeg openssl
libX11 libXext libXrender
qt5.qtwebkit qt5.qtsvg qt5.qtxmlpatterns
qtwebkit qtsvg qtxmlpatterns
];
prePatch = ''
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://wkhtmltopdf.org/;
description = "Tools for rendering web pages to PDF or images";
longDescription = ''

12
pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
View File

@@ -21,15 +21,15 @@ mkDerivation rec {
buildInputs = [ fcitx qtbase ];
preInstall = ''
substituteInPlace platforminputcontext/cmake_install.cmake \
--replace ${qtbase.bin} $out
substituteInPlace quickphrase-editor/cmake_install.cmake \
--replace ${fcitx} $out
preConfigure = ''
substituteInPlace platforminputcontext/CMakeLists.txt \
--replace \$"{CMAKE_INSTALL_QTPLUGINDIR}" $out/${qtbase.qtPluginPrefix}
substituteInPlace quickphrase-editor/CMakeLists.txt \
--replace \$"{FCITX4_ADDON_INSTALL_DIR}" $out/lib/fcitx
'';
meta = with lib; {
homepage = https://gitlab.com/fcitx/fcitx-qt5;
homepage = "https://gitlab.com/fcitx/fcitx-qt5";
description = "Qt5 IM Module for Fcitx";
license = licenses.gpl2;
platforms = platforms.linux;

23
pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, docbook2x, pkgconfig
, gtk3, dconf, gobject-introspection
, ibus, python3 }:
, ibus, python3, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "ibus-table-${version}";
pname = "ibus-table";
version = "1.9.21";
src = fetchFromGitHub {
@@ -30,18 +30,29 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
dconf gtk3 gobject-introspection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ]))
dconf
gtk3
gobject-introspection
ibus
(python3.withPackages (pypkgs: with pypkgs; [
pygobject3
(toPythonModule ibus)
]))
];
nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ];
nativeBuildInputs = [
autoreconfHook
docbook2x
pkgconfig
python3.pkgs.wrapPython
wrapGAppsHook
];
postUnpack = ''
substituteInPlace $sourceRoot/engine/Makefile.am \
--replace "docbook2man" "docbook2man --sgml"
'';
postFixup = "wrapPythonPrograms";
meta = with stdenv.lib; {
isIbusEngine = true;
description = "An IBus framework for table-based input methods";

6
pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
View File

@@ -12,14 +12,14 @@ let
in
stdenv.mkDerivation rec {
name = "ibus-typing-booster-${version}";
version = "2.6.2";
pname = "ibus-typing-booster";
version = "2.6.4";
src = fetchFromGitHub {
owner = "mike-fabian";
repo = "ibus-typing-booster";
rev = version;
sha256 = "0013njl539knp78iciv860fkpl15bkwarjwd2vjrmr5dbb0h15yc";
sha256 = "1k074y9439w8v6s71i7hhmkq9bgkl836y2a409rx3mb73vidadjr";
};
patches = [ ./hunspell-dirs.patch ];

2
pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix
View File

@@ -4,7 +4,7 @@
let
hunspellDirs = with lib; makeSearchPath ":" (flatten (flip map langs (lang: [
hunspellDirs = with lib; makeSearchPath ":" (flatten (forEach langs (lang: [
"${hunspellDicts.${lang}}/share/hunspell"
"${hunspellDicts.${lang}}/share/myspell"
"${hunspellDicts.${lang}}/share/myspell/dicts"

8
pkgs/tools/misc/autorandr/default.nix
View File

@@ -51,11 +51,11 @@ in
sha256 = "1bp1cqkrpg77rjyh4lq1agc719fmxn92jkiicf6nbhfl8kf3l3vy";
};
meta = {
meta = with stdenv.lib; {
homepage = https://github.com/phillipberndt/autorandr/;
description = "Automatically select a display configuration based on connected devices";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.coroa ];
platforms = stdenv.lib.platforms.unix;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ coroa globin ];
platforms = platforms.unix;
};
}

4
pkgs/tools/misc/birdfont/default.nix
View File

@@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "birdfont";
version = "2.26.0";
version = "2.27.0";
src = fetchurl {
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
sha256 = "0lcbwmwfb18dpr5kpnrl2zx59jhvj7k7vzjld51zv0zhcvl9fg3j";
sha256 = "0dr2cnvq30wak0j2k8089is7fvhw0ppwkfrrw1m649s2b95wav3q";
};
nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ];

7
pkgs/tools/misc/bonfire/default.nix
View File

@@ -30,7 +30,12 @@ buildPythonApplication rec {
--replace "data_files = *.rst, *.txt" ""
'';
buildInputs = [ httpretty pytest_3 pytestcov ];
buildInputs = [ httpretty pytest pytestcov ];
preCheck = ''
# fix compatibility with pytest 4
substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
'';
propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ];

28
pkgs/tools/misc/cbmem/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "cbmem";
version = "4.9";
src = fetchurl {
url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij";
};
buildPhase = ''
make -C util/cbmem
'';
installPhase = ''
install -Dm755 util/cbmem/cbmem $out/bin/cbmem
'';
meta = with stdenv.lib; {
description = "Read coreboot timestamps and console logs";
homepage = "https://www.coreboot.org";
license = licenses.gpl2;
maintainers = [ maintainers.petabyteboy ];
platforms = platforms.linux;
};
}

4
pkgs/tools/misc/chafa/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec{
version = "1.0.1";
version = "1.2.1";
pname = "chafa";
src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
rev = version;
sha256 = "1i1cnzmb12pxldc7y4q1xdmybv9xkhzrjyhdvmk3qsn02p859q04";
sha256 = "19dck47v4hd07q9742mgb928h7y1y9638qlh2rzsvqsfqvqmxh85";
};
nativeBuildInputs = [ autoconf

6
pkgs/tools/misc/chezmoi/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "chezmoi-${version}";
version = "1.3.0";
version = "1.5.5";
goPackagePath = "github.com/twpayne/chezmoi";
@@ -10,13 +10,13 @@ buildGoPackage rec {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "0dvdjx5khpw62lprn06k271xfc9fdrw4c1q74vd1vffaz60yfd8d";
sha256 = "18kc3b2ncjzxivycx3mhqw9kbqp0sxmlgc2ddvhgj2vpvlkayzkh";
};
goDeps = ./deps.nix;
buildFlagsArray = [
"-ldflags=-s -w -X ${goPackagePath}/cmd.version=${version}"
"-ldflags=-s -w -X ${goPackagePath}/cmd.VersionStr=${version}"
];
meta = with stdenv.lib; {

180
pkgs/tools/misc/chezmoi/deps.nix generated
View File

@@ -45,15 +45,6 @@
sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
};
}
{
goPackagePath = "github.com/blang/semver";
fetch = {
type = "git";
url = "https://github.com/blang/semver";
rev = "v3.5.1";
sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
};
}
{
goPackagePath = "github.com/coreos/etcd";
fetch = {
@@ -81,15 +72,6 @@
sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
};
}
{
goPackagePath = "github.com/d4l3k/messagediff";
fetch = {
type = "git";
url = "https://github.com/d4l3k/messagediff";
rev = "v1.2.1";
sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v";
};
}
{
goPackagePath = "github.com/danieljoos/wincred";
fetch = {
@@ -126,6 +108,33 @@
sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "v1.2.0";
sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
};
}
{
goPackagePath = "github.com/google/go-github";
fetch = {
type = "git";
url = "https://github.com/google/go-github";
rev = "v25.0.1";
sha256 = "1wggj64dm73zmav64qfgw8v3pkzxxmlaqrccvs5rf66j0wij9g20";
};
}
{
goPackagePath = "github.com/google/go-querystring";
fetch = {
type = "git";
url = "https://github.com/google/go-querystring";
rev = "v1.0.0";
sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
};
}
{
goPackagePath = "github.com/google/renameio";
fetch = {
@@ -180,6 +189,24 @@
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
{
goPackagePath = "github.com/kr/pty";
fetch = {
type = "git";
url = "https://github.com/kr/pty";
rev = "v1.1.1";
sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
};
}
{
goPackagePath = "github.com/kr/text";
fetch = {
type = "git";
url = "https://github.com/kr/text";
rev = "v0.1.0";
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
};
}
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
@@ -190,12 +217,12 @@
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "v1.0.0";
sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
url = "https://github.com/mattn/go-isatty";
rev = "v0.0.7";
sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd";
};
}
{
@@ -225,13 +252,31 @@
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/russross/blackfriday";
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
rev = "v2.0.1";
sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
};
}
{
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
rev = "v1.0.0";
sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
};
}
{
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
rev = "v1.1.2";
sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
rev = "v1.2.2";
sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9";
};
}
{
@@ -284,8 +329,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
rev = "v0.1.1";
sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
rev = "v0.2.0";
sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k";
};
}
{
@@ -293,8 +338,17 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.2.2";
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
rev = "v1.3.0";
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
};
}
{
goPackagePath = "github.com/twpayne/go-difflib";
fetch = {
type = "git";
url = "https://github.com/twpayne/go-difflib";
rev = "v1.3.0";
sha256 = "01lidr7brrdv4xqx87n6c2ppyaj8rdf9lqj85qhbbalwy6z34fj8";
};
}
{
@@ -311,8 +365,17 @@
fetch = {
type = "git";
url = "https://github.com/twpayne/go-vfs";
rev = "v1.0.3";
sha256 = "138ykzmb4994qwbv3m99536p75804ap15c2drvz6d3k0v95rbw38";
rev = "v1.0.6";
sha256 = "0sqjng5qm4s7crq9s1f5y5niq4wss6dizip62zx37iyvws1yngjd";
};
}
{
goPackagePath = "github.com/twpayne/go-vfsafero";
fetch = {
type = "git";
url = "https://github.com/twpayne/go-vfsafero";
rev = "v1.0.0";
sha256 = "18jwxhlrjd06z8xzg9ij0irl4f79jfy5jpwiz6xqlhzb1fja19pw";
};
}
{
@@ -320,8 +383,8 @@
fetch = {
type = "git";
url = "https://github.com/twpayne/go-xdg";
rev = "v1.0.0";
sha256 = "06np468cl8bbpal6x0mf8q6jzlkz65rzma5y65n7wfmrg2k7yn72";
rev = "v3.1.0";
sha256 = "0j8q7yzixs6jlaad0lpa8hs6b240gm2cmy0yxgnprrbpa0y2r7ln";
};
}
{
@@ -351,13 +414,49 @@
sha256 = "1wah726fi08h6ga5wnwxd1zyxq7ckp3qliql44bxgliw2p35kkyb";
};
}
{
goPackagePath = "go.etcd.io/bbolt";
fetch = {
type = "git";
url = "https://github.com/etcd-io/bbolt";
rev = "4af6cfab7010";
sha256 = "1zgirl82lph606vw39wj4mvk8bkq2bakvnx49dpq7l5dsdhiydpv";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "505ab145d0a9";
sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s";
rev = "c2843e01d9a2";
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "d8887717615a";
sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163";
};
}
{
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "d2e6202438be";
sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "e225da77a7e6";
sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p";
};
}
{
@@ -365,8 +464,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "a5c9d58dba9a";
sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9";
rev = "10058d7d4faa";
sha256 = "0y83433yjgsr7057h99g5ayljzlivx2bnkcp01xnzqz8lppv8fql";
};
}
{
@@ -378,6 +477,15 @@
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "v1.1.0";
sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
};
}
{
goPackagePath = "gopkg.in/check.v1";
fetch = {

14
pkgs/tools/misc/cht.sh/default.nix
View File

@@ -9,15 +9,15 @@
stdenv.mkDerivation rec {
name = "cht.sh-${version}";
version = "unstable-2018-11-02";
version = "unstable-2019-08-06";
nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub {
owner = "chubin";
repo = "cheat.sh";
rev = "9595805ac68b3c096f7c51fa024dcb97a7dfac44";
sha256 = "11g8say5fksg0zg0bqrgl92rprn4lwp20g9rz1i0r38f0jy3nyrf";
rev = "f507ba51d6bc1ae6c7df808cadbe4f8603951b6b";
sha256 = "0r7x9a3qzzkbd1m5zdlkpmhx0p7b7ja42190s7fidls3dsm710g0";
};
# Fix ".cht.sh-wrapped" in the help message
@@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
installPhase = ''
install -m755 -D share/cht.sh.txt "$out/bin/cht.sh"
# install shell completion files
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
mv share/bash_completion.txt $out/share/bash-completion/completions/cht.sh
cp share/zsh.txt $out/share/zsh/site-functions/_cht
wrapProgram "$out/bin/cht.sh" \
--prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}"
'';
@@ -32,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "CLI client for cheat.sh, a community driven cheat sheet";
license = licenses.mit;
maintainers = with maintainers; [ fgaz ];
maintainers = with maintainers; [ fgaz evanjs ];
homepage = https://github.com/chubin/cheat.sh;
};
}

52
pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch Normal file
View File

@@ -0,0 +1,52 @@
From 0251229bfd9617e8a35cf9dd7d338d63fff74a0c Mon Sep 17 00:00:00 2001
From: Assaf Gordon <assafgordon@gmail.com>
Date: Mon, 13 May 2019 16:37:40 -0600
Subject: [PATCH] tests: avoid false-positive in date-debug test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When debugging an invalid date due to DST switching, the intermediate
'normalized time' should not be checked - its value can differ between
systems (e.g. glibc vs musl).
Reported by Niklas Hambüchen in
https://lists.gnu.org/r/coreutils/2019-05/msg00031.html
Analyzed by Rich Felker in
https://lists.gnu.org/r/coreutils/2019-05/msg00039.html
* tests/misc/date-debug.sh: Replace the exact normalized time
with 'XX:XX:XX' so different values would not trigger test failure.
---
tests/misc/date-debug.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh
index aa47f1abb..2ce6f4ce8 100755
--- a/tests/misc/date-debug.sh
+++ b/tests/misc/date-debug.sh
@@ -71,7 +71,7 @@ date: input timezone: TZ="America/Edmonton" in date string
date: using specified time as starting value: '02:30:00'
date: error: invalid date/time value:
date: user provided time: '(Y-M-D) 2006-04-02 02:30:00'
-date: normalized time: '(Y-M-D) 2006-04-02 03:30:00'
+date: normalized time: '(Y-M-D) 2006-04-02 XX:XX:XX'
date: --
date: possible reasons:
date: non-existing due to daylight-saving time;
@@ -81,7 +81,14 @@ date: invalid date 'TZ="America/Edmonton" 2006-04-02 02:30:00'
EOF
# date should return 1 (error) for invalid date
-returns_ 1 date --debug -d "$in2" >out2 2>&1 || fail=1
+returns_ 1 date --debug -d "$in2" >out2-t 2>&1 || fail=1
+
+# The output line of "normalized time" can differ between systems
+# (e.g. glibc vs musl) and should not be checked.
+# See: https://lists.gnu.org/archive/html/coreutils/2019-05/msg00039.html
+sed '/normalized time:/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]/ XX:XX:XX/' \
+ out2-t > out2 || framework_failure_
+
compare exp2 out2 || fail=1
##

13
pkgs/tools/misc/coreutils/default.nix
View File

@@ -25,6 +25,9 @@ stdenv.mkDerivation rec {
};
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
# Fix failing test with musl. See https://lists.gnu.org/r/coreutils/2019-05/msg00031.html
# To be removed in coreutils-8.32.
++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch
# Fix compilation in musl-cross environments. To be removed in coreutils-8.32.
++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch;
@@ -54,10 +57,12 @@ stdenv.mkDerivation rec {
for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do
echo "int main() { return 77; }" > "$f"
done
'' + optionalString (stdenv.hostPlatform.libc == "musl") ''
echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c
echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c
'';
'' + optionalString (stdenv.hostPlatform.libc == "musl") (lib.concatStringsSep "\n" [
''
echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c
echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c
''
]);
outputs = [ "out" "info" ];

4
pkgs/tools/misc/debianutils/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "debianutils";
version = "4.8.6.2";
version = "4.8.6.3";
src = fetchurl {
url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz";
sha256 = "1fhbn62v85ydcap4pjx6jb37bly42lf3l64ig4ppr7yiaax8i8xc";
sha256 = "08g2gdm6n66w5m8qwm4f48wzgs3ymkpki6dg01nwzwbdzhxdxirc";
};
meta = with stdenv.lib; {

21
pkgs/tools/misc/disper/default.nix
View File

@@ -1,9 +1,19 @@
{stdenv, fetchurl, python, xorg, makeWrapper}:
{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }:
stdenv.mkDerivation rec {
name = "disper-0.3.1";
pname = "disper";
version = "0.3.1.1";
buildInputs = [python makeWrapper];
src = fetchFromGitHub {
owner = "apeyser";
repo = pname;
rev = "${pname}-${version}";
sha256 = "1kl4py26n95q0690npy5mc95cv1cyfvh6kxn8rvk62gb8scwg9zn";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python ];
preConfigure = ''
export makeFlags="PREFIX=$out"
@@ -14,11 +24,6 @@ stdenv.mkDerivation rec {
--prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}"
'';
src = fetchurl {
url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.1.tar.gz;
sha256 = "1l8brcpfn4iascb454ym0wrv5kqyz4f0h8k6db54nc3zhfwy7vvw";
};
meta = {
description = "On-the-fly display switch utility";
homepage = http://willem.engen.nl/projects/disper/;

7
pkgs/tools/misc/docui/default.nix
View File

@@ -2,21 +2,22 @@
buildGoModule rec {
name = "docui-${version}";
version = "1.0.3";
version = "2.0.0";
src = fetchFromGitHub {
owner = "skanehira";
repo = "docui";
rev = version;
sha256 = "1kbap36hccwlj273is98cvgf5z5cl2c3s6p46nh6bnykz3zqzs71";
sha256 = "0rizl4rxmb3brzvqxw5llbgvq3rncix3h60pgq50djdf0jjnn5hs";
};
modSha256 = "1qma9bnd4k594cr5dcv74xns53mhfyl4jsm01chf85dxywjjd9vd";
modSha256 = "0asqz9nnx80g2wi7dzxrfmppcraywrwdqi9vzr66vaihwpfpfnwz";
meta = with stdenv.lib; {
description = "TUI Client for Docker";
homepage = https://github.com/skanehira/docui;
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ aethelz ];
};
}

6
pkgs/tools/misc/dua/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.1.5";
version = "2.1.11";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "0xiprpk74l0q5w3j82lx1l3jy4mi015nvlixih9z1lam4qi1yq0p";
sha256 = "08zgi2yiynb20l1f9rhly4a7zgqnr7lq3cr5vkmh1jnfs6z27dv6";
};
cargoSha256 = "1jg1ljm5h21shkyfrq0ivz9m0c25dxc0kd6cipf5i2dbnzcszmhh";
cargoSha256 = "0ca9gaih0b9qg7bdgyhvb9gr1mq23r62pi0845vwc216jfaag079";
meta = with lib; {
description = "A tool to conveniently learn about the disk usage of directories, fast!";

4
pkgs/tools/misc/esptool/default.nix
View File

@@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "esptool";
version = "2.6";
version = "2.7";
src = fetchFromGitHub {
owner = "espressif";
repo = "esptool";
rev = "v${version}";
sha256 = "1hxgzqh5z81dq1k2xd6329h8idk9y8q29izrwm1vhn0m9v1pxa22";
sha256 = "1p5hx0rhs986ffqz78rdxg7jayndsq632399xby39k17kvd3mb31";
};
checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order openssl ];

2
pkgs/tools/misc/exa/default.nix
View File

@@ -52,6 +52,6 @@ buildRustPackage rec {
'';
homepage = https://the.exa.website;
license = licenses.mit;
maintainers = with maintainers; [ ehegnes lilyball ];
maintainers = with maintainers; [ ehegnes lilyball globin ];
};
}

2
pkgs/tools/misc/fd/default.nix
View File

@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
'';
homepage = "https://github.com/sharkdp/fd";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ dywedir ];
maintainers = with maintainers; [ dywedir globin ];
platforms = platforms.all;
};
}

51
pkgs/tools/misc/fffuu/default.nix Normal file
View File

@@ -0,0 +1,51 @@
{ mkDerivation, haskellPackages, fetchFromGitHub, lib }:
mkDerivation rec {
pname = "fffuu";
version = "unstable-2018-05-26";
src = fetchFromGitHub {
owner = "diekmann";
repo = "Iptables_Semantics";
rev = "e0a2516bd885708fce875023b474ae341cbdee29";
sha256 = "1qc7p44dqja6qrjbjdc2xn7n9v41j5v59sgjnxjj5k0mxp58y1ch";
};
postPatch = ''
substituteInPlace haskell_tool/fffuu.cabal \
--replace "containers >=0.5 && <0.6" "containers >= 0.6" \
--replace "optparse-generic >= 1.2.3 && < 1.3" "optparse-generic >= 1.2.3"
'';
preCompileBuildDriver = ''
cd haskell_tool
'';
isLibrary = false;
isExecutable = true;
# fails with sandbox
doCheck = false;
libraryHaskellDepends = with haskellPackages; [
base
containers
split
parsec
optparse-generic
];
executableHaskellDepends = with haskellPackages; [ base ];
testHaskellDepends = with haskellPackages; [
tasty
tasty-hunit
tasty-golden
];
description = "Fancy Formal Firewall Universal Understander";
homepage = https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool;
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.marsam ];
}

8
pkgs/tools/misc/fpp/default.nix
View File

@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, python27 }:
{ stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
name = "fpp-${version}";
version = "0.7.2";
version = "0.8.2";
src = fetchFromGitHub {
owner = "facebook";
repo = "PathPicker";
rev = version;
sha256 = "03n8sc2fvs2vk46jv6qfkjbyqz85yxnphvabji7qnmd3jv631w47";
sha256 = "00916xx4scd4xr9zxqkyhilczi27f2qm5y042592wr79ddix4n9v";
};
postPatch = ''
substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python27.interpreter}"'
substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python3.interpreter}"'
'';
installPhase = ''

4
pkgs/tools/misc/geekbench/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "geekbench-${version}";
version = "4.4.0";
version = "4.4.1";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
sha256 = "1awdr54vw29ah7aah2bxpy4qkqasxj67sqk6gir8ybnxb5hxm3ri";
sha256 = "0s3v8frflqqifyzq84xi6322wg8c9f5wcaic9zlpdf6wylqsiali";
};
dontConfigure = true;

33
pkgs/tools/misc/gparted/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, intltool, gettext, makeWrapper
, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2, hicolor-icon-theme
, gpart, hdparm, procps, utillinux
{ stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3
, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2, hicolor-icon-theme
, gpart, hdparm, procps, utillinux, polkit, wrapGAppsHook, substituteAll
}:
stdenv.mkDerivation rec {
@@ -11,16 +11,31 @@ stdenv.mkDerivation rec {
sha256 = "0mdvn85jvy72ff7nds3dakx9kzknh8gx1z8i0w2sf970q03qp2z4";
};
# Tries to run `pkexec --version` to get version.
# however the binary won't be suid so it returns
# an error preventing the program from detection
patches = [
(substituteAll {
src = ./polkit.patch;
polkit_version = polkit.version;
})
];
configureFlags = [ "--disable-doc" ];
buildInputs = [ parted glib libuuid gtkmm3 libxml2 hicolor-icon-theme ];
nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ];
buildInputs = [ parted glib libuuid gtkmm3 libxml2 hicolor-icon-theme polkit.bin gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ intltool gettext pkgconfig wrapGAppsHook ];
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux procps coreutils gnused gnugrep ]}"
)
'';
# Doesn't get installed automaticallly if PREFIX != /usr
postInstall = ''
wrapProgram $out/bin/gparted \
--prefix PATH : "${procps}/bin"
wrapProgram $out/sbin/gpartedbin \
--prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux ]}"
install -D -m0644 org.gnome.gparted.policy \
$out/share/polkit-1/actions/org.gnome.gparted.policy
'';
meta = with stdenv.lib; {

12
pkgs/tools/misc/gparted/polkit.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -ru old/gparted-1.0.0/configure gparted-1.0.0/configure
--- old/gparted-1.0.0/configure 2019-05-29 12:02:13.000000000 -0400
+++ gparted-1.0.0/configure 2019-08-08 18:09:52.792795781 -0400
@@ -16145,7 +16145,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkexec >= $PKEXEC_REQUIRED_VERSION" >&5
$as_echo_n "checking for pkexec >= $PKEXEC_REQUIRED_VERSION... " >&6; }
PKEXEC_REQUIRED_INT=`echo "$PKEXEC_REQUIRED_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'`
-PKEXEC_VERSION_OUTPUT=`pkexec --version 2> /dev/null` ||
+PKEXEC_VERSION_OUTPUT='pkexec version @polkit_version@' ||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
if test "x$PKEXEC_VERSION_OUTPUT" != 'x'; then

4
pkgs/tools/misc/graylog/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre_headless }:
stdenv.mkDerivation rec {
version = "3.0.2";
version = "3.1.0";
name = "graylog-${version}";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "1xw9fxdb3n9h595sw1imns6g5a5339ppn2plx8qw4ngnkzd9pvhj";
sha256 = "0zv64cnd5nrn2hgbjmcwjam8dx5y2a7gz5x7xb9kr134132dm0yd";
};
dontBuild = true;

19
pkgs/tools/misc/hashit/default.nix
View File

@@ -1,32 +1,31 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, gnome3, gtk3, gobject-introspection, desktop-file-utils, wrapGAppsHook }:
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "hashit";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "artemanufrij";
repo = pname;
rev = version;
sha256 = "1ba38qmwdk7vkarsxqn89irbymzx52gbks4isx0klg880xm2z4dv";
sha256 = "1s8fbzg1z2ypn55xg1pfm5xh15waq55fkp49j8rsqiq8flvg6ybf";
};
nativeBuildInputs = [
desktop-file-utils
gobject-introspection
meson
ninja
pantheon.vala
pkgconfig
python3
pantheon.vala
wrapGAppsHook
];
buildInputs = [
pantheon.elementary-icon-theme
gnome3.libgee
pantheon.granite
gtk3
libgee
pantheon.elementary-icon-theme
pantheon.granite
];
postPatch = ''
@@ -35,10 +34,10 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "A simple app for checking usual checksums";
description = "A simple app for checking usual checksums - Designed for elementary OS";
homepage = https://github.com/artemanufrij/hashit;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ worldofpeace ];
maintainers = pantheon.maintainers;
platforms = platforms.linux;
};
}

4
pkgs/tools/misc/html-proofer/Gemfile.lock
View File

@@ -26,7 +26,7 @@ GEM
mercenary (0.3.6)
mini_portile2 (2.4.0)
minitest (5.11.3)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
parallel (1.17.0)
public_suffix (3.1.1)
@@ -45,4 +45,4 @@ DEPENDENCIES
html-proofer
BUNDLED WITH
1.14.6
1.17.2

40
pkgs/tools/misc/html-proofer/gemset.nix
View File

@@ -1,6 +1,8 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
@@ -10,6 +12,8 @@
};
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
@@ -18,6 +22,8 @@
version = "2.6.0";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
@@ -27,6 +33,8 @@
};
ethon = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9";
@@ -35,6 +43,8 @@
version = "0.12.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
@@ -44,6 +54,8 @@
};
html-proofer = {
dependencies = ["activesupport" "addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kpcz7p0yjr1y9fs8gila2bkgb8y6qkyqv5a8yymw0hkvddnqig4";
@@ -53,6 +65,8 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
@@ -61,6 +75,8 @@
version = "1.6.0";
};
mercenary = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
@@ -69,6 +85,8 @@
version = "0.3.6";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
@@ -77,6 +95,8 @@
version = "2.4.0";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
@@ -86,14 +106,18 @@
};
nokogiri = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
version = "1.10.3";
version = "1.10.4";
};
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
@@ -102,6 +126,8 @@
version = "1.17.0";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
@@ -110,6 +136,8 @@
version = "3.1.1";
};
rainbow = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
@@ -118,6 +146,8 @@
version = "3.0.0";
};
thread_safe = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
@@ -127,6 +157,8 @@
};
typhoeus = {
dependencies = ["ethon"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
@@ -136,6 +168,8 @@
};
tzinfo = {
dependencies = ["thread_safe"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
@@ -144,6 +178,8 @@
version = "1.2.5";
};
yell = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1394pf8wsv4wx2lf1d9iqqx6lcww9bgmgh9sms3dbga804cns0n8";

58
pkgs/tools/misc/idevicerestore/default.nix Normal file
View File

@@ -0,0 +1,58 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, curl
, libimobiledevice
, libirecovery
, libzip
, libusbmuxd
}:
stdenv.mkDerivation rec {
pname = "idevicerestore";
version = "2019-02-14";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "8a882038b2b1e022fbd19eaf8bea51006a373c06";
sha256 = "17lisl7ll43ixl1zqwchn7jljrdyl2p9q99w30i6qaci71mas37m";
};
nativeBuildInputs = [
autoreconfHook
pkgconfig
];
buildInputs = [
curl
libimobiledevice
libirecovery
libzip
libusbmuxd
# Not listing other dependencies specified in
# https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20
# because they are inherited `libimobiledevice`.
];
meta = with stdenv.lib; {
homepage = https://github.com/libimobiledevice/idevicerestore;
description = "Restore/upgrade firmware of iOS devices";
longDescription = ''
The idevicerestore tool allows to restore firmware files to iOS devices.
It is a full reimplementation of all granular steps which are performed during
restore of a firmware to a device.
In general, upgrades and downgrades are possible, however subject to
availability of SHSH blobs from Apple for signing the firmare files.
To restore a device to some firmware, simply run the following:
$ sudo idevicerestore -l
This will download and restore a device to the latest firmware available.
'';
license = licenses.lgpl21Plus;
# configure.ac suggests it should work for darwin and mingw as well but not tried yet
platforms = platforms.linux;
maintainers = with maintainers; [ nh2 ];
};
}

4
pkgs/tools/misc/kdecoration-viewer/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
{ stdenv, fetchFromGitHub, mkDerivation
, cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
stdenv.mkDerivation rec {
mkDerivation rec {
name = "kdecoration-viewer-2018-07-24";
src = fetchFromGitHub {

4
pkgs/tools/misc/kronometer/default.nix
View File

@@ -6,14 +6,14 @@
let
pname = "kronometer";
version = "2.2.2";
version = "2.2.3";
in
mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "142f1kqygil6d4pvh6pallin355h2rq5s1hs6gd11plcin6rkg2j";
sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm";
};
meta = with lib; {

6
pkgs/tools/misc/lazydocker/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lazydocker";
version = "0.5.5";
version = "0.7";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazydocker";
rev = "v${version}";
sha256 = "0h2c1f9r67i6a8ppspsg1ln9rkm272092aaaw55sd15xxr51s4hb";
sha256 = "0vai88g31yf55988paqzs7fqlxgi0ydrsgszzjig9ai3x9c52xim";
};
modSha256 = "1lrrwcr95fxk4dlinyg74vqyxwwzagymncfps9bgig5v5d8gdd8j";
modSha256 = "1iin1m6s9xxdskvj6jy2jwlqrsrm432ld13cpa28hpx7pylx61ij";
subPackages = [ "." ];

4
pkgs/tools/misc/lesspipe/default.nix
View File

@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "lesspipe";
version = "1.83";
version = "1.84";
buildInputs = [ perl ];
preConfigure = "patchShebangs .";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "wofr06";
repo = "lesspipe";
rev = version;
sha256 = "1vqch6k4fz5pyf8szlnqm3qhlvgs9l4njd13yczjh4kpaxpn0rxb";
sha256 = "124ffhzrikr88ab14rk6753n8adxijpmg7q3zx7nmqc52wpkfd8q";
};
patches = [

4
pkgs/tools/misc/libbitcoin/libbitcoin.nix
View File

@@ -3,7 +3,7 @@
let
pname = "libbitcoin";
version = "3.5.0";
version = "3.6.0";
in stdenv.mkDerivation {
name = "${pname}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1qy637hpv6kkhf602yxxi5b9j0qhsp644fazljcqbnxzp7vv2qyd";
sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

6
pkgs/tools/misc/lsd/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "lsd";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "Peltoche";
repo = pname;
rev = version;
sha256 = "1m8jcmdp66n0vgyzfgknmg4rwc41y9fd4vjgapaggg6lc9cc68gp";
sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym";
};
cargoSha256 = "095jf63jyd485fk8pl7grvycn7pkwnxdm5lwkmfl9p46m8q1qqr2";
cargoSha256 = "0377jbjkrrjss3w8xmjsjjynycpdk19grp20hffxschg4ryvniin";
preFixup = ''
install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd

2
pkgs/tools/misc/man-db/default.nix
View File

@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
homepage = http://man-db.nongnu.org;
description = "An implementation of the standard Unix documentation system accessed using the man command";
license = licenses.gpl2;
platforms = platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

4
pkgs/tools/misc/mbuffer/default.nix
View File

@@ -3,12 +3,12 @@
} :
stdenv.mkDerivation rec {
version = "20190127";
version = "20190725";
name = "mbuffer-${version}";
src = fetchurl {
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
sha256 = "1p7d9jaiyqcg5q14hlcji6llhjqkg6izc9cfz23jwgq8z2a6zjy5";
sha256 = "1hjhyh3q0q22czq3s2wk5mcky1jrq9xw8fppw6r7cix1riq74m91";
};
buildInputs = [ openssl ];

8
pkgs/tools/misc/mongodb-compass/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, dpkg
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }:
, gnome2, gnome3, libnotify, libxcb, nspr, nss, systemd, xorg }:
let
version = "1.13.1";
version = "1.17.0";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -19,7 +19,7 @@ let
glib
gnome2.GConf
gnome2.gdk_pixbuf
gnome2.gtk
gnome3.gtk
gnome2.pango
libnotify
libxcb
@@ -46,7 +46,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
sha256 = "0x23jshnr0rafm5sn2vhq2y2gryg8mksahzyv5fszblgaxay234p";
sha256 = "085xq1ik8kyza1kq9kn0pf98zk6g2qa21clxhn48rgnqk20aninv";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";

4
pkgs/tools/misc/ncdu/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ncdu-${version}";
version = "1.14";
version = "1.14.1";
src = fetchurl {
url = "https://dev.yorhel.nl/download/${name}.tar.gz";
sha256 = "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566";
sha256 = "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy";
};
buildInputs = [ ncurses ];

24
pkgs/tools/misc/noti/default.nix
View File

@@ -1,19 +1,20 @@
{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }:
{ stdenv, lib, buildGoPackage, fetchFromGitHub
, Cocoa ? null }:
buildGoPackage rec {
name = "noti-${version}";
version = "3.1.0";
pname = "noti";
version = "3.2.0";
src = fetchFromGitHub {
owner = "variadico";
repo = "noti";
rev = "${version}";
sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823";
rev = version;
sha256 = "1lw1wmw2m83m0s5znb4gliywjpg74qrhrj6rwpcb5p352c4vbwxs";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
buildInputs = lib.optional stdenv.isDarwin Cocoa;
# TODO: Remove this when we update apple_sdk
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ];
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-fno-objc-arc";
goPackagePath = "github.com/variadico/noti";
@@ -22,12 +23,11 @@ buildGoPackage rec {
'';
postInstall = ''
mkdir -p $out/share/man/man{1,5}/
cp $src/docs/man/noti.1 $out/share/man/man1/
cp $src/docs/man/noti.yaml.5 $out/share/man/man5/
install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1
install -Dm444 -t $out/share/man/man5 $src/docs/man/*.5
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Monitor a process and trigger a notification.";
longDescription = ''
Monitor a process and trigger a notification.
@@ -36,7 +36,7 @@ buildGoPackage rec {
'';
homepage = https://github.com/variadico/noti;
license = licenses.mit;
maintainers = [ maintainers.stites ];
maintainers = with maintainers; [ stites ];
platforms = platforms.all;
};
}

271
pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch Normal file
View File

@@ -0,0 +1,271 @@
From a9a62d7c7adf6fc0237c7d04937b538a4cea87ad Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 19 Jun 2018 09:34:18 -0400
Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory
See https://github.com/ostreedev/ostree/issues/1593
Basically this makes it easier for people packaging, as the trivial-httpd
is only for tests, and this way the binary will live with the tests.
Also at this point nothing should depend on `ostree trivial-httpd`.
---
Makefile-man.am | 6 --
Makefile-ostree.am | 7 ---
Makefile-tests.am | 7 +++
configure.ac | 10 ---
man/ostree-trivial-httpd.xml | 118 -----------------------------------
src/ostree/main.c | 5 --
tests/libtest.sh | 13 ++--
7 files changed, 12 insertions(+), 154 deletions(-)
delete mode 100644 man/ostree-trivial-httpd.xml
diff --git a/Makefile-man.am b/Makefile-man.am
index 8ccbba8c..d204aa3e 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \
ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \
ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \
ostree-static-delta.1
-if BUILDOPT_TRIVIAL_HTTPD
-man1_files += ostree-trivial-httpd.1
-else
-# We still want to distribute the source, even if we are not building it
-EXTRA_DIST += man/ostree-trivial-httpd.xml
-endif
if BUILDOPT_FUSE
man1_files += rofiles-fuse.1
diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index 8d352e38..1471b3e5 100644
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -133,13 +133,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c
endif
if USE_LIBSOUP
-# Eventually once we stop things from using this, we should support disabling this
-ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c
-pkglibexec_PROGRAMS += ostree-trivial-httpd
-ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
-ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
-ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS)
-
if !USE_CURL
# This is necessary for the cookie jar bits
ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
diff --git a/Makefile-tests.am b/Makefile-tests.am
index 2c0916f6..b11fde89 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -248,6 +248,13 @@ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-u
tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h
+if USE_LIBSOUP
+test_extra_programs += ostree-trivial-httpd
+ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
+ostree_trivial_httpd_CFLAGS = $(common_tests_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
+ostree_trivial_httpd_LDADD = $(common_tests_ldadd) $(OT_INTERNAL_SOUP_LIBS)
+endif
+
if USE_AVAHI
test_programs += tests/test-repo-finder-avahi
endif
diff --git a/configure.ac b/configure.ac
index e6e145db..1e36e6a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,15 +187,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi
AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes)
-AC_ARG_ENABLE(trivial-httpd-cmdline,
- [AS_HELP_STRING([--enable-trivial-httpd-cmdline],
- [Continue to support "ostree trivial-httpd" [default=no]])],,
- enable_trivial_httpd_cmdline=no)
-AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes)
-AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
- [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
-)
-
AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [
AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)])
])
@@ -602,7 +593,6 @@ echo "
Rust (internal oxidation): $rust_debug_release
rofiles-fuse: $enable_rofiles_fuse
HTTP backend: $fetcher_backend
- \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline
SELinux: $with_selinux
cryptographic checksums: $with_crypto
systemd: $have_libsystemd
diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml
deleted file mode 100644
index d03c12be..00000000
--- a/man/ostree-trivial-httpd.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-Copyright 2011,2013 Colin Walters <walters@verbum.org>
-
-SPDX-License-Identifier: LGPL-2.0+
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
--->
-
-<refentry id="ostree">
-
- <refentryinfo>
- <title>ostree trivial-httpd</title>
- <productname>OSTree</productname>
-
- <authorgroup>
- <author>
- <contrib>Developer</contrib>
- <firstname>Colin</firstname>
- <surname>Walters</surname>
- <email>walters@verbum.org</email>
- </author>
- </authorgroup>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>ostree trivial-httpd</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
-
- <refnamediv>
- <refname>ostree-trivial-httpd</refname>
- <refpurpose>Simple webserver</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
-<!-- Don't entirely understand this command. Needs details, better content-->
- <refsect1>
- <title>Description</title>
-
- <para>
- This runs a simple webserver and keeps it running until killed. If DIR is not specified, it defaults to the current directory.
- </para>
- </refsect1>
-
- <refsect1>
- <title>Options</title>
-
- <variablelist>
- <varlistentry>
- <term><option>--daemonize</option>,<option>-d</option></term>
-
- <listitem><para>
- Fork into background when ready.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--autoexit</option></term>
-
- <listitem><para>
- Automatically exit when directory is deleted.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--port-file</option>,<option>-p</option>="PATH"</term>
-
- <listitem><para>
- Write port number to PATH (- for standard output).
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--port</option>,<option>-P</option></term>
-
- <listitem><para>
- Use the specified TCP port to listen on.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--force-range-requests</option></term>
-
- <listitem><para>
- Force range requests by only serving half of files.
- </para></listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
-<!-- NEED EXAMPLE OUTPUT HERE!-->
- <refsect1>
- <title>Example</title>
- <para><command>$ ostree trivial-httpd</command></para>
- </refsect1>
-</refentry>
diff --git a/src/ostree/main.c b/src/ostree/main.c
index c5b45012..6478a62b 100644
--- a/src/ostree/main.c
+++ b/src/ostree/main.c
@@ -116,11 +116,6 @@ static OstreeCommand commands[] = {
{ "summary", OSTREE_BUILTIN_FLAG_NONE,
ostree_builtin_summary,
"Manage summary metadata" },
-#if defined(HAVE_LIBSOUP) && defined(BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE)
- { "trivial-httpd", OSTREE_BUILTIN_FLAG_NONE,
- ostree_builtin_trivial_httpd,
- NULL },
-#endif
{ NULL }
};
diff --git a/tests/libtest.sh b/tests/libtest.sh
index e0022512..b07dc962 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -149,15 +149,12 @@ fi
if test -n "${OSTREE_UNINSTALLED:-}"; then
OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd
else
- # trivial-httpd is now in $libexecdir by default, which we don't
- # know at this point. Fortunately, libtest.sh is also in
- # $libexecdir, so make an educated guess. If it's not found, assume
- # it's still runnable as "ostree trivial-httpd".
- if [ -x "${test_srcdir}/../../libostree/ostree-trivial-httpd" ]; then
- OSTREE_HTTPD="${CMD_PREFIX} ${test_srcdir}/../../libostree/ostree-trivial-httpd"
- else
- OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd"
+ # trivial-httpd is now the test directory.
+ OSTREE_HTTPD="${G_TEST_BUILDDIR}/ostree-trivial-httpd"
+ if ! [ -x "${OSTREE_HTTPD}" ]; then
+ fatal "Failed to find ${OSTREE_HTTPD}"
fi
+ OSTREE_HTTPD="${CMD_PREFIX} ${OSTREE_HTTPD}"
fi
files_are_hardlinked() {
--
2.22.0

9
pkgs/tools/misc/ostree/default.nix
View File

@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "ostree";
version = "2019.1";
version = "2019.2";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
sha256 = "08y7nsxl305dnlfak4kyj88lld848y4kg6bvjqngcxaqqvkk9xqm";
sha256 = "0nbbrz3p4ms6vpl272q6fimqvizryw2a8mnfqcn69xf03sz5204y";
};
patches = [
@@ -22,10 +22,7 @@ stdenv.mkDerivation rec {
./disable-test-gpg-verify-result.patch
# Tests access the helper using relative path
# https://github.com/ostreedev/ostree/issues/1593
(fetchpatch {
url = https://github.com/ostreedev/ostree/pull/1633.patch;
sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j";
})
./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
];
nativeBuildInputs = [

12
pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch
View File

@@ -1,12 +1,12 @@
diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am
--- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100
+++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200
@@ -243,7 +243,7 @@
diff --git a/Makefile-tests.am b/Makefile-tests.am
index b11fde89..82937a67 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -245,7 +245,6 @@ endif
_installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \
tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \
- tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
+ tests/test-checksum tests/test-lzma tests/test-rollsum \
tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h
if USE_AVAHI
if USE_LIBSOUP

87
pkgs/tools/misc/ostree/fix-1592.patch
View File

@@ -1,6 +1,7 @@
diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh
--- a/tests/pull-test.sh 1970-01-01 01:00:01.000000000 +0100
+++ b/tests/pull-test.sh 2018-09-16 23:55:44.214593856 +0200
diff --git a/tests/pull-test.sh b/tests/pull-test.sh
index a8bc49a9..4a08ebb5 100644
--- a/tests/pull-test.sh
+++ b/tests/pull-test.sh
@@ -275,7 +275,7 @@
if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then
fatal "pull with mixed refs succeeded?"
@@ -19,23 +20,62 @@ diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh
echo "ok pull-local nonexistent branch"
cd ${test_tmpdir}
@@ -587,5 +587,5 @@
@@ -593,5 +593,5 @@
if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then
fatal "pull of invalid ref succeeded"
fi
-assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
+assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
echo "ok pull got HTML for a ref"
diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
--- a/tests/test-fsck-collections.sh 1970-01-01 01:00:01.000000000 +0100
+++ b/tests/test-fsck-collections.sh 2018-09-17 02:22:48.922502037 +0200
diff --git a/tests/test-config.sh b/tests/test-config.sh
index 7e913d32..69d1675d 100755
--- a/tests/test-config.sh
+++ b/tests/test-config.sh
@@ -46,7 +46,7 @@
if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then
assert_not_reached "ostree config get should error out if too many arguments are given"
fi
-assert_file_has_content err.txt "error: Too many arguments given"
+assert_file_has_content err.txt "Too many arguments given"
echo "ok config get"
${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only
@@ -63,7 +63,7 @@
if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then
assert_not_reached "ostree config set should error out if too many arguments are given"
fi
-assert_file_has_content err.txt "error: Too many arguments given"
+assert_file_has_content err.txt "Too many arguments given"
echo "ok config set"
# Check that "ostree config unset" works
@@ -78,7 +78,7 @@
fi
# Check for any character where quotation marks would be as they appear differently in the Fedora and Debian
# test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839
-assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core."
+assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core."
# Check that it's idempotent
${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs
@@ -95,5 +95,5 @@
if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then
assert_not_reached "ostree config unset should error out if too many arguments are given"
fi
-assert_file_has_content err.txt "error: Too many arguments given"
+assert_file_has_content err.txt "Too many arguments given"
echo "ok config unset"
diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
index dc6bcfeb..4a5eef55 100755
--- a/tests/test-fsck-collections.sh
+++ b/tests/test-fsck-collections.sh
@@ -100,7 +100,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
assert_file_has_content fsck "^Validating refs...$"
assert_file_has_content fsck "^Validating refs\.\.\.$"
echo "ok 3 fsck detects missing ref bindings"
@@ -113,7 +113,7 @@
@@ -44,26 +84,26 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co
fi
-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
assert_file_has_content fsck "^Validating refs...$"
assert_file_has_content fsck "^Validating refs in collections...$"
assert_file_has_content fsck "^Validating refs\.\.\.$"
assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
@@ -127,7 +127,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’"
+assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2."
assert_file_has_content fsck "^Validating refs...$"
assert_file_has_content fsck "^Validating refs in collections...$"
-assert_file_has_content fsck-error "Commit has collection ID ‘org\.example\.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org\.example\.Collection2’"
+assert_file_has_content fsck-error "Commit has collection ID .org\.example\.Collection. in collection binding metadata, while the remote it came from has collection ID .org\.example\.Collection2."
assert_file_has_content fsck "^Validating refs\.\.\.$"
assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
@@ -147,7 +147,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist"
+assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist'
assert_file_has_content fsck "^Validating refs...$"
assert_file_has_content fsck "^Validating refs in collections...$"
-assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist"
+assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist'
assert_file_has_content fsck "^Validating refs\.\.\.$"
assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
@@ -186,7 +186,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
@@ -71,7 +111,7 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co
fi
-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)"
+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)"
assert_file_has_content fsck "^Validating refs...$"
assert_file_has_content fsck "^Validating refs\.\.\.$"
echo "ok 9 fsck detects missing ref bindings"
@@ -205,7 +205,7 @@
@@ -80,12 +120,13 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co
fi
-assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist"
+assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist'
assert_file_has_content fsck "^Validating refs...$"
assert_file_has_content fsck "^Validating refs\.\.\.$"
echo "ok 11 fsck ignores unreferenced ref bindings"
diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh
--- a/tests/test-remote-add.sh 1970-01-01 01:00:01.000000000 +0100
+++ b/tests/test-remote-add.sh 2018-09-17 00:14:16.486788225 +0200
diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
index bb7eae89..62a3bcd7 100755
--- a/tests/test-remote-add.sh
+++ b/tests/test-remote-add.sh
@@ -83,7 +83,7 @@
if $OSTREE remote delete nosuchremote 2>err.txt; then
assert_not_reached "Deleting remote unexpectedly succeeded"

4
pkgs/tools/misc/parallel/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
name = "parallel-20190622";
name = "parallel-20190722";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "1v5fbrxw9l1navmvxapb1raa2jr19vfjw3i28h7fgdqd8n6gs79z";
sha256 = "19xwdkmia2dw2hry9sbaq0ln79qy9dsqx11hq2s9dcyvhhqqdl0f";
};
nativeBuildInputs = [ makeWrapper ];

8
pkgs/tools/misc/pazi/cargo-lock.patch
View File

@@ -6,8 +6,8 @@ index 074b0ca..22f3bc5 100644
[[package]]
name = "pazi"
-version = "0.1.0"
+version = "0.2.0"
-version = "0.2.0"
+version = "0.3.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

10
pkgs/tools/misc/pazi/default.nix
View File

@@ -1,17 +1,19 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv, fetchFromGitHub, rustPlatform, darwin }:
rustPlatform.buildRustPackage rec {
pname = "pazi";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "euank";
repo = pname;
rev = "v${version}";
sha256 = "12z2vyzmyxfq1krbbrjar7c2gvyq1969v16pb2pm7f4g4k24g0c8";
sha256 = "1gnh6047hacavcb9bhps9d1zjns66rdbd158fw20kjp1lln5srrn";
};
cargoSha256 = "1w97jvlamxlxkqpim5iyayhbsqvg3rqds2nxq1fk5imj4hbi3681";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
cargoSha256 = "15s03vwgl6562n5h9r4d5kp2r168jakn5nwnyibmrs8r5q0idmjs";
cargoPatches = [ ./cargo-lock.patch ];

4
pkgs/tools/misc/plantuml/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
version = "1.2019.7";
version = "1.2019.8";
name = "plantuml-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
sha256 = "1md8dyjlvwfg4hbvigcvzipj1gf8hb39rqqh825aa2swchs8nvhm";
sha256 = "0kbyjsy8zp3325syg9g91rfgy2dzkffdj2ji82b5h9zy3rkrz08p";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/misc/pspg/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pspg-${version}";
version = "1.6.5";
version = "1.6.8";
src = fetchFromGitHub {
owner = "okbob";
repo = "pspg";
rev = "${version}";
sha256 = "0zz924fl0b99a09gi5l3vxv9dmxnkv1v679w6k9zf365b44z91ki";
sha256 = "1lwzyimn28a7q8k2c8z7and4qhrdil0za8lixh96z6x4lcb0rz5q";
};
nativeBuildInputs = [ pkgconfig ];

2
pkgs/tools/misc/riemann-c-client/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/algernon/riemann-c-client;
description = "A C client library for the Riemann monitoring system";
license = licenses.gpl3;
maintainers = with maintainers; [ rickynils pradeepchhetri ];
maintainers = with maintainers; [ pradeepchhetri ];
platforms = platforms.linux;
};
}

8
pkgs/tools/misc/rpm-ostree/default.nix
View File

@@ -1,15 +1,15 @@
{ stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc,
gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake,
libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit,
bubblewrap, pcre, check, python }:
bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit }:
stdenv.mkDerivation rec {
pname = "rpm-ostree";
version = "2019.2";
version = "2019.5";
src = fetchurl {
url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0sxjlcq15avb0fv6v89z2xrqv095dck4k5s9f0pk6y7sm063n2pk";
sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn";
};
patches = [
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
libcap ostree rpm glib systemd polkit bubblewrap
json-glib libarchive libsolv librepo
pcre check python
# libdnf
json_c libmodulemd_1 utillinux sqlite cppunit
];
configureFlags = [

4
pkgs/tools/misc/sl/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "sl-${version}";
version = "5.04";
version = "5.05";
src = fetchFromGitHub {
owner = "eyJhb";
repo = "sl";
rev = version;
sha256 = "029lv6vw39c7gj8bkfyqs8q4g32174vbmghhhgfk8wrhnxq60qn7";
sha256 = "11a1rdgb8wagikhxgm81g80g5qsl59mv4qgsval3isykqh8729bj";
};
buildInputs = [ ncurses ];

26
pkgs/tools/misc/starship/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, libiconv, darwin }:
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.10.1";
src = fetchFromGitHub {
owner = "starship";
repo = "starship";
rev = "v${version}";
sha256 = "045lq4nsrdssmqbcj0551f2c5qd2rcvhs8gr4p4iniv7s89yz1xl";
};
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
nativeBuildInputs = [ pkgconfig ];
cargoSha256 = "126y8q19qr37wrj6x4hqh0v7nqr9yfrycwqfgdlaw6i33gb0qam9";
meta = with stdenv.lib; {
description = "A minimal, blazing fast, and extremely customizable prompt for any shell";
homepage = "https://starship.rs";
license = licenses.isc;
maintainers = with maintainers; [ bbigras ];
platforms = platforms.all;
};
}

2
pkgs/tools/misc/thin-provisioning-tools/default.nix
View File

@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ globin ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/tools/misc/tmate/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "tmate-${version}";
version = "2.2.1";
version = "2.3.0";
src = fetchFromGitHub {
owner = "tmate-io";
repo = "tmate";
rev = version;
sha256 = "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r";
sha256 = "0fwqhmkp1jfp8qk7497ws3nzvly7p06mv04z8z0qicn6a961v1sa";
};
dontUseCmakeConfigure = true;

4
pkgs/tools/misc/tmpwatch/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, psmisc }:
stdenv.mkDerivation rec {
name = "tmpwatch-2.11";
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk";
};
configureFlags="--with-fuser=${psmisc}/bin/fuser";
meta = with stdenv.lib; {
homepage = https://fedorahosted.org/tmpwatch/;
description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time";

28
pkgs/tools/misc/uhubctl/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv
, fetchFromGitHub
, libusb
}:
stdenv.mkDerivation rec {
pname = "uhubctl";
version = "unstable-2019-07-31";
src = fetchFromGitHub {
owner = "mvp";
repo = "uhubctl";
rev = "1961aa02e9924a54a6219d16c61a0beb0d626e46";
sha256 = "15mvqp1xh079nqp0mynh3l1wmw4maa320pn4jr8bz7nh3knmk0n1";
};
buildInputs = [ libusb ];
installFlags = [ "prefix=$(out)" ];
meta = with stdenv.lib; {
homepage = "https://github.com/mvp/uhubctl";
description = "Utility to control USB power per-port on smart USB hubs";
license = licenses.gpl2;
maintainers = with maintainers; [ prusnak ];
platforms = with platforms; linux ++ darwin;
};
}

1
pkgs/tools/misc/unclutter-xfixes/default.nix
View File

@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
license = stdenv.lib.licenses.mit;
inherit version;
maintainers = [ maintainers.globin ];
};
}

4
pkgs/tools/misc/watchexec/default.nix
View File

@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "watchexec";
version = "1.10.2";
version = "1.10.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "10h9g6r5zkm71zpr33imh49187xx1wcv9sw7bf5dllgnxabd0lql";
sha256 = "0iaxicghvfy85hrxn151hz8frgfknk3s1z0ngjn7cv5x5zvfxspf";
};
cargoSha256 = "1sqwplvpg0n9j0h9j94m7a6ylgqi4y4wyx489y09z9gm7aqgrsjc";

4
pkgs/tools/misc/you-get/default.nix
View File

@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "you-get";
version = "0.4.1314";
version = "0.4.1328";
# Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
sha256 = "1pbyhk3078va7435bsvysy34bvx0zvwd2gk28cvqyn62vwkcjyig";
sha256 = "1rbsf7dphvlzahrzgdj1bq62mqhp2fmr61lckcyzq6jdq3vsf0w8";
};
meta = with stdenv.lib; {

Some files were not shown because too many files have changed in this diff Show More