diff options
Diffstat (limited to 'pkgs/tools')
28 files changed, 173 insertions, 126 deletions
diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/tools/admin/auth0-cli/default.nix index 98bdf82e0ad91..65e093c2c3e8e 100644 --- a/pkgs/tools/admin/auth0-cli/default.nix +++ b/pkgs/tools/admin/auth0-cli/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { homepage = "https://auth0.github.io/auth0-cli"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "auth0"; }; } diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index b7158eefd68f8..efdfae8268a9f 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lf+vJHR4+PZgoZNP4cSJswP0hi8YkUV85JISJxSjyjU="; + sha256 = "sha256-JVxlfwCA+EetV4QYB6uEKe1yWt3sCvMPZwyIr6Td7Bw="; }; - cargoSha256 = "sha256-evnUG94PagkgKoVwyd4aBaLXYYpF2k7zGhLRhdNDcoU="; + cargoSha256 = "sha256-uUxwQIQTzQkKgR4F4sf4J1G2LaXiGbIvA6VM55zLK2E="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 619599dc737a7..74f483ab7e958 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.58.0"; + version = "0.59.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fTF86gjP2a+KMI/Mz98xOM7f/U0CgkWQO1+joZ8gp3k="; + sha256 = "sha256-jFBYH3xhny+KURoYiuyblntmtKD9XKLp3V2ifqkfHZg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-vx85Mn22mVrW3iALbE1+Iw601KJiN7bwoYnQx/qa+ho="; + vendorSha256 = "sha256-xoGraf3Rh14lHyTU12qFxwk1Cv9N6u5FSxtro0zwRJM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/tools/audio/headset-charge-indicator/default.nix index 2e4f631851900..f771fd47a7584 100644 --- a/pkgs/tools/audio/headset-charge-indicator/default.nix +++ b/pkgs/tools/audio/headset-charge-indicator/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, headsetcontrol, wrapGAppsHook, python3, gtk3 -, gobject-introspection, libayatana-appindicator-gtk3 }: +, gobject-introspection, libayatana-appindicator }: stdenv.mkDerivation rec { # The last versioned release is 1.0.0.0 from 2020, since then there were updates but no versioned release. @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { headsetcontrol gtk3 gobject-introspection - libayatana-appindicator-gtk3 + libayatana-appindicator ]; installPhase = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 2bedd2abacddd..be9dbca4baa9c 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook -, gnome, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio +, gnome, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome.adwaita-icon-theme - avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper + avahi gtk3 libayatana-appindicator libnotify libpulseaudio xlibsWrapper gsettings-desktop-schemas ]; diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index 3a641f80852f3..fdd59a4713be1 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/TTnviFfL56l5WJwNLTcVXccUss8uhvR9ZSkHZcisc8="; + sha256 = "sha256-Yg/R3f84nSLrfHA20Jtq28ldSK/y4c7rVm4GN4+DlDY="; }; vendorSha256 = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 092d33b2e8196..9435d0487b764 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, CoreServices }: stdenv.mkDerivation rec { version = "060102"; @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; }; + postConfigure = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace /System/Library/Frameworks/CoreServices.framework/CoreServices "-framework CoreServices" + ''; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + makeFlags = [ "DESTDIR=$(out)" ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 49211f416d673..192959ec76034 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fsql"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kshvmdn"; repo = "fsql"; rev = "v${version}"; - sha256 = "sha256-/9X1ag18epFjEfB+TbRsHPCZRZblV0ohvDlZ523kXXc="; + sha256 = "sha256-YavkN7n2Nt92T+uMwWRVv3q81DA6fFoNIJt9NYMS3rc="; }; - vendorSha256 = "sha256-h75iQSpHZqc0QNOZWHU1l6xsHB8ClfWXYo1jVMzX72Q="; + vendorSha256 = "sha256-xuD7/gTssf1Iu1VuIRysjtUjve16gozOq0Wz4w6mIB8="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 56a3159511436..12cc1f3d21fb8 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.11.5"; + version = "1.12.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RertNRBwrlodsjwv1NqNOR6ZDEMaRsHG1dVEu0Z501I="; + sha256 = "sha256-OObwteXfUPezJRIN01jOWzDWHEdkmkubBBk7W1LdrUU="; }; - vendorSha256 = "sha256-d068X29Lh0l9S7HTmO75HcsV9ZdUsjp977Esxy7gzKI="; + vendorSha256 = "sha256-EFBoqHiu1KZ0+16LwysMsqZAUMJSPerKKM2ydlUfKMA="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 02314ec77e9cf..cbaa961107227 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, bison, re2c, sconsPackages, - libcxx + libcxx, libcxxabi }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { substituteInPlace ./SConstruct \ --replace \ "env['LIBPATH'] = []" \ - "env['LIBPATH'] = ['${lib.getLib libcxx}/lib']" + "env['LIBPATH'] = ['${lib.getLib libcxx}/lib', '${lib.getLib libcxxabi}/lib']" '' + '' sed '1i#include <limits>' -i libgringo/gringo/{control,term}.hh ''; diff --git a/pkgs/tools/misc/octosql/default.nix b/pkgs/tools/misc/octosql/default.nix index 5e310819d3675..0b08a6bcd0d72 100644 --- a/pkgs/tools/misc/octosql/default.nix +++ b/pkgs/tools/misc/octosql/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "octosql"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "cube2222"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wzi+rDZsrffeKuNbTlWRH9jdo4+tiDTAporGdQfIqEw="; + sha256 = "sha256-Ao1c0oCgrn0XGCMlIhvHqCnWIIiLejp7gfkK0guIDrI="; }; vendorSha256 = "sha256-as8vJmUH0mDPQ8K6D5yRybPV5ibvHEtyQjArXjimGpo="; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 6d1ca41e937b7..3ef92d895a065 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -15,7 +15,7 @@ , e2fsprogs , libsoup , glib-networking -, wrapGAppsHook +, wrapGAppsNoGuiHook , gpgme , which , makeWrapper @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index 77bc9f172c6f3..47ff95c14f5f7 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: +{ lib, stdenv, fetchurl, freetype, libtool, flex, bison, pkg-config }: stdenv.mkDerivation { pname = "ttf-mkfontdir"; @@ -20,11 +20,21 @@ stdenv.mkDerivation { ./cstring.patch # also fixes some other compilation issues (freetype includes) ]; - preInstall = '' - mkdir -p $out; makeFlags="DESTDIR=$out BINDIR=/bin" + # cross-compilation fixes: + # - fix libtool, the reason it does not work in nativeBuildInputs is complicated + # see https://github.com/NixOS/nixpkgs/pull/192878 for more info + # - freetype-config doesn't properly support cross-compilation, but is just a thin + # wrapper around pkg-config anyways + postPatch = '' + substituteInPlace Makefile \ + --replace "libtool " "${libtool}/bin/libtool --tag=CXX " \ + --replace "freetype-config" "${stdenv.cc.targetPrefix}pkg-config freetype2" ''; - buildInputs = [freetype fontconfig libunwind libtool flex bison]; + makeFlags = [ "DESTDIR=${placeholder "out"}" "BINDIR=/bin" "CXX=${stdenv.cc.targetPrefix}c++" ]; + + nativeBuildInputs = [ flex bison pkg-config ]; + buildInputs = [ freetype ]; meta = { description = "Create fonts.dir for TTF font directory"; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 55badd94f299c..cc9099877c1e7 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.6.0"; + version = "9.6.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/alVraVGggViOxWZsFgdBE49PPzZijLP+ky9F686Ano="; + sha256 = "sha256-4yikcuAhrVzWYsNOI546tA94Eho7QDCyBCmpaQ2tLW8="; }; - vendorSha256 = "sha256-RBaMQyjqlQkH4tvgkqemIG3c0IzZiMpaa3SsSebV2Zs="; + vendorSha256 = "sha256-i/80caEjr5kZAK30sXF9dKh+jAi3msntfB/BUqpGuRY="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 642db551d4b24..64587e0853597 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.45.3"; + version = "0.45.4"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0yb+YfX8+QKH+Mi0D1Gh0b1hfh2EiemMTkotV+z53Ns="; + sha256 = "sha256-AHsbp9eWLzIJZtn1CNBUE2dwAmBfNmWZ926jB84PEoQ="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index afc0c9022b0fc..fcd1c25c3fd01 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-10-09T21-10-59Z"; + version = "2022-10-12T18-12-50Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-nsszO0sxQWtukBI4qiiU5gL1yI4rpbG5MGhtCFPUY2c="; + sha256 = "sha256-kzIJL3cB/zifu5H1OT0/4luMNHa6XuHVdsUcAh2sY0c="; }; - vendorSha256 = "sha256-kAbbvaMREGlZYtSikZmB4J7uFwZ9SjRdf2B5g9PvBOc="; + vendorSha256 = "sha256-DA1EpLmr0/+QEDRHW8nzF1myuZd5IZ7WHG5rrFrb/kE="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 2d44895bdb870..fccf0ecc22e65 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, nixosTests, buildGoModule, fetchFromGitHub, installShellFiles , pkg-config -, libayatana-appindicator, libX11, libXcursor, libXxf86vm +, gtk3, libayatana-appindicator, libX11, libXcursor, libXxf86vm , Cocoa, IOKit, Kernel, UserNotifications, WebKit , ui ? false }: let @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M+zuC0S1dbCC7udgnXe5Ksm4XbLRJoH9StinShDkDMU="; + sha256 = "sha256-irOrYQIMy1GS/EsN4YtLP4/lHuQ+r7ZGzvNA4dkHi8s="; }; vendorSha256 = "sha256-+jJUKp2EvtDxGsv+9B+s7FiIopvO8yH9jldeRZkrd20="; @@ -28,6 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; buildInputs = lib.optionals (stdenv.isLinux && ui) [ + gtk3 libayatana-appindicator libX11 libXcursor diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index bc05f3d998ec4..1cf81ab8263f8 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IAFV8yDgA7ZGGZwdEWxiggIheAN4nH5UFfXQv8IjpwQ="; + sha256 = "sha256-I8VC/fwcDXqdT7U1WrptqVWufCLbk+3Zc2iXsBj6Fno="; }; - vendorSha256 = "sha256-mE2yFGRAgi9RAzt08abbeAuAvmwBFMiAJuMZCDChg3Y="; + vendorSha256 = "sha256-3K2jZRJksY/rzRiFjgU06fkXpySkJI0JTTGvvEDwS6s="; modRoot = "./v2"; diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix index 922a7f4e39942..7a11e57cb0261 100644 --- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix +++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix @@ -38,10 +38,10 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "2.0.0.0"; + version = "2.0.0.2"; src = fetchzip { - url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.0.tar.gz"; - sha256 = "033582nzyi0hfis062cnz8lgx918lk1bmzfimsd78a9zzxn20frg"; + url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.2.tar.gz"; + sha256 = "1xfcl7203sgc88a9xdnswwk7rirsaff7jb27yil7mrb7ni10g2f9"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index f4bbe75aafc34..323464847b601 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { # Fix BuildRoot handling in RPM builds. ./set-buildroot.patch + + (fetchurl { + url = "https://salsa.debian.org/debian/checkinstall/-/raw/7175ae9de0e45f42fdd7f185ab9a12043d5efeeb/debian/patches/0016-Define-_STAT_VER-_MKNOD_VER-locally-dropped-in-glibc.patch"; + hash = "sha256-InodEfvVMuN708yjXPrVXb+q8aUcyFhCLx35PHls0Eo="; + }) ] ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index b4781ba7c0bd1..1b0dcf86a170d 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "BishopFox"; repo = pname; rev = "v${version}"; - hash = "sha256-JwSXm75CC1GBbQ7kZJXyDXf2997owRaGcB2m7q+BrEs="; + hash = "sha256-QntRCiY6le3gCuWoNT27WD/p4huxjCDFb24Sj/8luMs="; }; - vendorSha256 = "sha256-KrJR5YZxP6psHphY0BhYFu14PaDi5k1ngFfYPSzOYK4="; + vendorSha256 = "sha256-89VQ7RH2TTYME+fH1S0KHAIfUYXV6Oi72kz70JVBXTs="; # Some tests are failing because of wrong filename/path doCheck = false; diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 019b58a94b050..28eb45a6cdb2f 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.12.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "sha256-Ew9RHjzmQGZ9Vou436NdBLAj97vfnrLy9EuRKg4sNHY="; + sha256 = "sha256-yFUpaKfZUgT/KZyZLEeNGnD0SS4iBAQfXRy/Yiuj9g8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -23,7 +23,7 @@ let ''; }; - vendorSha256 = "sha256-SwezkvJx50NpwNrv//Ai8yj5ONfC/hmdKbVS754ofW8="; + vendorSha256 = "sha256-RtlSf34l68XzxJB7G/aSjpu3BBtV556sRauWj591fIk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index f06ae50ca41e9..d4d5626d32e07 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.25.2"; + version = "1.26.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "sha256-6CpdvLCw7SUmWm9NHAxFAo454Rrp1FloDp67YAr0pjQ="; + sha256 = "sha256-LPIc1odUBvjVJty3GYYFNhile4XBWMisLUeVtWH6xgE="; }; - cargoSha256 = "sha256-+rXQGZNUz6UDLFVNbyHF6dTe3nEm5/2ITmVI+MfY6nM="; + cargoSha256 = "sha256-IfseODaoqlPNBlVjS+9+rKXAOq29TgULMA/ogmqg0NA="; postPatch = '' # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix index 41b28e6fca0d4..c22c74cd4a84e 100644 --- a/pkgs/tools/system/ddrescueview/default.nix +++ b/pkgs/tools/system/ddrescueview/default.nix @@ -1,18 +1,14 @@ { stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk-pixbuf, glib, gtk2, libX11, pango }: -let - versionBase = "0.4"; - versionSuffix = "alpha4"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ddrescueview"; - version = "${versionBase}${versionSuffix}"; + version = "0.4.5"; src = fetchurl { - name = "ddrescueview-${versionBase}${versionSuffix}.tar.xz"; - url = "mirror://sourceforge/ddrescueview/ddrescueview-source-${versionBase}~${versionSuffix}.tar.xz"; - sha256 = "0v159nlc0lrqznbbwi7zda619is5h2rjk55gz6cl807j0kd19ycc"; + url = "mirror://sourceforge/ddrescueview/ddrescueview-source-${version}.tar.xz"; + sha256 = "sha256-Vzg8OU5iYSzip5lDiwDG48Rlwx+bqUDgd/Yk4ucChGU="; }; - sourceRoot = "ddrescueview-source-${versionBase}~${versionSuffix}/source"; + sourceRoot = "ddrescueview-source-${version}/source"; nativeBuildInputs = [ fpc lazarus ]; diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index a948582f82972..475bba31069ed 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.8.1"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-9n8z0ttlhrc62e+InOs1AJpjFAolPDiFas2qAiYElCw="; + sha256 = "sha256-6km0hJKnSHyIkMZ0LznzzmK6KZ4kZBpI94XE5SZ4xxs="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/tools/text/frawk/default.nix new file mode 100644 index 0000000000000..d4e0f809ebe1e --- /dev/null +++ b/pkgs/tools/text/frawk/default.nix @@ -0,0 +1,43 @@ +{ lib +, rustPlatform +, fetchCrate +, libxml2 +, ncurses +, zlib +, features ? [ "default" ] +, llvmPackages_12 +}: + +rustPlatform.buildRustPackage rec { + pname = "frawk"; + version = "0.4.6"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-yEdfMikMcsQePxQL1+lma95O1x5z1B7aXAEf8apuGaU="; + }; + + cargoSha256 = "sha256-osi77Fx8jSfIvAIpThgPbnuJVF/Ydr2/+ROHcDG5ZbA="; + + buildInputs = [ libxml2 ncurses zlib ]; + + buildNoDefaultFeatures = true; + buildFeatures = features; + + preBuild = lib.optionalString (lib.elem "default" features || lib.elem "llvm_backend" features) '' + export LLVM_SYS_120_PREFIX=${llvmPackages_12.llvm.dev} + '' + lib.optionalString (lib.elem "default" features || lib.elem "unstable" features) '' + export RUSTC_BOOTSTRAP=1 + ''; + + # depends on cpu instructions that may not be available on builders + doCheck = false; + + meta = with lib; { + description = "A small programming language for writing short programs processing textual data"; + homepage = "https://github.com/ezrosent/frawk"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.x86; + }; +} diff --git a/pkgs/tools/wayland/hyprpaper/default.nix b/pkgs/tools/wayland/hyprpaper/default.nix deleted file mode 100644 index 20c329f1512c4..0000000000000 --- a/pkgs/tools/wayland/hyprpaper/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libjpeg -, mesa -, pango -, wayland -, wayland-protocols -, wayland-scanner -}: - -stdenv.mkDerivation rec { - pname = "hyprpaper"; - version = "unstable-2022-07-24"; - - src = fetchFromGitHub { - owner = "hyprwm"; - repo = pname; - rev = "f75fcf01d1f652d55f79032a40d821d2ff78520e"; - sha256 = "sha256-M2g4NeDoYt32j02cimCR4vWzAzauIzQVQaWgBWXDAtk="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wayland-scanner - ]; - - buildInputs = [ - libjpeg - mesa - pango - wayland - wayland-protocols - ]; - - prePatch = '' - substituteInPlace src/main.cpp \ - --replace GIT_COMMIT_HASH '"${src.rev}"' - ''; - - preConfigure = '' - make protocols - ''; - - installPhase = '' - mkdir -p $out/bin - install -m755 ./hyprpaper $out/bin - ''; - - meta = with lib; { - homepage = "https://github.com/hyprwm/hyprpaper"; - description = "A blazing fast wayland wallpaper utility"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ wozeparrot ]; - }; -} diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/tools/wayland/waynergy/default.nix new file mode 100644 index 0000000000000..7208334ea506b --- /dev/null +++ b/pkgs/tools/wayland/waynergy/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, pkg-config +, ninja +, wayland-scanner +, libdrm +, wayland +, wayland-protocols +, wl-clipboard +, libxkbcommon +, cmake +, libressl +}: +stdenv.mkDerivation rec { + pname = "waynergy"; + version = "0.0.13"; + + src = fetchFromGitHub { + owner = "r-c-f"; + repo = "waynergy"; + rev = "v${version}"; + hash = "sha256-eTY7tktUmoTZO3w9uP1P8cIz0mmFiWm5YFGVAS6JwwE="; + }; + + depsBuildBuild = [ pkg-config ]; + buildInputs = [ libdrm wayland wayland-protocols wl-clipboard libxkbcommon cmake libressl ]; + nativeBuildInputs = [ meson ninja ]; + + postPatch = '' + substituteInPlace waynergy.desktop --replace "Exec=/usr/bin/waynergy" "Exec=$out/bin/waynergy" + ''; + + meta = with lib; { + description = "A synergy client for Wayland compositors"; + longDescription = '' + A synergy client for Wayland compositors + ''; + homepage = "https://github.com/r-c-f/waynergy"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ maxhero pedrohlc ]; + }; +} |