diff options
Diffstat (limited to 'pkgs/tools')
26 files changed, 302 insertions, 184 deletions
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index de923d1f31187..b2a70c2bf2806 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.96.0"; + version = "0.97.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-AmwkWFhoGRBWrEhRlTRLGRu79ayWceszZi2hgx388Eg="; + sha256 = "sha256-WqYal+SDJNBCYc4vxUvYUXnKtmlV/ttfeQKAeOsy5lE="; }; - vendorSha256 = "sha256-akFclhx6c18u3z2oa6EvLd2NwkVCgJrYWv8Vbp1hZ9g="; + vendorSha256 = "sha256-0uur+L4bSVn6S8yBbdjIdMIgTY4pbQzVPGEVDgYISuw="; doCheck = false; diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index 7fbd930239705..561567f8b1549 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -3,16 +3,13 @@ stdenv.mkDerivation rec { pname = "arc_unpacker"; - version = "unstable-2021-05-17"; + version = "unstable-2021-08-06"; src = fetchFromGitHub { owner = "vn-tools"; repo = "arc_unpacker"; - # Since the latest release (0.11) doesn't build, we've opened an upstream - # issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a - # a new release is upcoming - rev = "9c2781fcf3ead7641e873b65899f6abeeabb2fc8"; - sha256 = "1xxrc9nww0rla3yh10z6glv05ax4rynwwbd0cdvkp7gyqzrv97xp"; + rev = "456834ecf2e5686813802c37efd829310485c57d"; + hash = "sha256-STbdWH7Mr3gpOrZvujblYrIIKEWBHzy1/BaNuh4teI8="; }; nativeBuildInputs = [ cmake makeWrapper catch2 ]; diff --git a/pkgs/tools/audio/dsp/default.nix b/pkgs/tools/audio/dsp/default.nix new file mode 100644 index 0000000000000..6891bfc041d46 --- /dev/null +++ b/pkgs/tools/audio/dsp/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, fftw +, zita-convolver +, fftwFloat +, libsndfile +, ffmpeg +, alsa-lib +, libao +, libmad +, ladspaH +, libtool +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "dsp"; + version = "1.8"; + + src = fetchFromGitHub { + owner = "bmc0"; + repo = "dsp"; + rev = "v${version}"; + sha256 = "sha256-LTgjpzAGi3oL8l5NcJj1ortKFd3vWDfXHr8YyedAxEE="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + fftw + zita-convolver + fftwFloat + libsndfile + ffmpeg + alsa-lib + libao + libmad + ladspaH + libtool + libpulseaudio + ]; + + meta = with lib; { + homepage = "https://github.com/bmc0/dsp"; + description = "An audio processing program with an interactive mode"; + license = licenses.isc; + maintainers = with maintainers; [ aaronjheng ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index 97870d5dedde4..4a5c128d1683e 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -1,18 +1,19 @@ -{ buildGoPackage, fetchFromGitHub, lib, openssh, makeWrapper }: +{ buildGoModule, fetchFromGitHub, lib, openssh, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "diskrsync"; - version = "unstable-2019-01-02"; + version = "1.3.0"; src = fetchFromGitHub { owner = "dop251"; repo = pname; - rev = "e8598ef71038527a8a77d1a6cf2a73cfd96d9139"; - sha256 = "1dqpmc4hp81knhdk3mrmwdr66xiibsvj5lagbm5ciajg9by45mcs"; + rev = "v${version}"; + sha256 = "sha256-hM70WD+M3jwze0IG84WTFf1caOUk2s9DQ7pR+KNIt1M="; }; - goPackagePath = "github.com/dop251/diskrsync"; - goDeps = ./deps.nix; + vendorSha256 = "sha256-lJaM/sC5/qmmo7Zu7nGR6ZdXa1qw4SuVxawQ+d/m+Aw="; + + ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; @@ -26,5 +27,4 @@ buildGoPackage rec { license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; - } diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix deleted file mode 100644 index 8045737164b13..0000000000000 --- a/pkgs/tools/backup/diskrsync/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/dop251/spgz"; - fetch = { - type = "git"; - url = "https://github.com/dop251/spgz"; - rev = "b86304a2b188"; - sha256 = "1zss1z523qagk99plb0my8m8ng0danl372iyk1pr4i2skp2bf5z7"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "9756ffdc2472"; - sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "eb5bcb51f2a3"; - sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "97732733099d"; - sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } -] diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 6a05d71d02183..4bb2a3c24d5fe 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,20 +1,29 @@ -{ pkg-config, libusb1, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, libusb1 }: -buildGoPackage rec { +buildGoModule rec { pname = "go-mtpfs"; - version = "unstable-2018-02-09"; - - goPackagePath = "github.com/hanwen/go-mtpfs"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hanwen"; repo = "go-mtpfs"; - rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; - sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg="; + rev = "v${version}"; + sha256 = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w="; }; + vendorSha256 = "sha256-OrAEvD2rF0Y0bvCD9TUv/E429lASsvC3uK3qNvbg734="; + + ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; - goDeps = ./deps.nix; + checkFlags = [ "-short" ]; + + meta = with lib; { + description = "A simple FUSE filesystem for mounting Android devices as a MTP device"; + homepage = "https://github.com/hanwen/go-mtpfs"; + license = licenses.bsd3; + maintainers = with maintainers; [ aaronjheng ]; + }; } diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.nix b/pkgs/tools/filesystems/go-mtpfs/deps.nix deleted file mode 100644 index f558a53f7d2d2..0000000000000 --- a/pkgs/tools/filesystems/go-mtpfs/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/hanwen/go-fuse"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/go-fuse"; - rev = "d1c826d19ad0c8d0c7e5b4eb34ee0f2ae09f6cef"; - sha256 = "0hn2iqsb6rip2b05fvcngyh0sazln2h3fx18khq4fv41n1iy11dc"; - }; - } - { - goPackagePath = "github.com/hanwen/usb"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/usb"; - rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; - sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "48ac38b7c8cbedd50b1613c0fccacfc7d88dfcdf"; - sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin"; - }; - } -] diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/tools/graphics/amber/default.nix index f5156dd08abfc..4e1948ce87fb9 100644 --- a/pkgs/tools/graphics/amber/default.nix +++ b/pkgs/tools/graphics/amber/default.nix @@ -10,48 +10,48 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "3ee5f2f1d3316e228916788b300d786bb574d337"; - sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv"; + rev = "81cc10a498b25a90147cccd6e8939493c1e9e20e"; + hash = "sha256-jTOxZ1nU7kvtdWjPzyIp/5ZeKw3JtYyqhlFeIE7CyX8="; }; lodepng = fetchFromGitHub { owner = "lvandeve"; repo = "lodepng"; - rev = "34628e89e80cd007179b25b0b2695e6af0f57fac"; - sha256 = "10yaf218xnmhv7rsq6dysqrps43r30cgrs1z63h47z40x43ikia0"; + rev = "5601b8272a6850b7c5d693dd0c0e16da50be8d8d"; + hash = "sha256-dD8QoyOoGov6VENFNTXWRmen4nYYleoZ8+4TpICNSpo="; }; shaderc = fetchFromGitHub { owner = "google"; repo = "shaderc"; - rev = "ba92b11e1fcaf4c38a64f84d643d6429175bf650"; - sha256 = "041hip43siy2sr7h6habk9sxdmd45ag4kqgi8jk0vm1b8pqzkhqn"; + rev = "e72186b66bb90ed06aaf15cbdc9a053581a0616b"; + hash = "sha256-hd1IGsWksgAfB8Mq5yZOzSyNGxXsCJxb350pD/Gcskk="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "3fdabd0da2932c276b25b9b4a988ba134eba1aa6"; - sha256 = "17h5cn4dyw8ixp1cpw8vf1z90m0fn1hhlvh0iycmknccbb1z34q7"; + rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"; + hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "fd3cabd8b5fc43ce83884ac06486c283b9902b4f"; - sha256 = "1h3smicw5gzpa17syb30085zccydzs4f41fl30bcmiipdn2xfpjr"; + rev = "a73e724359a274d7cf4f4248eba5be1e7764fbfd"; + hash = "sha256-vooJHtgVRlBNkQG4hulYOxIgHH4GMhXw7N4OEbkKJvU="; }; in stdenv.mkDerivation rec { pname = "amber"; - version = "unstable-2020-09-23"; + version = "unstable-2022-04-21"; src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "0eee2d45d053dfc566baa58442a9b1b708e4f2a7"; - sha256 = "1rrbvmn9hvhj7xj89yqvy9mx0vg1qapdm5fkca8mkd3516d9f5pw"; + rev = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed"; + hash = "sha256-+xFYlUs13khT6r475eJJ+XS875h2sb+YbJ8ZN4MOSAA="; }; buildInputs = [ diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index beaf2c1f213dc..ac777051d10ad 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation { }) ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: CMakeFiles/rbal.dir/src/statsearchbl.cpp.o:(.bss+0x0): + # multiple definition of `minrow'; CMakeFiles/rbal.dir/src/linban.c.o:(.bss+0xa3a): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + postPatch = '' rm cuneiform_src/Kern/hhh/tigerh/h/strings.h ''; diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 50b7aad48a040..f315dc9a63c08 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -4,6 +4,7 @@ , zlib , libX11 , libpng +, libjpeg , gd , freetype }: @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { libpng gd freetype + libjpeg ]; hardeningDisable = [ "format" ]; @@ -43,6 +45,7 @@ stdenv.mkDerivation rec { preBuild = '' cd src ''; + makeFlags = [ "CC=cc" ]; preInstall = '' mkdir -p "$out/bin" @@ -72,6 +75,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; homepage = "http://ploticus.sourceforge.net/"; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 674ec355584a7..b07947e672ff8 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "211"; + version = "212"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-B2Ll1N9JJkBM32eGHBtTscq6MR4T+yB98LTpjz094zo="; + sha256 = "sha256-Kr8OHArnLR9AwN/s5QUSzX/puINkK1eu869OaFz3nlw="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index cfdce8e3c0bd2..985cc47213814 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,19 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "lazydocker"; - version = "0.13"; + version = "0.18.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-thUm33AdP9Huc2vcTRatC1ULHZd0edEQggEGTqOV3a0="; + sha256 = "sha256-qtGPsfZVu5ZuCusO5nYgxR/qHiwyhzMmBMLMDpKzKDA="; }; - goPackagePath = "github.com/jesseduffield/lazydocker"; + vendorSha256 = null; - subPackages = [ "." ]; + postPatch = '' + rm -f pkg/config/app_config_test.go + ''; + + excludedPackages = [ "scripts" "test/printrandom" ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A simple terminal UI for both docker and docker-compose"; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index ae091c8d386f4..15c80f1e683d9 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-edRdnMNYB5N9v9QlfSFNqJl93X0rSCllmzSZO9+sCOg="; + sha256 = "sha256-PANJTaGdMvIPglgQCOs+fJc20ZnnHXx7rBdyoA4rQ0A="; }; # Substitute instead of wrapping because the resulting file is @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nix-community/nix-direnv"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 bbenne10 ]; }; } diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index c86c9c5fd681d..a03bedcabbfda 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.7.6"; + version = "0.8.0"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-nsc8S63OUEo9db/hs9oA53Lk+amIsxB/O4TJCs4zdNw="; - aarch64-linux = "sha256-KttqYuF7xC88L49f7JKKr77FbKBihptoBIoemgFInm0="; - x86_64-darwin = "sha256-ov4CtiWsOU/AWfAo7x99RshW6+eU9lFD5ypo6MKyPM0="; - aarch64-darwin = "sha256-3E9fv8BSu7XXIwRmTrDECLNQKdoeUqitKbsTrXs+tTE="; + x86_64-linux = "sha256-cZ41+VwbTQ/X/A0+OL1ZVXVv3eu90H5kMLiHqyc3688="; + aarch64-linux = "sha256-2svJx3rp0swyuXz3WCLRvDTRkweLMVIKrgYekcG8LdE="; + x86_64-darwin = "sha256-zkSESscsapyoMlFdaTzmooOEjUTte8MDNIGVhy9knzc="; + aarch64-darwin = "sha256-A7KNhTWuLjNaO2GyldCDquRur0i5KoXl6GZYQIqt0cI="; }; in fetchzip { diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index ab03c61a164c3..8fe6e6169fd63 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -118,7 +118,11 @@ stdenv.mkDerivation { python3 scripts/utils/import_languages.py --qt_path '${lib.getDev qttools}/bin' ''; - qmakeFlags = [ "USRPATH=$(out)" "ETCPATH=$(out)/etc" ]; + qmakeFlags = [ + "USRPATH=$(out)" + "ETCPATH=$(out)/etc" + "CONFIG-=debug" # https://github.com/mozilla-mobile/mozilla-vpn-client/pull/3539 + ]; qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ wireguard-tools ]) ]; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 572625651e9ab..e58c257668106 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -16,11 +16,16 @@ stdenv.mkDerivation rec { cd src export PPPD=${ppp}/sbin/pppd ''; + + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "rpppoe_cv_pack_bitfields=rev" ]; + postConfigure = '' sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/etc/ppp@' sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@' ''; + makeFlags = [ "AR:=$(AR)" ]; + meta = with lib; { description = "Roaring Penguin Point-to-Point over Ethernet tool"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 3062befe2d3bf..5a9239e2737ca 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,15 +1,37 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute2, ronn }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, fetchurl -stdenv.mkDerivation rec { +, buildPackages +, iproute2 +, lzo +, openssl +, pkg-config +, ronn +, zlib +}: + +let pname = "zerotierone"; - version = "1.8.4"; + version = "1.8.9"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-aM0FkcrSd5dEJVdJryIGuyWNFwvKH0SBfOuy4dIMK4A="; + sha256 = "sha256-N1VqzjaFJRJiSG4qHqRy4Fs8TlkUqyDoq0/3JQdGwfA="; + }; +in stdenv.mkDerivation { + inherit pname version src; + + cargoDeps = rustPlatform.fetchCargoTarball { + src = "${src}/zeroidc"; + name = "${pname}-${version}"; + sha256 = "sha256-PDsJtz279P2IpgiL0T92IbcANeGSUnGKhEH1dj9VtbM="; }; + postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock"; preConfigure = '' patchShebangs ./doc/build.sh @@ -20,9 +42,19 @@ stdenv.mkDerivation rec { --replace 'armv5' 'armv6' ''; - - nativeBuildInputs = [ ronn ]; - buildInputs = [ openssl lzo zlib iproute2 ]; + nativeBuildInputs = [ + pkg-config + ronn + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + ]; + buildInputs = [ + iproute2 + lzo + openssl + zlib + ]; enableParallelBuilding = true; @@ -30,18 +62,20 @@ stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkPhase = '' + runHook preCheck ./zerotier-selftest + runHook postCheck ''; - installPhase = '' - install -Dt "$out/bin/" zerotier-one - ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool - ln -s $out/bin/zerotier-one $out/bin/zerotier-cli + installFlags = [ "DESTDIR=$$out/upstream" ]; + + postInstall = '' + mv $out/upstream/usr/sbin $out/bin + + mkdir -p $man/share + mv $out/upstream/usr/share/man $man/share/man - mkdir -p $man/share/man/man8 - for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do - cat doc/$cmd | gzip -9n > $man/share/man/man8/$cmd.gz - done + rm -rf $out/upstream ''; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 41cffbaf7e699..7b6d872860e3c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -81,8 +81,8 @@ in lib.makeExtensible (self: { }; nix_2_8 = common { - version = "2.8.0"; - sha256 = "sha256-gWYNlEyleqkPfxtGXeq6ggjzJwcXJVdieJxA1Obly9s="; + version = "2.8.1"; + sha256 = "sha256-zldZ4SiwkISFXxrbY/UdwooIZ3Z/I6qKxtpc3zD0T/o="; }; stable = self.nix_2_8; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index b56ba93dc7bca..5625ab47058d4 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , libpcap, texinfo , iptables , gnupgSupport ? true, gnupg, gpgme # Increases dependencies! @@ -17,6 +17,16 @@ stdenv.mkDerivation rec { sha256 = "05kvqhmxj9p2y835w75f3jvhr38bb96cd58mvfd7xil9dhmhn9ra"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common tollchains: + # https://github.com/mrash/fwknop/pull/319 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/mrash/fwknop/commit/a8214fd58bc46d23b64b3a55db023c7f5a5ea6af.patch"; + sha256 = "0cp1350q66n455hpd3rdydb9anx66bcirza5gyyyy5232zgg58bi"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpcap texinfo ] ++ lib.optionals gnupgSupport [ gnupg gpgme.dev ] diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix index 0e24e0ec3a397..b981034428630 100644 --- a/pkgs/tools/security/hashdeep/default.nix +++ b/pkgs/tools/security/hashdeep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "hashdeep"; @@ -11,6 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0m2b042ndikavmplv3qjdhfj44hl1h8car83c192xi9nv5ahi7mf"; }; + patches = [ + (fetchpatch { + # Relevant link: <https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1512> + # Defect report fixed in GCC 11 + # Search for "DR 1512" in <https://gcc.gnu.org/gcc-11/changes.html> + name = "fix-cpp-defect-report-1512.patch"; + url = "https://github.com/jessek/hashdeep/commit/6ef69a26126ee4e69a25392fd456b8a66c51dffd.patch"; + sha256 = "sha256-IrqcnrKINeoh56FR25FzSM1YJMkM2yFd/GwOeWGRLFo="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { diff --git a/pkgs/tools/security/melt/default.nix b/pkgs/tools/security/melt/default.nix index dcceb598a118b..065a5fd4d696c 100644 --- a/pkgs/tools/security/melt/default.nix +++ b/pkgs/tools/security/melt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "melt"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "melt"; rev = "v${version}"; - sha256 = "sha256-R1ml/SQswsltBFLWOvI5GjI4VZUqEH3uwqgmdIrC/Q4="; + sha256 = "sha256-C5bvlgyHU4lfmaAjNddnVyB2B41Wq7yO/RmARAeaORw="; }; vendorSha256 = "sha256-9LTR7CrTBGAh7TPMQenY4vZQ7KMYv02fDsY51pkJZSo="; diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 3559595f556f6..b34302bde5805 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -1,17 +1,20 @@ -{ lib, stdenv, fetchurl, bison, flex }: +{ lib +, stdenv +, fetchurl +, bison +, flex +}: stdenv.mkDerivation rec { pname = "acpica-tools"; - version = "20211217"; + version = "20220331"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "14jrrdrl3sw438791zf2v6rjvhiq78yl7hz2ldzp83c251cgh495"; + hash = "sha256-rK/2ixTx4IBOu/xLlyaKTMvvz6BTsC7Zkk8rFNipjiE="; }; - NIX_CFLAGS_COMPILE = "-O3"; - - enableParallelBuilding = true; + nativeBuildInputs = [ bison flex ]; buildFlags = [ "acpibin" @@ -24,7 +27,9 @@ stdenv.mkDerivation rec { "iasl" ]; - nativeBuildInputs = [ bison flex ]; + NIX_CFLAGS_COMPILE = "-O3"; + + enableParallelBuilding = true; # We can handle stripping ourselves. INSTALLFLAGS = "-m 555"; @@ -32,10 +37,10 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { - description = "ACPICA Tools"; homepage = "https://www.acpica.org/"; + description = "ACPICA Tools"; license = with licenses; [ iasl gpl2Only bsd3 ]; - platforms = platforms.linux; maintainers = with maintainers; [ tadfisher ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/paperoni/default.nix b/pkgs/tools/text/paperoni/default.nix new file mode 100644 index 0000000000000..8c9bbf9e6227f --- /dev/null +++ b/pkgs/tools/text/paperoni/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "paperoni"; + version = "0.6.1-alpha1"; + + src = fetchFromGitHub { + owner = "hipstermojo"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vTylnDtoPpiRtk/vew1hLq3g8pepWRVqBEBnvSif4Zw="; + }; + + cargoSha256 = "sha256-iLEIGuVB9ykNcwbXk/donDdBuMvitM54Ax6bszVGaO0="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "An article extractor in Rust"; + homepage = "https://github.com/hipstermojo/paperoni"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/tools/text/rs/default.nix b/pkgs/tools/text/rs/default.nix index 9aca92922a523..141d72dfe077d 100644 --- a/pkgs/tools/text/rs/default.nix +++ b/pkgs/tools/text/rs/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, libbsd }: +{ lib +, stdenv +, fetchurl +, installShellFiles +, libbsd +}: stdenv.mkDerivation rec { pname = "rs"; @@ -9,18 +14,29 @@ stdenv.mkDerivation rec { sha256 = "0gxwlfk7bzivpp2260w2r6gkyl7vdi05cggn1fijfnp8kzf1b4li"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ libbsd ]; buildPhase = '' + runHook preBuild + ${stdenv.cc}/bin/cc utf8.c rs.c -o rs -lbsd + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -Dm 755 rs -t $out/bin - install -Dm 644 rs.1 -t $out/share/man/man1 + installManPage rs.1 + + runHook postInstall ''; meta = with lib; { + homepage = "http://www.mirbsd.org/htman/i386/man1/rs.htm"; description = "Reshape a data array from standard input"; longDescription = '' rs reads the standard input, interpreting each line as a row of blank- @@ -43,8 +59,6 @@ stdenv.mkDerivation rec { to control presentation of the output columns, including transposition of the rows and columns. ''; - - homepage = "https://www.mirbsd.org/htman/i386/man1/rs.htm"; license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 774626561c943..4da65d9af0275 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,24 +1,24 @@ -{ buildGoPackage, lib, fetchFromGitHub }: +{ buildGoModule, lib, fetchFromGitHub }: -buildGoPackage rec { - version = "2.3.0"; +buildGoModule rec { pname = "xurls"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "sha256-+oWYW7ZigkNS6VADNmVwarIsYyd730RAdDwnNIAYvlA="; + sha256 = "sha256-lyDcwbdVKyFRfsYCcPAgIgvrEEdwK0lxmJTvMJcFBCw="; }; - goPackagePath = "mvdan.cc/xurls/v2"; - subPackages = [ "cmd/xurls" ]; + vendorSha256 = "sha256-lJzgJxW/GW3J09uKQGoEX+UsHnB1pGG71U/zy4b9rXo="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Extract urls from text"; homepage = "https://github.com/mvdan/xurls"; maintainers = with maintainers; [ koral ]; - platforms = platforms.unix; license = licenses.bsd3; }; } diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix index a511456e02eb1..d40eb4aac8000 100644 --- a/pkgs/tools/typesetting/soupault/default.nix +++ b/pkgs/tools/typesetting/soupault/default.nix @@ -1,20 +1,27 @@ -{ fetchFromGitHub, ocamlPackages, lib }: +{ lib +, fetchFromGitea +, ocamlPackages +}: ocamlPackages.buildDunePackage rec { pname = "soupault"; - version = "3.2.0"; + version = "4.0.0"; useDune2 = true; - src = fetchFromGitHub { - owner = "dmbaturin"; + minimalOCamlVersion = "4.08"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "PataphysicalSociety"; repo = pname; rev = version; - sha256 = "sha256-T1K/ntCK19LfPmMtaAa9c1JjSL+5dax2SNhM4yUFln4="; + sha256 = "sha256-txNKAZMd3LReFoAtf6iaoDF+Ku3IUNDzBWUqGC2ePKw="; }; buildInputs = with ocamlPackages; [ base64 + camomile containers ezjsonm fileutils @@ -32,11 +39,10 @@ ocamlPackages.buildDunePackage rec { yaml ]; - meta = with lib; { + meta = { description = "A tool that helps you create and manage static websites"; homepage = "https://soupault.app/"; - license = licenses.mit; - maintainers = [ maintainers.toastal ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toastal ]; }; } - |