From 1df35d94ec6e96bb12683d3017d96a0e3dbc93e4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 5 Mar 2020 14:27:46 +0100 Subject: mstflint: 4.4 -> 4.14 fix build --- pkgs/tools/misc/mstflint/default.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index c44934ef45c3..cf90e93929de 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, zlib, libibmad }: +{ stdenv, autoreconfHook, fetchFromGitHub, zlib, libibmad, openssl }: stdenv.mkDerivation rec { - name = "mstflint-4.4.0-1.12.gd1edd58"; + pname = "mstflint"; + version = "4.14.0-1"; - src = fetchurl { - url = "https://www.openfabrics.org/downloads/mstflint/${name}.tar.gz"; - sha256 = "0kg33i5s5zdc7kigww62r0b824zfw06r757fl6jwrq7lj91j0380"; + src = fetchFromGitHub { + owner = "Mellanox"; + repo = pname; + rev = "v${version}"; + sha256 = "0xrwx623vl17cqzpacil74m2fi4xrshgvvzxiplz1wq47gq7wp1i"; }; - buildInputs = [ zlib libibmad ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib libibmad openssl ]; + + hardeningDisable = [ "format" ]; + + dontDisableStatic = true; # the build fails without this. should probably be reported upstream meta = with stdenv.lib; { - homepage = "https://www.openfabrics.org/"; - license = licenses.gpl2; + homepage = "https://github.com/Mellanox/mstflint"; + license = with licenses; [ gpl2 bsd2 ]; platforms = platforms.linux; - broken = true; # 2018-04-11 }; } -- cgit 1.4.1 From d9fc2a8ef7923ffdb5e2a727a1d0393b34d23f92 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 May 2020 08:10:07 +0000 Subject: jdupes: 1.14.0 -> 1.15.0 --- pkgs/tools/misc/jdupes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 2898cfb67982..ae0b32d2120d 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "18hn25f7cdz1li0vvx74al7a8z2220xhzjp9j6idhldsmjnscgq8"; + sha256 = "05q2ys7ii6mqiddl9ixzqhbvk4xy5ckh3yfz26vycxiyh9cp7yls"; # 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. -- cgit 1.4.1 From 72003fa5a26dc01aa1b386b1d99ff7286609cc04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 May 2020 04:11:54 +0000 Subject: profile-sync-daemon: 6.38 -> 6.40 --- pkgs/tools/misc/profile-sync-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 790bf73a44dc..7d68ada2c1bc 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, utillinux, coreutils}: stdenv.mkDerivation rec { - version = "6.38"; + version = "6.40"; pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0mhjgd2b3grdaad64b72m8i5rm9k58yx7kpiqmhmd3kl5qlgxagy"; + sha256 = "1z1n7dqbkk0x9w2pq71nf93wp4hrzin4a0hcvfynj1khf12z369h"; }; installPhase = '' -- cgit 1.4.1 From e9bb1d8a5a2eafae54af64104a166050c3724bed Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Fri, 27 Mar 2020 22:28:25 +0100 Subject: osinfo-db-tools: 1.6.0 -> 1.7.0 Switched to meson build system. --- pkgs/tools/misc/osinfo-db-tools/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 3e678b1d378a..a93ec0ab573f 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, libxml2, perl +{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, glib, libxml2, perl, python3 , libxslt, libarchive, bzip2, lzma, json-glib, libsoup }: stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz"; - sha256 = "0x155d4hqz7mabgqvgydqjm9d8aabc78vr0v0pnsp9vkdlcv3mfh"; + url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; + sha256 = "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab"; }; - nativeBuildInputs = [ pkgconfig gettext perl ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext perl python3 ]; buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; meta = with stdenv.lib; { -- cgit 1.4.1 From 20a8580e09fbb695fc581130e63aaddb91898b56 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 24 May 2020 15:21:14 -0700 Subject: zoxide: 0.4.0 -> 0.4.1 https://github.com/ajeetdsouza/zoxide/compare/v0.4.0...v0.4.1 NOTE: This release drops compatibility for old 0.2.x databases. If you have ever run any version between 0.3.0 and 0.4.0 (inclusive), your database has already been upgraded. If you haven't, you will need to run one of those versions before updating, or your database will not be found or in the correct format. --- pkgs/tools/misc/zoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index d2abd143ce45..ab8633c49904 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "1qkvmjrkcivfzbm6swl5lgvpqz9av9jxcn9i8ms3wz4vfsibmlxv"; + sha256 = "1zfk9y5f12h2d5zwf2z8c95xwhbhc6ayv971875fbxgz1nd8vqb6"; }; buildInputs = [ fzf ]; - cargoSha256 = "1w921f7b6kzc1mjzff1bcs3mg4cp9h48698w2zlv5jzjs7nwgb8n"; + cargoSha256 = "0z0p3cxxazw19bmk3zw7z2q93p00ywsa2cz1jhy78mn5pq1v95rd"; meta = with lib; { description = "A fast cd command that learns your habits"; -- cgit 1.4.1 From a0ca71d7728b5607c167f332546016dd9d471fda Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 May 2020 04:43:39 +0000 Subject: uhubctl: 2.1.0 -> 2.2.0 --- pkgs/tools/misc/uhubctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix index 0ed5d97ad7b5..49da81d6094f 100644 --- a/pkgs/tools/misc/uhubctl/default.nix +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "uhubctl"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; rev = "refs/tags/v${version}"; - sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq"; + sha256 = "0pimhw2a2wfg7nh1ahsxmzkb0j6bbncwdqsvyp8l23zhs5kx7wm9"; }; buildInputs = [ libusb1 ]; -- cgit 1.4.1 From 204ea0bfb7e4dcf41c91a6d14e58d42fe08ef9c3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 May 2020 04:20:00 -0500 Subject: zoxide: make fzf optional --- pkgs/tools/misc/zoxide/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index ab8633c49904..ee15786d40cc 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -1,7 +1,7 @@ -{ lib +{ stdenv , fetchFromGitHub , rustPlatform -, fzf +, withFzf ? true, fzf }: rustPlatform.buildRustPackage rec { @@ -15,13 +15,14 @@ rustPlatform.buildRustPackage rec { sha256 = "1zfk9y5f12h2d5zwf2z8c95xwhbhc6ayv971875fbxgz1nd8vqb6"; }; - buildInputs = [ - fzf - ]; + postPatch = stdenv.lib.optionalString withFzf '' + substituteInPlace src/fzf.rs \ + --replace '"fzf"' '"${fzf}/bin/fzf"' + ''; cargoSha256 = "0z0p3cxxazw19bmk3zw7z2q93p00ywsa2cz1jhy78mn5pq1v95rd"; - meta = with lib; { + meta = with stdenv.lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; -- cgit 1.4.1 From eaa7841734244785cb15c07e1837acf880cb12c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 26 May 2020 10:16:58 +0000 Subject: parallel: 20200422 -> 20200522 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 0720ca76f253..059b43baec39 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200422"; + name = "parallel-20200522"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb"; + sha256 = "10is46v5dpccxibby0zikg1q68mdwpmgdpxk796zka93idd6id29"; }; outputs = [ "out" "man" ]; -- cgit 1.4.1 From e3f1712b7a9c00ff84ba06e7e04fc27491384bef Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Tue, 26 May 2020 16:33:32 -0700 Subject: bat: 0.15.1 -> 0.15.3 --- pkgs/tools/misc/bat/default.nix | 17 +++++------------ pkgs/tools/misc/bat/macos.patch | 13 ------------- 2 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 pkgs/tools/misc/bat/macos.patch (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 95bc44dcce06..9c7501719912 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,32 +1,25 @@ -{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, less +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, less , Security, libiconv, installShellFiles, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.15.1"; + version = "0.15.3"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "10cs94ja1dmn0f24gqkcy8rf68b3b43k6qpbb5njbg0hcx3x6cyj"; + sha256 = "0893xjnrjmhhzccfb57w5s7wlf6z4cwxvrxj8qb5jnmrgkfaw86b"; fetchSubmodules = true; }; - cargoSha256 = "13cphi08bp6lg054acgliir8dx2jajll4m3c4xxy04skmx555zr8"; + cargoSha256 = "0mcff6nsd9g39xdhsf06zxs7pmq27nqfxdk0lwh83lqmnzdp01sf"; - # Disable test that's broken on macOS. - # This should probably be removed on the next release. - # https://github.com/sharkdp/bat/issues/983 - patches = [ ./macos.patch ]; - - nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; + nativeBuildInputs = [ pkgconfig installShellFiles makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.fish diff --git a/pkgs/tools/misc/bat/macos.patch b/pkgs/tools/misc/bat/macos.patch deleted file mode 100644 index 549782f0c91b..000000000000 --- a/pkgs/tools/misc/bat/macos.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/assets.rs b/src/assets.rs -index 4f8556f..222abc2 100644 ---- a/src/assets.rs -+++ b/src/assets.rs -@@ -336,7 +336,7 @@ mod tests { - assert_eq!(test.syntax_for_file("Makefile"), "Makefile"); - } - -- #[cfg(unix)] -+ #[cfg(all(unix,not(target_os = "macos")))] - #[test] - fn syntax_detection_invalid_utf8() { - use std::os::unix::ffi::OsStrExt; -- cgit 1.4.1