diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/vips/default.nix | 42 | ||||
-rw-r--r-- | pkgs/tools/misc/detox/default.nix | 22 | ||||
-rw-r--r-- | pkgs/tools/misc/fluent-bit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/pb/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/rtx/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/tab-rs/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/package-management/harmonia/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/collectd/default.nix | 5 |
8 files changed, 58 insertions, 34 deletions
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 218014db019eb..c16ba635f5043 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -18,7 +18,6 @@ , libexif , librsvg , poppler -, libgsf , libtiff , fftw , lcms2 @@ -26,7 +25,6 @@ , libimagequant , imagemagick , pango -, orc , matio , cfitsio , libwebp @@ -36,19 +34,23 @@ , openslide , libheif , cgif +, libarchive +, libhwy +, testers +, nix-update-script }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.14.5"; + version = "8.15.0"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; - rev = "v${version}"; - hash = "sha256-fG3DTP+3pO7sbqR/H9egJHU3cLKPU4Jad6qxcQ9evNw="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-WfKq+maLcAXyjk1sq66wSU92ALv4MfRDPKe4Mki0KRQ="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -76,7 +78,6 @@ stdenv.mkDerivation rec { libexif librsvg poppler - libgsf libtiff fftw lcms2 @@ -84,7 +85,6 @@ stdenv.mkDerivation rec { libimagequant imagemagick pango - orc matio cfitsio libwebp @@ -94,6 +94,8 @@ stdenv.mkDerivation rec { openslide libheif cgif + libarchive + libhwy ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ]; # Required by .pc file @@ -109,13 +111,29 @@ stdenv.mkDerivation rec { ++ lib.optional (imagemagick == null) "-Dmagick=disabled" ; + passthru = { + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "vips --version"; + }; + }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "v([0-9.]+)" ]; + }; + }; + meta = with lib; { - changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog"; - homepage = "https://libvips.github.io/libvips/"; + changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog"; + homepage = "https://www.libvips.org/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ kovirobi ]; + maintainers = with maintainers; [ kovirobi anthonyroussel ]; + pkgConfigModules = [ "vips" "vips-cpp" ]; platforms = platforms.unix; mainProgram = "vips"; }; -} +}) diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index bf289ff8c77c4..570882d59ab9a 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -1,25 +1,24 @@ -{lib, stdenv, fetchurl, flex}: +{ lib, stdenv, fetchFromGitHub, flex, autoreconfHook }: stdenv.mkDerivation rec { pname = "detox"; - version = "1.2.0"; + version = "1.4.5"; - src = fetchurl { - url = "mirror://sourceforge/detox/${version}/detox-${version}.tar.gz"; - sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45"; + src = fetchFromGitHub { + owner = "dharple"; + repo = pname; + rev = "v${version}"; + hash = "sha256-cTuK5EIimRVZ1nfuTa1ds6xrawYIAbwNNIkNONd9y4Q="; }; - buildInputs = [flex]; + nativeBuildInputs = [ flex autoreconfHook ]; hardeningDisable = [ "format" ]; - postInstall = '' - install -m644 safe.tbl $out/share/detox/ - ''; - meta = with lib; { - homepage = "https://detox.sourceforge.net/"; + homepage = "https://github.com/dharple/detox"; description = "Utility designed to clean up filenames"; + changelog = "https://github.com/dharple/detox/blob/v${version}/CHANGELOG.md"; longDescription = '' Detox is a utility designed to clean up filenames. It replaces difficult to work with characters, such as spaces, with standard @@ -29,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "detox"; }; } diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index a674bee64560c..d88b143adc92f 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "2.1.10"; + version = "2.2.0"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-6uq5eOHx0P2S3WsN0PooNlGQS2ty7DdPsCEgoQsLmRM="; + hash = "sha256-E3fNU6aHyKMli+A+yiJUY065jchWkkAbumkdY8BaAAE="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/pb/default.nix b/pkgs/tools/misc/pb/default.nix index dfe4d7e291afd..b0c38f22a495c 100644 --- a/pkgs/tools/misc/pb/default.nix +++ b/pkgs/tools/misc/pb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pb"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "parseablehq"; repo = pname; rev = "v${version}"; - hash = "sha256-jnMGBwwsQJnbvTTLxhpwORQ5m8xZxLA0PQVhW/MjMto="; + hash = "sha256-ZtjlrWCL1h2qtpLsr7HN6ZcYhybjnoSFwMAXFGCn00A="; }; - vendorHash = "sha256-jC3P0b8fLZbL1hyWTnA/w3Uk4uqWSxpWDs6nQv55/0c="; + vendorHash = "sha256-dNSr0bQz7XdC2fTD82TI8tfmwKBuAcbxjaMC9KAjxlI="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index 6ceaa4508d8fc..f51b896159a4a 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "2023.10.2"; + version = "2023.11.2"; src = fetchFromGitHub { owner = "jdxcode"; repo = "rtx"; rev = "v${version}"; - hash = "sha256-wp5+n8dSnCExxgnCHl0GhcWTu8J6nGBJnjzWmc7XJ3E="; + hash = "sha256-OdqHyxqufJJTfP7frjLKf5R0WNySDyZc7Sh0Mpdord0="; }; - cargoHash = "sha256-Y/AUdg001/ezYHgOEt32go7DiIMLym9GyB88hG4NdKs="; + cargoHash = "sha256-KOte3zmJllrMp6OaKuFtUsRjdRKlSAxdJp1iJEOPcF0="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index 4478cb4bcb611..26b4fa724b48a 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ ]; mainProgram = "tab"; + broken = (stdenv.isDarwin && stdenv.isAarch64); # Added 2023-11-13 }; } diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/tools/package-management/harmonia/default.nix index 4760514bebe49..fd1ce1063245b 100644 --- a/pkgs/tools/package-management/harmonia/default.nix +++ b/pkgs/tools/package-management/harmonia/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-LzStxaqoez144LhqLjLP3yNgCj/HFqKSy+JcAW/FwM8="; + hash = "sha256-XtnK54HvZMKZGSCrVD0FO5PQLMo3Vkj8ezUlsfqStq0="; }; - cargoHash = "sha256-4DXIMsT69PhxqZX1j2aJ/XDLjvX76WbzEN0yxrnP9v0="; + cargoHash = "sha256-oQVHrfNPhslYk6APB/bhW+h+vk/gNTW/ZypoGGb5zPk="; nativeBuildInputs = [ pkg-config nix diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index b350558887ff3..5dcd854483756 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { url = "https://github.com/collectd/collectd/commit/3f575419e7ccb37a3b10ecc82adb2e83ff2826e1.patch"; sha256 = "0jwjdlfl0dp7mlbwygp6h0rsbaqfbgfm5z07lr5l26z6hhng2h2y"; }) + (fetchpatch { + name = "no_include_longintrepr.patch"; + url = "https://github.com/collectd/collectd/commit/623e95394e0e62e7f9ced2104b786d21e9c0bf53.patch"; + hash = "sha256-0eD7yNW3TWVyNMpLsADhYFDvy6COoCaI0kS1XJrwDgM="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; |