diff options
Diffstat (limited to 'pkgs/tools')
23 files changed, 153 insertions, 192 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 9e0a165b051d..98bafb1ac9c7 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.198"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.200"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "0zcjx2gh9s1mak9cc9bmydg0f68id4rwhhpcaqqkcd3p37swyr2b"; + sha256 = "sha256-UgG9fY7WqHMHpJYXQ7VEkiv9htcqP36OVXlE95eWsZg="; }; postPatch = '' diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 25e72c1b880d..e954163b9e84 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "blueberry"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0llvz1h2dmvhvwkkvl0q4ggi1nmdbllw34ppnravs5lybqkicyw9"; + sha256 = "19kmjp686h7lwmw5n7fc9giqbqm757pkbn42nfwlmasvzqsqlnz6"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index f495b56e3252..a4e6bc1182be 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,25 +1,17 @@ -{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, +{stdenv, fetchFromGitHub, 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, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, rsync, glibc, rpcsvc-proto, libtirpc }: let - s = - rec { - baseName="glusterfs"; - # NOTE: On each glusterfs release, it should be checked if gluster added - # new, or changed, Python scripts whose PYTHONPATH has to be set in - # `postFixup` below, and whose runtime deps need to go into - # `nativeBuildInputs`. - # The command - # find /nix/store/...-glusterfs-.../ -name '*.py' -executable - # can help with finding new Python scripts. - version = "7.6"; - name="${baseName}-${version}"; - url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "0zdcv2jk8dp67id8ic30mkn97ccp07jf20g7v09a5k31pw9aqyih"; - }; + # NOTE: On each glusterfs release, it should be checked if gluster added + # new, or changed, Python scripts whose PYTHONPATH has to be set in + # `postFixup` below, and whose runtime deps need to go into + # `nativeBuildInputs`. + # The command + # find /nix/store/...-glusterfs-.../ -name '*.py' -executable + # can help with finding new Python scripts. buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline @@ -60,17 +52,18 @@ let which # which xfsprogs # xfs_info ]; -in -stdenv.mkDerivation -{ - inherit (s) name version; +in stdenv.mkDerivation rec { + pname = "glusterfs"; + version = "8.3"; + + src = fetchFromGitHub { + owner = "gluster"; + repo = pname; + rev = "v${version}"; + sha256 = "09vvbymiacz2pzwnq6f2dd7g2zszzsivdncz45sh977v3z0n84az"; + }; 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 substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ @@ -91,7 +84,7 @@ stdenv.mkDerivation # but fails when the version is empty. # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 preConfigure = '' - echo "v${s.version}" > VERSION + echo "v${version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python ''; @@ -109,7 +102,7 @@ stdenv.mkDerivation postInstall = '' cp -r $out/$out/* $out rm -r $out/nix - ''; + ''; postFixup = '' # glusterd invokes `gluster` and other utilities when telling other glusterd nodes to run commands. @@ -153,7 +146,7 @@ stdenv.mkDerivation wrapProgram $out/share/glusterfs/scripts/eventsdash.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" wrapProgram $out/libexec/glusterfs/glusterfind/brickfind.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" wrapProgram $out/libexec/glusterfs/glusterfind/changelog.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" - ''; + ''; doInstallCheck = true; @@ -187,12 +180,7 @@ stdenv.mkDerivation rm -r $out/bin/conf.py ''; - src = fetchurl { - inherit (s) url sha256; - }; - meta = with stdenv.lib; { - inherit (s) version; description = "Distributed storage system"; homepage = "https://www.gluster.org"; license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2 diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch deleted file mode 100644 index f08d73cf3a65..000000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f523afac49e24ecc0fa4ad85195135689cf445f0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Wed, 27 Sep 2017 21:36:41 +0200 -Subject: [PATCH] Fix "glusterfind saves var data under $prefix instead of - localstatedir". Fixes #1489610 - -Change-Id: Id2362c20f34346c37acfb9eb1ad105d0b7b8b60f ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f87d8a454..b4d3f5d10 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1118,7 +1118,7 @@ if test "x$exec_prefix" = xNONE; then - exec_prefix="$(eval echo $prefix)" - fi - GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" --GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" -+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/lib/misc/glusterfsd" - prefix=$old_prefix - exec_prefix=$old_exec_prefix - --- -2.12.0 - diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix new file mode 100644 index 000000000000..13665b776469 --- /dev/null +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, cmake, python3, git }: + +stdenv.mkDerivation rec { + pname = "directx-shader-compiler"; + version = "1.5.2010"; + + # Put headers in dev, there are lot of them which aren't necessary for + # using the compiler binary. + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "DirectXShaderCompiler"; + rev = "v${version}"; + sha256 = "0ccfy1bfp0cm0pq63ri4yl1sr3fdn1a526bsnakg4bl6z4fwrnnj"; + # We rely on the side effect of leaving the .git directory here for the + # version-grabbing functionality of the build system. + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake git python3 ]; + + configurePhase = '' + # Requires some additional flags to cmake from a file in the repo + additionalCMakeFlags=$(< utils/cmake-predefined-config-params) + cmakeFlags="$additionalCMakeFlags''${cmakeFlags:+ $cmakeFlags}" + cmakeConfigurePhase + ''; + + # The default install target installs heaps of LLVM stuff. + # + # Upstream issue: https://github.com/microsoft/DirectXShaderCompiler/issues/3276 + # + # The following is based on the CI script: + # https://github.com/microsoft/DirectXShaderCompiler/blob/master/appveyor.yml#L63-L66 + installPhase = '' + mkdir -p $out/bin $out/lib $dev/include + mv bin/dxc* $out/bin/ + mv lib/libdxcompiler.so* $out/lib/ + cp -r $src/include/dxc $dev/include/ + ''; + + meta = with stdenv.lib; { + description = "A compiler to compile HLSL programs into DXIL and SPIR-V"; + homepage = "https://github.com/microsoft/DirectXShaderCompiler"; + platforms = platforms.linux; + license = licenses.ncsa; + maintainers = with maintainers; [ expipiplus1 ]; + }; +} diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 29456f54cd16..ed8a11e182c9 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ petabyteboy penguwin ]; }; } diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index d593d677cc32..f84b0096d044 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,5 +1,5 @@ { - stdenv, + clangStdenv, fetchFromGitHub, opencl-headers, cmake, @@ -16,7 +16,11 @@ cli11 }: -stdenv.mkDerivation rec { +# Note that this requires clang < 9.0 to build, and currently +# clangStdenv provides clang 7.1 which satisfies the requirement. +let stdenv = clangStdenv; + +in stdenv.mkDerivation rec { pname = "ethminer"; version = "0.18.0"; @@ -71,8 +75,5 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; - # Doesn't build with gcc9, and if overlayed to use gcc8 stdenv fails on CUDA issues. - broken = true; }; - } diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index da6fa0a338ef..c3cb3200e06f 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "17"; + version = "18"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0hs70hbbwz9kbbf13l2v32yv70n4aw8sz7rky82qdcqcpnpisjq8"; + sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6"; }; - vendorSha256 = "1xjanlq67b6n07pha6ljgnl3n2ks4x3albvca317l68cvjiw3shs"; + vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix index e0b54e56081d..dcd06ce1d2b7 100644 --- a/pkgs/tools/misc/patdiff/default.nix +++ b/pkgs/tools/misc/patdiff/default.nix @@ -4,8 +4,8 @@ with ocamlPackages; janePackage { pname = "patdiff"; - hash = "1yqvxdmkgcwgx3npgncpdqwkpdxiqr1q41wci7589s8z7xi5nwyz"; - buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre shell ]; + hash = "1yslj6xxyv8rx8y5s1civ1zq8y6vvxmkszdds958zdm1p1ign54r"; + buildInputs = [ core patience_diff ocaml_pcre ]; meta = { description = "File Diff using the Patience Diff algorithm"; }; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index d00d737c17ce..889c266d28e2 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "6.0"; + version = "7.2"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "07myjv0g0iwgclc6q9wkj25myhlc86ahy2lqma8vgv9i3rgy03p7"; + sha256 = "0ih97hrcra2bg8q19b8819hip1p424z1vj61cl1ym5p477rp37yx"; }; configureFlags = [ diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix deleted file mode 100644 index bb62be6d3e24..000000000000 --- a/pkgs/tools/networking/qr-filetransfer/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage { - pname = "qr-filetransfer-unstable"; - version = "2018-10-22"; - - goPackagePath = "github.com/claudiodangelis/qr-filetransfer"; - - src = fetchFromGitHub { - rev = "b1e5b91aa2aa469f870c62074e879d46e353edae"; - owner = "claudiodangelis"; - repo = "qr-filetransfer"; - sha256 = "04cl3v6bzpaxp1scpsa42xxa1c1brbplq408bb7nixa98bacj4x1"; - }; - - goDeps = ./deps.nix; - - meta = with stdenv.lib; { - homepage = "https://github.com/claudiodangelis/qr-filetransfer"; - description = "Transfer files over wifi by scanning a QR code from your terminal"; - longDescription = '' - qr-filetransfer binds a web server to the address of your Wi-Fi network - interface on a random port and creates a handler for it. The default - handler serves the content and exits the program when the transfer is - complete. - ''; - license = licenses.mit; - maintainers = with maintainers; [ fgaz ]; - }; -} diff --git a/pkgs/tools/networking/qr-filetransfer/deps.nix b/pkgs/tools/networking/qr-filetransfer/deps.nix deleted file mode 100644 index a15dd9689433..000000000000 --- a/pkgs/tools/networking/qr-filetransfer/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade"; - sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "3fb116b820352b7f0c281308a4d6250c22d94e27"; - sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7"; - sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw"; - }; - } - { - goPackagePath = "github.com/mdp/qrterminal"; - fetch = { - type = "git"; - url = "https://github.com/mdp/qrterminal"; - rev = "6967d3624af633162b77160078e12a4c14174470"; - sha256 = "1f2zrdv9sw2a6ni1712d27cayr3f8whqagx6f0yglc5gdd9f3i2n"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a5c9d58dba9a56f97aaa86f55e638b718c5a6c42"; - sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; - }; - } - { - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "007b75a044e968336a69a6c0c617251ab62ac14c"; - sha256 = "0l8m5cy6fbir7nrsk985ap7dxp9qlfmh8r73g7j9zg7pfq3lkhad"; - }; - } - { - goPackagePath = "rsc.io/qr"; - fetch = { - type = "git"; - url = "https://github.com/rsc/qr"; - rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe"; - sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3"; - }; - } -] diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix new file mode 100644 index 000000000000..0cfc78d69df2 --- /dev/null +++ b/pkgs/tools/networking/qrcp/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "qrcp"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "claudiodangelis"; + repo = "qrcp"; + rev = version; + sha256 = "08fjy9mskf6n1zldc63fjm5x617qqx987a58cjav03apzfwzvvhg"; + }; + + vendorSha256 = "0iffy43x3njcahrxl99a71v8p7im102nzv8iqbvd5c6m14rsckqa"; + + subPackages = [ "." ]; + + meta = with lib; { + homepage = "https://claudiodangelis.com/qrcp/"; + description = "Transfer files over wifi by scanning a QR code from your terminal"; + longDescription = '' + qrcp binds a web server to the address of your Wi-Fi network + interface on a random port and creates a handler for it. The default + handler serves the content and exits the program when the transfer is + complete. + ''; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 0e2cec685206..f636560844b2 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -35,11 +35,12 @@ stdenv.mkDerivation rec { libxml2 glib openssl - zchunk curl check gpgme - ]; + ] + # zchunk currently has issues compiling in darwin, fine in linux + ++ stdenv.lib.optional stdenv.isLinux zchunk; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here propagatedBuildInputs = [ @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITH_ZCHUNK=OFF"; postFixup = '' moveToOutput "lib/${python.libPrefix}" "$py" @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; homepage = "https://rpm-software-management.github.io/librepo/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c17a1a82d9f3..bfc67ccac632 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -188,10 +188,10 @@ in rec { nix = nixStable; nixStable = callPackage common (rec { - name = "nix-2.3.9"; + name = "nix-2.3.10"; src = fetchurl { url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa"; + sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 4f4f660e20f4..8c0d31853ff9 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [ erictapen ]; platforms = platforms.linux; + broken = true; # fails to build with recent versions of botan. https://github.com/das-labor/neopg/issues/98 }; } diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index e8c4b1f541bd..bd5e88663744 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "0.5.0"; + version = "0.5.2"; src = fetchCrate { inherit version; crateName = pname; - sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw"; + sha256 = "1mxl71yz2iy5s6pbp33cwkfzzilkla4qqiskd6jsd5fdlrrwlxqm"; }; - cargoSha256 = "1vkgh0995xx0hr96mnzmdgd15gs6da7ynywqcjgcw5kr48bf1063"; + cargoSha256 = "19gznam64s17kha3accgjks5rmd9kpqqgxg3dfrk7fg5v4431007"; nativeBuildInputs = [ pkgconfig @@ -72,6 +72,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Unofficial command line client for Bitwarden"; homepage = "https://crates.io/crates/rbw"; + changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}"; license = licenses.mit; maintainers = with maintainers; [ albakham luc65r marsam ]; }; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index ae29eeafd006..048c5166d6a3 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.4"; + version = "1.9.4p1"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "1w03257akspgkkl757vmpq3p30sb2n6y61hll038mw9sqwnbv4cb"; + sha256 = "EXIJnfzdL6SX4To8J0qfWSCr02rn0veqrNa8a8kv1nc="; }; prePatch = '' diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index c7835c5989cc..1a975aef3932 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -2,20 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.5.4"; + version = "0.5.6"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "1rpwgwgl05n0s89mhyvabzvsa33ibkd1msyrwfll4wbcbsn0ish7"; + sha256 = "sha256-88uEEsb+coX8PTKrem+0t5AkamCmqJsFYsENFTZSsys="; }; + prePatch = '' + rm .cargo/config.toml + ''; + nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; - cargoSha256 = "0ykl66gs7k49vfjpw5i8xsbc1blmqm79vrsci2irsl5w642lbig5"; + cargoSha256 = "sha256-qnh4Tl6JRgxBJbu+t9IJX/XChIR15rTRLvsl+/ZvPxY="; doCheck = false; diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index 29f976998d53..c419824f9699 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0b17zzl7bqnkn7a4pr3l6fxqfmxfld7izphrab5nvhc4wzng4spn"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 55adb86f7422..14b14fa9ffd1 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.2.00-1"; + version = "3.2.01-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "0hfhjfd8rzaabs0wbj390ybmig3gxymfi4gs4xbjvvwvg8fzdc0y"; + sha256 = "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index fc0ec487ad50..30029d2d4e97 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ edwtjo ]; + platforms = jre.meta.platforms; description = "A proofreading program for English, French German, Polish, and more"; }; } diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 353d85931ade..84dc21aba3e9 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.0.6"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "1s8glpk7li45rcf2xi21qv65dldl8sd3mmalf54pbzfcjri5fwz6"; + sha256 = "08pq759f2vvdbig64y3k9kicvgr2d5x8ara7b182dcm3slbpib3l"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; |