diff options
Diffstat (limited to 'pkgs/tools')
73 files changed, 775 insertions, 429 deletions
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 0d0b63711d2c..b88307101017 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -6,6 +6,7 @@ , sphinx , nixosTests , pkgs +, fetchPypi }: let @@ -74,6 +75,17 @@ let # keep the scope, as it is used throughout the derivation and tests # this also makes potential future overrides easier pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + # flask-security-too 4.1.5 is incompatible with flask-babel 3.x + flask-babel = prev.flask-babel.overridePythonAttrs (oldAttrs: rec { + version = "2.0.0"; + src = fetchPypi { + inherit pname version; + sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + }; + nativeBuildInputs = [ ]; + format = "setuptools"; + outputs = [ "out" ]; + }); # flask 2.2 is incompatible with pgadmin 6.18 # https://redmine.postgresql.org/issues/7651 flask = prev.flask.overridePythonAttrs (oldAttrs: rec { diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index cb3614eaf234..84c894a57fcf 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.48.5"; + version = "0.48.6"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-umgOIjOzx8qUCcZfM3nGYeYDmqmA2ayy2lGAS+nSU2s="; + hash = "sha256-y6dhp5CUq9fJq7Vjib1g1P0TMCeBIcR32LHqNvMgjZI="; }; - vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo="; + vendorHash = "sha256-9BXuxeLL3MwefhtV2SLplAgY/KQI1crWrTNSSC4hUXw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index c162521870ba..e68b565d0581 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.36.1"; + version = "0.37.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V6x7xILG2/mg95S3qv8pM6ZVXWmh1iHMvDVEfidHau4="; + sha256 = "sha256-4kjsNaiXnmJk88ivVnpTemOOc/asKrcZLGpO8gtV0J8="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-qTtx8+D288RT3wOdmvUXVeHx4GwIyCyCnO/sQW0blIU="; + vendorSha256 = "sha256-qI29Qb8im9Xii83ayG1jZtZsrsAT0JQOcuKOM7VYro0="; excludedPackages = "misc"; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 226300952222..74f1bcfe9b8b 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "6.2.3"; + version = "6.2.5"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - hash = "sha256-Egk25B+CbNY9d6WArupkwbef0+JDT1jOgYTng7UeWwE="; + hash = "sha256-mjl0QQ0dNA45mN0qb5j6776DjK1VYmbnFK37Doz5N3w="; }; postPatch = '' diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index fce137cf3b46..4eafd324deb7 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.01.08"; + version = "2023.01.21"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-PUaGjZFMYwG9BduIgmzhi5DTkGfSN9VtAUkqrAZ2xbo="; + hash = "sha256-BantnVvIGJ3BKAKjK/6JQS1Kk1E8PDJFP/WuOjYbSy8="; }; meta = with lib; { diff --git a/pkgs/tools/audio/fmtoy/default.nix b/pkgs/tools/audio/fmtoy/default.nix index dd3f04021327..69a0f570d3bc 100644 --- a/pkgs/tools/audio/fmtoy/default.nix +++ b/pkgs/tools/audio/fmtoy/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fmtoy"; - version = "unstable-2021-12-24"; + version = "unstable-2022-12-23"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "fmtoy"; - rev = "0de6703b3373eb5bf19fd3deaae889286f330c21"; - sha256 = "0sr6klkmjd2hd2kyb9y0x986d6lsy8bziizfc6cmhkqcq92fh45c"; + rev = "78b61b5e9bc0c6874962dc4040456581c9999b36"; + sha256 = "r5zbr6TCxzDiQvDsLQu/QwNfem1K4Ahaji0yIz/2yl0="; }; postPatch = '' @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vampirefrog/fmtoy"; description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)"; - # Unknown license situation + # Unclear if gpl3Only or gpl3Plus # https://github.com/vampirefrog/fmtoy/issues/1 - license = licenses.unfree; + license = licenses.gpl3; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; }; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 411aaece5329..5f61a9660f2a 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -23,70 +23,75 @@ stdenv.mkDerivation { --prefix PATH : ${lib.makeBinPath runtimePackages} ''; - nativeBuildInputs = [ makeWrapper pkg-config ]; + + strictDeps = true; + + nativeBuildInputs = + [ makeWrapper pkg-config which + ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir + ]; + buildInputs = [ - libjpeg - which - ocamlPackages.ocaml ocamlPackages.findlib + libjpeg - # Mandatory dependencies - ocamlPackages.dtools - ocamlPackages.duppy - ocamlPackages.mm - ocamlPackages.ocaml_pcre - ocamlPackages.menhir ocamlPackages.menhirLib - ocamlPackages.camomile - ocamlPackages.ocurl - ocamlPackages.uri - ocamlPackages.sedlex + # Mandatory dependencies + ocamlPackages.dtools + ocamlPackages.duppy + ocamlPackages.mm + ocamlPackages.ocaml_pcre + ocamlPackages.menhir ocamlPackages.menhirLib + ocamlPackages.camomile + ocamlPackages.ocurl + ocamlPackages.uri + ocamlPackages.sedlex - # Recommended dependencies - ocamlPackages.ffmpeg + # Recommended dependencies + ocamlPackages.ffmpeg - # Optional dependencies - ocamlPackages.camlimages - ocamlPackages.gd4o - ocamlPackages.alsa - ocamlPackages.ao - ocamlPackages.bjack - ocamlPackages.cry - ocamlPackages.dssi - ocamlPackages.faad - ocamlPackages.fdkaac - ocamlPackages.flac - ocamlPackages.frei0r - ocamlPackages.gstreamer - ocamlPackages.inotify - ocamlPackages.ladspa - ocamlPackages.lame - ocamlPackages.lastfm - ocamlPackages.lilv - ocamlPackages.lo - ocamlPackages.mad - ocamlPackages.magic - ocamlPackages.ogg - ocamlPackages.opus - ocamlPackages.portaudio - ocamlPackages.pulseaudio - ocamlPackages.shine - ocamlPackages.samplerate - ocamlPackages.soundtouch - ocamlPackages.speex - ocamlPackages.srt - ocamlPackages.ssl - ocamlPackages.taglib - ocamlPackages.theora - ocamlPackages.vorbis - ocamlPackages.xmlplaylist - ocamlPackages.posix-time2 - ocamlPackages.tsdl - ocamlPackages.tsdl-image - ocamlPackages.tsdl-ttf + # Optional dependencies + ocamlPackages.camlimages + ocamlPackages.gd4o + ocamlPackages.alsa + ocamlPackages.ao + ocamlPackages.bjack + ocamlPackages.cry + ocamlPackages.dssi + ocamlPackages.faad + ocamlPackages.fdkaac + ocamlPackages.flac + ocamlPackages.frei0r + ocamlPackages.gstreamer + ocamlPackages.inotify + ocamlPackages.ladspa + ocamlPackages.lame + ocamlPackages.lastfm + ocamlPackages.lilv + ocamlPackages.lo + ocamlPackages.mad + ocamlPackages.magic + ocamlPackages.ogg + ocamlPackages.opus + ocamlPackages.portaudio + ocamlPackages.pulseaudio + ocamlPackages.shine + ocamlPackages.samplerate + ocamlPackages.soundtouch + ocamlPackages.speex + ocamlPackages.srt + ocamlPackages.ssl + ocamlPackages.taglib + ocamlPackages.theora + ocamlPackages.vorbis + ocamlPackages.xmlplaylist + ocamlPackages.posix-time2 + ocamlPackages.tsdl + ocamlPackages.tsdl-image + ocamlPackages.tsdl-ttf - # Undocumented dependencies - ocamlPackages.graphics - ocamlPackages.cohttp-lwt-unix - ]; + # Undocumented dependencies + ocamlPackages.graphics + ocamlPackages.cohttp-lwt-unix + ]; meta = with lib; { description = "Swiss-army knife for multimedia streaming"; diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 60af9b430a94..9de97fe52f48 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , substituteAll , pkgsi686Linux +, fetchpatch , dbus , meson , ninja @@ -103,6 +104,14 @@ in multiStdenv.mkDerivation rec { # Patch the chainloader to search for libyabridge through NIX_PROFILES ./libyabridge-from-nix-profiles.patch + + # Remove with next yabridge update + (fetchpatch { + name = "fix-for-wine-8.0.patch"; + url = "https://github.com/robbert-vdh/yabridge/commit/29acd40a9add635e2cb40ecc54c88d65604a7a2a.patch"; + sha256 = "sha256-hVxa/FqH7d938Z/VjHdhmYLCLPZoa9C4xKSKRKiVPSU="; + includes = [ "meson.build" ]; + }) ]; postPatch = '' diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index ab5ae59977de..03d4f70711be 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -28,10 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://bupstash.io"; license = licenses.mit; platforms = platforms.unix; - # = note: Undefined symbols for architecture x86_64: - # "_utimensat", referenced from: - # https://github.com/NixOS/nixpkgs/issues/101229 - broken = (stdenv.isDarwin && stdenv.isx86_64); maintainers = with maintainers; [ andrewchambers ]; }; } diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index eb54f08a3a26..f96ee77d9339 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable |