diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-08-14 14:43:16 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-08-14 14:43:16 +0200 |
commit | cdb1d29692f5cc1b86ebcfbcaafc609cecada0be (patch) | |
tree | 54c16637205b419c9fc330d1ae88c261676740a1 /pkgs/tools | |
parent | b21d01e1859fc84bd8ac438da3be765a267fa3d8 (diff) | |
parent | acbd974996871c2d11a6be5a628b3c984e6fd238 (diff) | |
download | nixpkgs-cdb1d29692f5cc1b86ebcfbcaafc609cecada0be.tar nixpkgs-cdb1d29692f5cc1b86ebcfbcaafc609cecada0be.tar.gz nixpkgs-cdb1d29692f5cc1b86ebcfbcaafc609cecada0be.tar.bz2 nixpkgs-cdb1d29692f5cc1b86ebcfbcaafc609cecada0be.tar.lz nixpkgs-cdb1d29692f5cc1b86ebcfbcaafc609cecada0be.tar.xz nixpkgs-cdb1d29692f5cc1b86ebcfbcaafc609cecada0be.tar.zst nixpkgs-cdb1d29692f5cc1b86ebcfbcaafc609cecada0be.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/tools')
64 files changed, 400 insertions, 149 deletions
diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix index d99a6ec8dac..a05ef18dc99 100644 --- a/pkgs/tools/X11/xwallpaper/default.nix +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xwallpaper"; - version = "0.7.0"; + version = "0.7.3"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; rev = "v${version}"; - sha256 = "1bpymspnllbscha8j9y67w9ck2l6yv66zdbknv8s13hz5qi1ishk"; + sha256 = "sha256-O4VynpP3VJY/p6+NLUuKetwoMfbp93aXTiRoQJkgW+c="; }; nativeBuildInputs = [ pkg-config autoreconfHook installShellFiles ]; diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix new file mode 100644 index 00000000000..d3785a737f9 --- /dev/null +++ b/pkgs/tools/admin/drawterm/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchgit +, xorg +}: + +stdenv.mkDerivation rec { + pname = "drawterm"; + version = "unstable-2021-08-02"; + + src = fetchgit { + url = "git://git.9front.org/plan9front/drawterm"; + rev = "a130d441722ac3f759d2d83b98eb6aef7e84f97e"; + sha256 = "R+W1XMqQqCrMwgX9lHRhxJPG6ZOvtQrU6HUsKfvfrBQ="; + }; + + buildInputs = [ + xorg.libX11 + xorg.libXt + ]; + + # TODO: macos + makeFlags = [ "CONF=unix" ]; + + installPhase = '' + install -Dm755 -t $out/bin/ drawterm + install -Dm644 -t $out/man/man1/ drawterm.1 + ''; + + meta = with lib; { + description = "Connect to Plan9 CPU servers from other operating systems."; + homepage = "https://drawterm.9front.org/"; + license = licenses.mit; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 90252174344..0ffa33a1673 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.40.0"; + version = "1.40.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-zhVG9mtkW0avMTtSnJ36qkxuy4SiiAENrKZqE5mXvaA="; + sha256 = "sha256-J5Wid/Xq3wYY+2/RoFgdY5ZDdNQu8TkTF9W6YLvnwvM="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 0214adb72c3..070d6ef8c21 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,9 +1,10 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: + yarn2nix-moretea.mkYarnPackage rec { version = "0.8.98"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-0.8.98.tgz"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz"; sha256 = "0120csvak07mkgaiq4sxyslcipgfgal0mhd8gwywcij2s71a3n26"; }; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index bb5eda93a59..dfc5f664645 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -16,13 +16,13 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "0akhiaaqz53bf5zyps3vgjifmgh5wvcc9r4lrq9hmj3dds03vkjq"; + sha256 = "sha256-FlxR1bPkUZT3SPuWiK0oAuI9dKfurEZurB0NhyDgOyY="; }; postPatch = '' @@ -40,6 +40,7 @@ python3.pkgs.buildPythonApplication rec { anyascii coqpit flask + fsspec gruut gdown inflect @@ -104,6 +105,7 @@ python3.pkgs.buildPythonApplication rec { "tests/vocoder_tests/test_vocoder_tf_melgan_generator.py" "tests/tts_tests/test_tacotron2_tf_model.py" # RuntimeError: fft: ATen not compiled with MKL support + "tests/tts_tests/test_vits_train.py" "tests/vocoder_tests/test_fullband_melgan_train.py" "tests/vocoder_tests/test_hifigan_train.py" "tests/vocoder_tests/test_melgan_train.py" diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index f80f6060847..88fab512b0b 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -2,10 +2,12 @@ , stdenv , coreutils , fetchFromGitHub -, libsForQt5 , mtools , p7zip -, qt5 +, wrapQtAppsHook +, qtbase +, qttools +, qmake , syslinux , util-linux , which @@ -27,14 +29,12 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - qt5.qtbase - qt5.qttools - libsForQt5.qmake + qtbase + qttools + qmake ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ wrapQtAppsHook ]; # Lots of nice hard-coded paths... postPatch = '' @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to create bootable live USB drives from ISO images"; - homepage = "http://unetbootin.github.io/"; + homepage = "https://unetbootin.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index bf817a50873..03f082a4038 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, fuse }: stdenv.mkDerivation { - name = "9pfs-20150918"; + pname = "9pfs"; + version = "unstable-2015-09-18"; src = fetchFromGitHub { owner = "mischief"; diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index fb6fa01894e..c523255ddb0 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, fuse }: stdenv.mkDerivation rec { - name = "aefs-0.4pre259-8843b7c"; + pname = "aefs"; + version = "0.4pre259-8843b7c"; src = fetchurl { - url = "http://tarballs.nixos.org/${name}.tar.bz2"; + url = "http://tarballs.nixos.org/aefs-${version}.tar.bz2"; sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; }; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 32c942aea5b..22e41611aef 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fuse, libarchive }: -let - name = "archivemount-0.9.1"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "archivemount"; + version = "0.9.1"; src = fetchurl { - url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz"; + url = "https://www.cybernoia.de/software/archivemount/archivemount-${version}.tar.gz"; sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5"; }; diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index e34e5289ad6..f2d55b47161 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "bonnie++-1.98"; + pname = "bonnie++"; + version = "1.98"; + src = fetchurl { - url = "https://www.coker.com.au/bonnie++/${name}.tgz"; + url = "https://www.coker.com.au/bonnie++/bonnie++-${version}.tgz"; sha256 = "010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf"; }; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index cfe80cfce65..31311756ab4 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fuse, glib, attr }: stdenv.mkDerivation rec { - name = "ciopfs-0.4"; + pname = "ciopfs"; + version = "0.4"; src = fetchurl { - url = "http://www.brain-dump.org/projects/ciopfs/${name}.tar.gz"; + url = "http://www.brain-dump.org/projects/ciopfs/ciopfs-${version}.tar.gz"; sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; }; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 7652cc97878..2b573f9afdb 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -9,10 +9,11 @@ }: stdenv.mkDerivation rec { - name = "davfs2-1.6.0"; + pname = "davfs2"; + version = "1.6.0"; src = fetchurl { - url = "mirror://savannah/davfs2/${name}.tar.gz"; + url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A="; }; diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 114c83e84f4..836b94dc795 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -2,10 +2,12 @@ throw "It still does not build" -stdenv.mkDerivation { - name = "fsfs-0.1.1"; +stdenv.mkDerivation rec { + pname = "fsfs"; + version = "0.1.1"; + src = fetchurl { - url = "mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz"; + url = "mirror://sourceforge/fsfs/fsfs-${version}.tar.gz"; sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74"; }; diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index ccc048f7572..dc0b902bf32 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "genext2fs-1.4.1"; +stdenv.mkDerivation rec { + pname = "genext2fs"; + version = "1.4.1"; src = fetchurl { - url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz"; + url = "mirror://sourceforge/genext2fs/genext2fs-${version}.tar.gz"; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; }; diff --git a/pkgs/tools/filesystems/gfs2-utils/default.nix b/pkgs/tools/filesystems/gfs2-utils/default.nix new file mode 100644 index 00000000000..ba479b87aa9 --- /dev/null +++ b/pkgs/tools/filesystems/gfs2-utils/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl +, autoreconfHook, bison, flex, pkg-config +, bzip2, check, ncurses, util-linux, zlib +}: + +stdenv.mkDerivation rec { + pname = "gfs2-utils"; + version = "3.4.1"; + + src = fetchurl { + url = "https://pagure.io/gfs2-utils/archive/${version}/gfs2-utils-${version}.tar.gz"; + sha256 = "sha256-gwKxBBG5PtG4/RxX4sUC25ZeG8K2urqVkFDKL7NS4ZI="; + }; + + outputs = [ "bin" "doc" "out" "man" ]; + + nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; + buildInputs = [ bzip2 ncurses util-linux zlib ]; + + checkInputs = [ check ]; + doCheck = true; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://pagure.io/gfs2-utils"; + description = "Tools for creating, checking and working with gfs2 filesystems"; + maintainers = with maintainers; [ qyliss ]; + license = [ licenses.gpl2Plus licenses.lgpl2Plus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index f107add29c0..61843e4c65b 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -2,10 +2,11 @@ , docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }: stdenv.mkDerivation rec { - name = "httpfs2-0.1.5"; + pname = "httpfs2"; + version = "0.1.5"; src = fetchurl { - url = "mirror://sourceforge/httpfs/httpfs2/${name}.tar.gz"; + url = "mirror://sourceforge/httpfs/httpfs2/httpfs2-${version}.tar.gz"; sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"; }; diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index fadc639fbf6..290bc313910 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, libuuid, autoreconfHook }: stdenv.mkDerivation rec { - name = "jfsutils-1.1.15"; + pname = "jfsutils"; + version = "1.1.15"; src = fetchurl { - url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz"; + url = "http://jfs.sourceforge.net/project/pub/jfsutils-${version}.tar.gz"; sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4"; }; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index e0b1cffe4dd..a2dc01f8c09 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, fuse, libmtp, glib, libmad, libid3tag }: stdenv.mkDerivation rec { - name = "mtpfs-1.1"; + pname = "mtpfs"; + version = "1.1"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse libmtp glib libid3tag libmad ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "https://www.adebenham.com/files/mtp/${name}.tar.gz"; + url = "https://www.adebenham.com/files/mtp/mtpfs-${version}.tar.gz"; sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 486963f44b9..258b25c3693 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "netatalk-3.1.12"; + pname = "netatalk"; + version = "3.1.12"; src = fetchurl { - url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; + url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m"; }; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 488fdb2b267..35657cf8fc5 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: stdenv.mkDerivation rec { - name = "dcraw-9.28.0"; + pname = "dcraw"; + version = "9.28.0"; src = fetchurl { - url = "https://www.dechifro.org/dcraw/archive/${name}.tar.gz"; + url = "https://www.dechifro.org/dcraw/archive/dcraw-${version}.tar.gz"; sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 3a55524dc00..c9c1544c9a0 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libXt, libXaw, libXres, utilmacros }: stdenv.mkDerivation rec { - name = "editres-1.0.7"; + pname = "editres"; + version = "1.0.7"; src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.gz"; + url = "mirror://xorg/individual/app/editres-${version}.tar.gz"; sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19"; }; diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index decb92615f9..6a0a2b2683d 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -2,7 +2,8 @@ }: with python2Packages; buildPythonApplication { - name = "escrotum-2019-06-10"; + pname = "escrotum"; + version = "unstable-2019-06-10"; src = fetchFromGitHub { owner = "Roger"; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index afe8a5ecbcc..6823f6bc20e 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "exiftags-1.01"; +stdenv.mkDerivation rec { + pname = "exiftags"; + version = "1.01"; src = fetchurl { - url = "https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz"; + url = "https://johnst.org/sw/exiftags/exiftags-${version}.tar.gz"; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 28deabb98d1..484a11e322a 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -9,10 +9,11 @@ # } stdenv.mkDerivation rec { - name = "fgallery-1.8.2"; + pname = "fgallery"; + version = "1.8.2"; src = fetchurl { - url = "https://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; + url = "https://www.thregr.org/~wavexx/software/fgallery/releases/fgallery-${version}.zip"; sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 9fe41d91db2..62b4ab6b303 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.32.3"; + pname = "icoutils"; + version = "0.32.3"; src = fetchurl { - url = "mirror://savannah/icoutils/${name}.tar.bz2"; + url = "mirror://savannah/icoutils/icoutils-${version}.tar.bz2"; sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index a4b396c3d23..c04862610b6 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: -stdenv.mkDerivation { - name = "jbig2enc-0.28"; +stdenv.mkDerivation rec { + pname = "jbig2enc"; + version = "0.28"; src = fetchurl { - url = "https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz"; + url = "https://github.com/agl/jbig2enc/archive/${version}-dist.tar.gz"; sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; }; diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index cf10c92286c..e50716f7a5c 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, poppler }: stdenv.mkDerivation { - name = "leela-12.fe7a35a"; + pname = "leela"; + version = "12.fe7a35a"; src = fetchFromGitHub { owner = "TrilbyWhite"; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 30b69c862c3..dea9aa6d97e 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.92.0"; + pname = "netpbm"; + version = "10.92.0"; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 72caf6f86ae..65ebd8ddbd1 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -7,10 +7,11 @@ with lib; stdenv.mkDerivation rec { - name = "optipng-0.7.7"; + pname = "optipng"; + version = "0.7.7"; src = fetchurl { - url = "mirror://sourceforge/optipng/${name}.tar.gz"; + url = "mirror://sourceforge/optipng/optipng-${version}.tar.gz"; sha256 = "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg"; }; diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 001b4cd174b..57cfe988b0b 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -6,10 +6,11 @@ # I'm only interested in making pstoedit convert to svg stdenv.mkDerivation rec { - name = "plotutils-2.6"; + pname = "plotutils"; + version = "2.6"; src = fetchurl { - url = "mirror://gnu/plotutils/${name}.tar.gz"; + url = "mirror://gnu/plotutils/plotutils-${version}.tar.gz"; sha256 = "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg"; }; diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 579dcad4ccb..266b85c54c5 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "pngcheck-3.0.2"; + pname = "pngcheck"; + version = "3.0.2"; src = fetchurl { - url = "mirror://sourceforge/png-mng/${name}.tar.gz"; + url = "mirror://sourceforge/png-mng/pngcheck-${version}.tar.gz"; sha256 = "sha256-DX4mLyQRb93yhHqM61yS2fXybvtC6f/2PsK7dnYTHKc="; }; diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 18a156ea504..16c710ceb79 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.8.13"; + pname = "pngcrush"; + version = "1.8.13"; src = fetchurl { - url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; + url = "mirror://sourceforge/pmt/pngcrush-${version}-nolib.tar.xz"; sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index bec86e20ce3..81f33c65af6 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpng, zlib }: stdenv.mkDerivation rec { - name = "pngnq-1.1"; + pname = "pngnq"; + version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/pngnq/${name}.tar.gz"; + url = "mirror://sourceforge/pngnq/pngnq-${version}.tar.gz"; sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index d1d069c7ff7..c2de8a4fb2a 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -5,11 +5,12 @@ let else if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in -stdenv.mkDerivation { - name = "pngout-20150319"; +stdenv.mkDerivation rec { + pname = "pngout"; + version = "20150319"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz"; + url = "http://static.jonof.id.au/dl/kenutils/pngout-${version}-linux.tar.gz"; sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index 7eabfb89d5a..7abf94f0a3e 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng }: -stdenv.mkDerivation { - name = "pngtoico-1.0"; +stdenv.mkDerivation rec { + pname = "pngtoico"; + version = "1.0"; src = fetchurl { - url = "mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz"; + url = "mirror://kernel/software/graphics/pngtoico/pngtoico-${version}.tar.gz"; sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 57e16a4925a..dd5b51041b1 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pstoedit-3.75"; + pname = "pstoedit"; + version = "3.75"; src = fetchurl { - url = "mirror://sourceforge/pstoedit/${name}.tar.gz"; + url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz"; sha256 = "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp"; }; diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index a6c9cd988c0..617ecbf90ee 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: -stdenv.mkDerivation { - name = "transfig-3.2.4"; +stdenv.mkDerivation rec { + pname = "transfig"; + version = "3.2.4"; + src = fetchurl { - url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz"; + url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.${version}.tar.gz"; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index c1b12ca5fe7..e83e3c13ae3 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libpng, perl, gettext }: -stdenv.mkDerivation { - name = "xcftools-1.0.7"; +stdenv.mkDerivation rec { + pname = "xcftools"; + version = "1.0.7"; src = fetchurl { - url = "http://henning.makholm.net/xcftools/xcftools-1.0.7.tar.gz"; + url = "http://henning.makholm.net/xcftools/xcftools-${version}.tar.gz"; sha256 = "19i0x7yhlw6hd2gp013884zchg63yzjdj4hpany011il0n26vgqy"; }; diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix index 03c692de8ec..23e2da0e41e 100644 --- a/pkgs/tools/inputmethods/anthy/default.nix +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "anthy-9100h"; + pname = "anthy"; + version = "9100h"; meta = with lib; { description = "Hiragana text to Kana Kanji mixed text Japanese input method"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://osdn/anthy/37536/${name}.tar.gz"; + url = "mirror://osdn/anthy/37536/anthy-${version}.tar.gz"; sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"; }; } diff --git a/pkgs/tools/inputmethods/footswitch/default.nix b/pkgs/tools/inputmethods/footswitch/default.nix new file mode 100644 index 00000000000..9cfdbd393bd --- /dev/null +++ b/pkgs/tools/inputmethods/footswitch/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, hidapi }: + +stdenv.mkDerivation { + pname = "footswitch"; + version = "unstable-20201-03-17"; + + src = fetchFromGitHub { + owner = "rgerganov"; + repo = "footswitch"; + rev = "aa0b10f00d3e76dac27b55b88c8d44c0c406f7f0"; + sha256 = "sha256-SikYiBN7jbH5I1x5wPCF+buwFp1dt35cVxAN6lWkTN0="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ hidapi ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace /usr/bin/install install \ + --replace /etc/udev/rules.d $out/lib/udev/rules.d + ''; + + preInstall = '' + mkdir -p $out/bin $out/lib/udev/rules.d + ''; + + meta = with lib; { + description = "Command line utlities for programming PCsensor and Scythe foot switches."; + homepage = "https://github.com/rgerganov/footswitch"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ baloo ]; + }; +} diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index 7feb14080e9..9344951dffe 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "m17n-db-1.8.0"; + pname = "m17n-db"; + version = "1.8.0"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz"; sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"; }; diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index 51e52ce4e95..c80f9736311 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, m17n_db}: stdenv.mkDerivation rec { - name = "m17n-lib-1.8.0"; + pname = "m17n-lib"; + version = "1.8.0"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/m17n-lib-${version}.tar.gz"; sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"; }; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 5b6b0223a01..72f13d4eb2d 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, libhangul }: -stdenv.mkDerivation { - name = "nabi-1.0.0"; +stdenv.mkDerivation rec { + pname = "nabi"; + version = "1.0.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-1.0.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-${version}.tar.gz"; sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 81b910117f1..423f1abd8b5 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sharkdp/bat"; changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir lilyball zowoq ]; + maintainers = with maintainers; [ dywedir lilyball zowoq SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 6d03e49ab87..a308977db4d 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-+KSLmr6tia22XFHYFmn3leRdT6TTKdrQa9PrGGJNPaw="; + sha256 = "sha256-zMmQxg+Qdb4pu+gzouz/lpIu6/u+GaYPhIet7xAgTIk="; }; vendorSha256 = "sha256-9vLOJOWsa6XADvWBLZKlyenqfDSvHuh5Ron4FE2tY7Y="; diff --git a/pkgs/tools/misc/cicero-tui/default.nix b/pkgs/tools/misc/cicero-tui/default.nix index 72721020e12..249e814fd30 100644 --- a/pkgs/tools/misc/cicero-tui/default.nix +++ b/pkgs/tools/misc/cicero-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cicero-tui"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "eyeplum"; repo = "cicero-tui"; rev = "v${version}"; - sha256 = "sha256-FwjD+BdRc8y/g5MQLmBB/qkUj33cywbH2wjTp0y0s8A="; + sha256 = "sha256-j/AIuNE5WBNdUeXuKvvc4NqsVVk252tm4KR3w0e6bT8="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "sha256-JygEE7K8swbFvJ2aDXs+INhfoLuhy+LY7T8AUr4lgJY="; + cargoSha256 = "sha256-yup6hluGF2x+0XDwK+JETyNu4TFNPmqD4Y0Wthxrbcc="; meta = with lib; { description = "Unicode tool with a terminal user interface"; diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix index 54b9ce0cc49..91e4dfb99b3 100644 --- a/pkgs/tools/misc/elfcat/default.nix +++ b/pkgs/tools/misc/elfcat/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "ruslashev"; repo = pname; rev = version; - sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY="; + sha256 = "sha256-v8G9XiZS+49HtuLjs4Co9A1J+5STAerphkLaMGvqXT4="; }; cargoSha256 = null; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 72879fdb9d1..6bb728af99c 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -7,7 +7,7 @@ , withGUI ? withGTK , withPython ? true , withExtras ? true -, Carbon ? null, Cocoa ? null +, Carbon, Cocoa }: assert withGTK -> withGUI; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { readline uthash woff2 zeromq libuninameslist python freetype zlib glib giflib libpng libjpeg libtiff libxml2 ] - ++ lib.optionals withSpiro [libspiro] + ++ lib.optionals withSpiro [ libspiro ] ++ lib.optionals withGUI [ gtk3 cairo pango ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; @@ -77,11 +77,11 @@ stdenv.mkDerivation rec { rm -r "$out/share/fontforge/python" ''; - meta = { + meta = with lib; { description = "A font editor"; - homepage = "http://fontforge.github.io"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.erictapen ]; + homepage = "https://fontforge.github.io"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = [ maintainers.erictapen ]; }; } diff --git a/pkgs/tools/misc/lua-format/default.nix b/pkgs/tools/misc/lua-format/default.nix new file mode 100644 index 00000000000..9aad25ce729 --- /dev/null +++ b/pkgs/tools/misc/lua-format/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }: + +stdenv.mkDerivation rec { + pname = "lua-format"; + version = "1.3.6"; + + src = fetchFromGitHub { + owner = "Koihik"; + repo = "LuaFormatter"; + rev = version; + sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0"; + }; + + patches = [ + (substituteAll { + src = ./fix-lib-paths.patch; + antlr4RuntimeCpp = antlr4.runtime.cpp.dev; + inherit libargs catch2 libyamlcpp; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ antlr4.runtime.cpp libyamlcpp ]; + + meta = with lib; { + description = "Code formatter for Lua"; + homepage = "https://github.com/Koihik/LuaFormatter"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/misc/lua-format/fix-lib-paths.patch b/pkgs/tools/misc/lua-format/fix-lib-paths.patch new file mode 100644 index 00000000000..fce2347d8e0 --- /dev/null +++ b/pkgs/tools/misc/lua-format/fix-lib-paths.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a21b94..0ac7911 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,10 +67,10 @@ endif() + + include_directories( + ${PROJECT_SOURCE_DIR}/generated/ +- ${PROJECT_SOURCE_DIR}/third_party/ +- ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include +- ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include +- ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src ++ @libargs@/include ++ @catch2@/include ++ @libyamlcpp@/include ++ @antlr4RuntimeCpp@/include/antlr4-runtime + ${PROJECT_SOURCE_DIR}/src/ + ) + +@@ -92,9 +92,6 @@ file(GLOB_RECURSE yaml-cpp-src + ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp + ) + +-add_library (antlr4-cpp-runtime ${antlr4-cpp-src}) +-add_library (yaml-cpp ${yaml-cpp-src}) +- + add_executable(lua-format ${src_dir} src/main.cpp) + + if(WIN32) +@@ -104,7 +101,7 @@ endif() + + set_target_properties(lua-format PROPERTIES LINKER_LANGUAGE CXX) + +-target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime ${extra-libs}) ++target_link_libraries(lua-format yaml-cpp antlr4-runtime ${extra-libs}) + + install(TARGETS lua-format + RUNTIME DESTINATION bin +@@ -135,7 +132,7 @@ if(BUILD_TESTS) + endif() + + target_compile_definitions(lua-format-test PUBLIC PROJECT_PATH="${PROJECT_SOURCE_DIR}") +- target_link_libraries(lua-format-test yaml-cpp antlr4-cpp-runtime ${extra-libs}) ++ target_link_libraries(lua-format-test yaml-cpp antlr4-runtime ${extra-libs}) + + add_test(NAME args COMMAND lua-format-test [args]) + add_test(NAME config COMMAND lua-format-test [config]) +diff --git a/src/main.cpp b/src/main.cpp +index 38962a2..332aad6 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -1,4 +1,4 @@ +-#include <args/args.hxx> ++#include <args.hxx> + #include <cstdlib> + #include <fstream> + #include <iostream> +diff --git a/test/test_args.cpp b/test/test_args.cpp +index 69a5746..b988d00 100644 +--- a/test/test_args.cpp ++++ b/test/test_args.cpp +@@ -1,4 +1,4 @@ +-#include <args/args.hxx> ++#include <args.hxx> + #include <catch2/catch.hpp> + #include <iostream> + #include <tuple> diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index f71d2d97638..8e91013521f 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.42"; src = fetchurl { - url = "https://www.lcdf.org/type/${pname}-${version}.tar.gz"; + url = "https://www.lcdf.org/type/t1utils-${version}.tar.gz"; sha256 = "YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { resources from a Macintosh font file or create a Macintosh Type 1 font file from a PFA or PFB font. ''; - homepage = "http://www.lcdf.org/type/"; + homepage = "https://www.lcdf.org/type/"; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 392b03f21a3..49e07b7507a 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9Q0jRh8nlgiWslmlFAth8eff+hir5gIT8YL898FMSqk="; + sha256 = "sha256-u/KHiny9o/q74dh/w3cShAb6oEkMxNaTMF2lOFx+1po="; }; - cargoSha256 = "sha256-DFFA6t+ZgpGieq5kT80PW5ZSByIp54ia2UvcBYY2+Lg="; + cargoSha256 = "sha256-wUNF+810Yh4hPQzraWo2mDi8KSmRKp9Z9D+4kwKQ+IU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index e3e4a67c131..8928215dccb 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.9"; + version = "1.9.10"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-iVSWBR1+SkXlkwMii2PXpcxFSXYigz4lfNnMZBvS2kM="; + sha256 = "08pr2qav87jmrf074v8zbqyjkl51wf6r9hhgbkzhdav9d4f9kny3"; }; patches = [ ./dont-create-var.patch ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index e224cc33a03..468bc127228 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "EYERtDYIf0aw9nMLFZPGZ5s1i+erSq9H3tP29KwCAgQ="; + sha256 = "hmP2bcoBWMd2GZBE8XtJ5QePpWnkJV5pu69aDmL5V4g="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 7a421aaeebf..5e1562fa431 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -1,5 +1,5 @@ { gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check -, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: +, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm, zchunk }: gcc9Stdenv.mkDerivation rec { pname = "libdnf"; @@ -26,6 +26,7 @@ gcc9Stdenv.mkDerivation rec { libsmartcols libyaml libmodulemd + zchunk ]; propagatedBuildInputs = [ @@ -51,7 +52,6 @@ gcc9Stdenv.mkDerivation rec { "-DWITH_GTKDOC=OFF" "-DWITH_HTML=OFF" "-DWITH_BINDINGS=OFF" - "-DWITH_ZCHUNK=OFF" ]; meta = with lib; { diff --git a/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch b/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch index d1a1997ba1f..a22781269d8 100644 --- a/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch +++ b/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch @@ -15,7 +15,7 @@ index e253905..2fdb20f 100644 main(int argc, char **argv) { const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:" -+ "/run/current-system/sw/bin:/run/current-system/sw/sbin:/run/wrappers/bin:" ++ "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/sbin:" "/usr/local/bin:/usr/local/sbin"; const char *confpath = NULL; char *shargv[] = { NULL, NULL }; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index a2a6caf2b11..2b373360965 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.0.23"; + version = "5.0.28"; src = fetchFromGitHub { - rev = "v${version}"; - sha256 = "0annkm0hqhkpjmfa6ywvzgn1n9619baqdzdbhjfhzfi4hf7mml1d"; - repo = "eid-mw"; owner = "Fedict"; + repo = "eid-mw"; + rev = "v${version}"; + sha256 = "rrrzw8i271ZZkwY3L6aRw2Nlz+GmDr/1ahYYlUBvtzo="; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 0e92047c63f..0eba7b465fc 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-08-11"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-OSEG0pWnxSvUS1h9v1j9/poo15ZoouNqiG+qB/JrOHc="; + sha256 = "sha256-7nXcegB0ZuNXIExf6LWqSrjrdD+5ahGJb00O/G6lXmk="; }; installPhase = '' diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 909bbbaed16..97426e0be80 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -2,7 +2,9 @@ , libgpgerror, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , libcap ? null, libsecret ? null -, enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] +, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] + ++ lib.optionals stdenv.isLinux [ "gnome3" ] + ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ] }: with lib; diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index d3af5e368f5..106012bd7a3 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eCkinYJtZNf5Fo+LXu01cHRInA9CfDONvt1OIs3XJSk="; + sha256 = "sha256-DTwA8nHWKOXeha0TBoEGJuoUedxJVev0R0GnHuaHEMc="; }; - vendorSha256 = "1fqk9dpbfz97jwx1m54a8q67g95n5w7m1bxb7g9gkzk98f1zzv3r"; + vendorSha256 = "sha256-gDhEaJ444d7fITVaEkH5RXMykmZyXjC+mPfaa2vkpIk="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 78db6e2037e..a735e35624f 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation { kovirobi ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } # TODO: investigate the mouse chording support patch diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index f6b179346a8..8d867c76e1a 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { version = "1.46r862"; src = fetchurl { - url = "http://sg.danny.cz/sg/p/${pname}-${version}.tgz"; + url = "https://sg.danny.cz/sg/p/sg3_utils-${version}.tgz"; sha256 = "s2UmU+p3s7Hoe+GFri2q+/3XLBICc+h04cxM86yaAs8="; }; meta = with lib; { - homepage = "http://sg.danny.cz/sg/"; + homepage = "https://sg.danny.cz/sg/"; description = "Utilities that send SCSI commands to devices"; platforms = platforms.linux; license = with licenses; [ bsd2 gpl2Plus ]; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index eb3c8dc2e0e..1658b4ea4df 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, fetchurl, autoreconfHook -, enableMail ? false, mailutils, inetutils -, IOKit, ApplicationServices }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, enableMail ? false +, mailutils +, inetutils +, IOKit +, ApplicationServices +}: let dbrev = "5171"; drivedbBranch = "RELEASE_7_2_DRIVEDB"; driverdb = fetchurl { - url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; + url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; sha256 = "0vncr98xagbcfsxgfgxsip2qrl9q3y8va19qhv6yknlwbdfap4mn"; - name = "smartmontools-drivedb.h"; + name = "smartmontools-drivedb.h"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "smartmontools"; version = "7.2"; @@ -24,10 +32,11 @@ in stdenv.mkDerivation rec { # fixes darwin build ./smartmontools.patch ]; - postPatch = "cp -v ${driverdb} drivedb.h"; + postPatch = '' + cp -v ${driverdb} drivedb.h + ''; - configureFlags = lib.optional enableMail - "--with-scriptpath=${lib.makeBinPath [ inetutils mailutils ]}"; + configureFlags = lib.optional enableMail "--with-scriptpath=${lib.makeBinPath [ inetutils mailutils ]}"; nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; @@ -35,10 +44,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Tools for monitoring the health of hard drives"; - homepage = "https://www.smartmontools.org/"; - license = licenses.gpl2Plus; + homepage = "https://www.smartmontools.org/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peti Frostman ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux ++ darwin; mainProgram = "smartctl"; }; } diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index 07fd6f433d7..7f5b7b61c62 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; + sha256 = "sha256-gVQqZbz6ylBBlmhSgyaSEvAyMi48QiuviwZodPVGJxI="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; |