diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/fluent-bit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fpart/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/jdupes/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/misc/pfetch/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/misc/pg_flame/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/skim/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/starship/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/topgrade/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/txr/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/misc/usbmuxd/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/vmtouch/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 4 |
12 files changed, 43 insertions, 42 deletions
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 516badb7bc7..4e1a18efde4 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "0xwh8fnvahcyygz0ydi4pdzgsyvjaphwl3f2ccdas52fbirwnicn"; + sha256 = "0gkn5axjxaa52f3w2qxwwab4m46xrxymbkcpw1v1jihil34pxw7a"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index 563152cc10d..e673c73d096 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, fts }: stdenv.mkDerivation rec { pname = "fpart"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "martymac"; repo = "fpart"; rev = "${pname}-${version}"; - sha256 = "0h3mqc1xj5j2z8s8g3pvvpbjs6x74dj8niyh3p2ymla35kbzskf4"; + sha256 = "17zm3cgp3f2plynqhj8a0hbma5rvawrx5kqygjqyynn7cljv458v"; }; nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ fts ]; postInstall = '' sed "s|^FPART_BIN=.*|FPART_BIN=\"$out/bin/fpart\"|" \ diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index bf1501155d9..109a84de631 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,20 +2,25 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.13.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1dzw1h9x9addkxf7r8lb8y09wmdkx8i61f5m96589r88jjk965xy"; + sha256 = "18hn25f7cdz1li0vvx74al7a8z2220xhzjp9j6idhldsmjnscgq8"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. extraPostFetch = "rm -r $out/testdir"; }; - makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isLinux "ENABLE_BTRFS=1"; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ] ++ stdenv.lib.optionals stdenv.isLinux [ + "ENABLE_DEDUPE=1" + "STATIC_DEDUPE_H=1" + ]; enableParallelBuilding = true; @@ -32,7 +37,7 @@ stdenv.mkDerivation rec { duplicate files. This fork known as 'jdupes' is heavily modified from and improved over the original. ''; - homepage = https://github.com/jbruchon/jdupes; + homepage = "https://github.com/jbruchon/jdupes"; license = licenses.mit; maintainers = with maintainers; [ romildo ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/pfetch/default.nix b/pkgs/tools/misc/pfetch/default.nix index 491844f26b7..a858ad696af 100644 --- a/pkgs/tools/misc/pfetch/default.nix +++ b/pkgs/tools/misc/pfetch/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ stdenvNoCC, lib, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "pfetch"; version = "0.4.0"; @@ -11,14 +11,13 @@ stdenv.mkDerivation rec { sha256 = "180vvbmvak888vs4dgzlmqk0ss4qfsz09700n4p8s68j7krkxsfq"; }; - dontbuild = true; + dontBuild = true; installPhase = '' - mkdir -p $out/bin - cp pfetch $out/bin + install -Dm755 -t $out/bin pfetch ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pretty system information tool written in POSIX sh"; homepage = https://github.com/dylanaraps/pfetch; license = licenses.mit; diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/tools/misc/pg_flame/default.nix index a7b483a3f06..fbeba0ff1bd 100644 --- a/pkgs/tools/misc/pg_flame/default.nix +++ b/pkgs/tools/misc/pg_flame/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pg_flame"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "mgartner"; repo = pname; rev = "v${version}"; - sha256 = "13r35n4sy9s4343l3vc896av629wqr7m225ih2bbrm8qq70fwhwv"; + sha256 = "1a03vxqnga83mhjp7pkl0klhkyfaby7ncbwm45xbl8c7s6zwhnw2"; }; modSha256 = "0j7qpvji546z0cfjijdd66l0vsl0jmny6i1n9fsjqjgjpwg26naq"; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 55e6e5424d7..0c8e2da36df 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.6.9"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lotabout"; repo = pname; rev = "v${version}"; - sha256 = "1ygnjrljar4caybh8lqfjif4vhb33aam80ffnzgqxz6s6g85ifrb"; + sha256 = "0is6zymvy673f1g466i3ayi4jawdl7pm9l3cbdxcw32h3snbkgqp"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "1vcxcyhhqncjii0pad775x10j1kp62y82q1mii65jclr1karml3p"; + cargoSha256 = "1dl530ac8i4wdw7lziskl7rhh3ak9ykcws3kpy64808kxg3b1jnz"; patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Command-line fuzzy finder written in Rust"; - homepage = https://github.com/lotabout/skim; + homepage = "https://github.com/lotabout/skim"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index fa59935f561..9c9a4450ee8 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1wqxcfd7ams3k0swps9037dzc1qzxhpbqaz4qjw9jabgcl6jkb6v"; + sha256 = "15z8iwig10brjxirr9nm1aibjz6qpd82v7n9c4i2q1q9qvb3j5cs"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "0gcca3vlwrfhw9k4r9zc1raflr1m4xws9dpdxjh1kz34f9g88ijg"; + cargoSha256 = "16jr96ljd34x3fa2jahcqmjm1ds8519hx391wv1snk7y70fz1314"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 060975f2002..17d11d7e48a 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation }: rustPlatform.buildRustPackage rec { pname = "topgrade"; @@ -13,11 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1y85hl7xl60vsj3ivm6pyd6bvk39wqg25bqxfx00r9myha94iqmd"; - meta = with stdenv.lib; { + buildInputs = lib.optional stdenv.isDarwin Foundation; + + meta = with lib; { description = "Upgrade all the things"; homepage = "https://github.com/r-darwish/topgrade"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ filalex77 hugoreeves ]; }; } diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index 0f68ca82ece..a6b851e18ae 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -2,21 +2,16 @@ stdenv.mkDerivation rec { pname = "txr"; - version = "230"; + version = "231"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "03ab9drdqvkfq240pkrx6197jjvvjizjwfx9psjmm6lixksw0kjx"; + sha256 = "0mcglb84zfmrai2bcdg9j0ck8jp8h7ii2rf4m38yjggy0dvii2lc"; }; nativeBuildInputs = [ bison flex ]; buildInputs = [ libffi ]; - # fix usage of off_t without include - postPatch = '' - sed -i '1i#include <sys/types.h>' sysif.h - ''; - enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 9b94d003706..5935710164c 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "usbmuxd"; - version = "2019-03-05"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "b1b0bf390363fa36aff1bc09443ff751943b9c34"; - sha256 = "176hapckx98h4x0ni947qpkv2s95f8xfwz00wi2w7rgbr6cviwjq"; + rev = "9af2b12552693a47601347e1eafc1e94132d727e"; + sha256 = "0w8mf2wfpqijg882vhb8xarlp6zja23xf0b59z5zi774pnpjbqvj"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index fda442a6729..6397a093347 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { pname = "vmtouch"; - version = "1.3.0"; - name = "${pname}-git-${version}"; + version = "1.3.1"; src = fetchFromGitHub { owner = "hoytech"; repo = "vmtouch"; rev = "v${version}"; - sha256 = "0xpigfpwidk25k605y2m2g1952nzl5fgp0wn65hhn7hbra7srglf"; + sha256 = "08da6apzfkfjwasn4dxrlfxqfx7arl28apdzac5nvm0fhvws0dxk"; }; buildInputs = [perl]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 415ec83be2f..875eccac942 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.12.25"; + version = "2020.01.15"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "13f7wv9v77zilhif0ndgjv4wn9glhmm14yh7axdcx5wglrgz38hf"; + sha256 = "0dyjc8nxyg9ry2ylmblh3fwavpais3mdfj6ndw4i0yc2vkw12rsm"; }; nativeBuildInputs = [ makeWrapper ]; |