From 5b68c6533d18205bd9fc8774f58e92d47563a61a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 11:07:52 +0000 Subject: [PATCH 01/78] prox: 0.5.2 -> 1.1.0 --- pkgs/by-name/pr/prox/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/prox/package.nix b/pkgs/by-name/pr/prox/package.nix index ef7b588ea51f..17a1fe95aa3b 100644 --- a/pkgs/by-name/pr/prox/package.nix +++ b/pkgs/by-name/pr/prox/package.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "prox"; - # While upstream did release a v1.0.0, v0.5.2 is actually newer: https://github.com/fgrosse/prox/releases/tag/v0.5.2 - version = "0.5.2"; + # While upstream did release a v1.0.0, v1.1.0 is actually newer: https://github.com/fgrosse/prox/releases/tag/v1.1.0 + version = "1.1.0"; src = fetchFromGitHub { owner = "fgrosse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mqx8ICne0NnyW0N1Jeu+PJXWDBr12OASLxlePI6v6Bc="; + sha256 = "sha256-KSHTlcAmnuU8F17N0LBS0s5b/k6Of0OEHVd3v50bH3g="; }; - vendorHash = "sha256-4gZfEbyAzAzxtOR6FhP7eUSdln+fANn87+duCq1aq5A="; + vendorHash = "sha256-i4QJ84Tne1E8s2Fprd5xeWlTQBIb/9tvwws80yHXhbg="; postPatch = '' substituteInPlace cmd/prox/version.go \ From 70c79190d93afcbf9f2ec40417a45802a1015ee4 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Wed, 21 Aug 2024 02:08:58 +0200 Subject: [PATCH 02/78] flashprog: 1.1 -> 1.2 Signed-off-by: Felix Singer --- pkgs/by-name/fl/flashprog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index fe04a6586cd8..746ab572bb32 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprog"; - version = "1.1"; + version = "1.2"; src = fetchgit { url = "https://review.sourcearcade.org/flashprog"; rev = "v${finalAttrs.version}"; - hash = "sha256-CLwaGxVOo8FJaWfvrJ2hAm7XonP5nHT6YTsaw7scKCM="; + hash = "sha256-Z09hZ4a/G3DhWCmSkPyKs7ecSFBUfez7IWWxIhH3LyI="; }; nativeBuildInputs = [ From 5dfdb0956172c6a5fc3a3c44d8b949e7e8cccc17 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Wed, 21 Aug 2024 01:07:42 -0700 Subject: [PATCH 03/78] tree-wide: remove eelco as maintainer from things he no longer maintains While preparing this change, I read the git blame on all of the files I touched. I saw a working lifetime of building this system which we use every day and love dearly and keep maintained ourselves. I saw commits from a 14 year range between 2003 to 2017!! I could not be more thankful for Eelco's work on building large parts of the foundation of nixpkgs that all of us rely on now. However, the end date of that range of the files I looked at the blame on was 2017. I did not see surviving code from any newer date than that. Looking at the Git logs, Eelco has been working on other things, and that's totally fine. However, it means that our maintenance metadata is out of date on a lot of packages, and *that*'s the reason I am submitting this change. There are a lot of packages that don't have anyone with their name on them to be pinged if they need attention, even if they have had recent activity (although it is never clear if recent activity was just someone fixing it because ZHF or because the package actually matters to them). There are a lot of packages with storied history that maybe don't need to be in the set anymore at all since they have not been touched in years; or maybe they are simply finished. Empty maintainer lists should be a sign that we need to figure out who maintains it or potentially remove it if it has rotted, and allowing the maintainer list to be empty if it is already not maintained is part of a healthy repository ecology. Either way, I would like to have the maintenance metadata not mislead anyone into sending Eelco emails about packages he doesn't, in practice, work on anymore. I have not removed his name from everything; there are some things that he is the upstream for or has worked on more recently, for instance, like Nix, which I have left alone. --- pkgs/applications/audio/audacious/default.nix | 2 +- pkgs/applications/audio/spotify/linux.nix | 2 +- pkgs/applications/emulators/gens-gs/default.nix | 2 +- pkgs/applications/graphics/awesomebump/default.nix | 2 +- pkgs/applications/kde/ktorrent.nix | 2 +- pkgs/applications/kde/libktorrent.nix | 6 +++--- .../networking/mailreaders/sylpheed/default.nix | 2 +- .../networking/mailreaders/thunderbird/packages.nix | 2 +- pkgs/applications/networking/newsreaders/pan/default.nix | 2 +- pkgs/applications/science/math/cbc/default.nix | 2 +- pkgs/applications/version-management/mercurial/default.nix | 2 +- pkgs/applications/version-management/rcs/default.nix | 2 +- pkgs/applications/version-management/subversion/default.nix | 2 +- pkgs/applications/video/mplayer/default.nix | 2 +- pkgs/applications/virtualization/qemu/default.nix | 2 +- pkgs/by-name/fa/fail2ban/package.nix | 2 +- pkgs/by-name/he/hello/package.nix | 2 +- pkgs/by-name/le/less/package.nix | 2 +- pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix | 2 +- pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 2 +- pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix | 2 +- pkgs/development/interpreters/perl/interpreter.nix | 2 +- pkgs/development/interpreters/rascal/default.nix | 2 +- pkgs/development/libraries/apr-util/default.nix | 2 +- pkgs/development/libraries/apr/default.nix | 2 +- pkgs/development/libraries/aws-c-common/default.nix | 2 +- pkgs/development/libraries/aws-c-event-stream/default.nix | 2 +- pkgs/development/libraries/aws-checksums/default.nix | 2 +- pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 +- pkgs/development/libraries/gdk-pixbuf/default.nix | 2 +- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/harfbuzz/default.nix | 2 +- pkgs/development/libraries/libgudev/default.nix | 2 +- pkgs/development/libraries/libmicrohttpd/generic.nix | 2 +- pkgs/development/libraries/libpqxx/6.nix | 2 +- pkgs/development/libraries/libpqxx/default.nix | 2 +- pkgs/development/libraries/libxml2/default.nix | 2 +- pkgs/development/libraries/libxslt/default.nix | 2 +- pkgs/development/libraries/opencollada/default.nix | 2 +- pkgs/development/libraries/opensubdiv/default.nix | 2 +- pkgs/development/libraries/sqlite/default.nix | 2 +- .../development/tools/build-managers/apache-ant/default.nix | 2 +- pkgs/development/tools/misc/elfutils/default.nix | 2 +- pkgs/development/tools/misc/patchelf/default.nix | 2 +- pkgs/development/tools/misc/patchelf/unstable.nix | 4 ++-- pkgs/games/exult/default.nix | 2 +- pkgs/games/keen4/default.nix | 2 +- pkgs/games/quake3/ioquake/default.nix | 2 +- pkgs/games/rogue/default.nix | 2 +- pkgs/os-specific/linux/ena/default.nix | 1 - pkgs/os-specific/linux/iproute/default.nix | 2 +- pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix | 2 +- pkgs/os-specific/linux/perf-tools/default.nix | 2 +- pkgs/os-specific/linux/smem/default.nix | 2 +- pkgs/os-specific/linux/sysstat/default.nix | 2 +- pkgs/servers/gpm/default.nix | 2 +- pkgs/servers/minio/default.nix | 2 +- pkgs/servers/minio/legacy_fs.nix | 2 +- pkgs/tools/X11/xdg-utils/default.nix | 2 +- pkgs/tools/filesystems/9pfs/default.nix | 2 +- pkgs/tools/filesystems/aefs/default.nix | 2 +- pkgs/tools/filesystems/e2fsprogs/default.nix | 2 +- pkgs/tools/graphics/nifskope/default.nix | 2 +- pkgs/tools/networking/dhcpcd/default.nix | 2 +- pkgs/tools/networking/dnsmasq/default.nix | 2 +- pkgs/tools/networking/minio-client/default.nix | 2 +- pkgs/tools/networking/ndisc6/default.nix | 2 +- pkgs/tools/networking/ntp/default.nix | 2 +- pkgs/tools/networking/openresolv/default.nix | 2 +- pkgs/tools/networking/openssh/common.nix | 2 +- pkgs/tools/networking/socat/default.nix | 2 +- pkgs/tools/package-management/checkinstall/default.nix | 2 +- pkgs/tools/system/testdisk/default.nix | 2 +- pkgs/tools/text/wdiff/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 6 +++--- 75 files changed, 79 insertions(+), 80 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 4069b541eb17..cfb296ccff60 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://audacious-media-player.org"; downloadPage = "https://github.com/audacious-media-player/audacious"; mainProgram = "audacious"; - maintainers = with lib.maintainers; [ eelco ramkromberg ttuegel thiagokokada ]; + maintainers = with lib.maintainers; [ ramkromberg ttuegel thiagokokada ]; platforms = lib.platforms.linux; license = with lib.licenses; [ bsd2 diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 5ca8e481fa2d..1f0ef0760112 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -184,6 +184,6 @@ stdenv.mkDerivation { ''; meta = meta // { - maintainers = with lib.maintainers; [ eelco ftrvxmtrx sheenobu timokau ma27 ]; + maintainers = with lib.maintainers; [ ftrvxmtrx sheenobu timokau ma27 ]; }; } diff --git a/pkgs/applications/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix index 9699d24be6a7..7665d324971a 100644 --- a/pkgs/applications/emulators/gens-gs/default.nix +++ b/pkgs/applications/emulators/gens-gs/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; license = licenses.gpl2Plus; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index 8f5b4c0c659c..a096a14ec4f7 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -57,7 +57,7 @@ in mkDerivation { homepage = "https://github.com/kmkolasinski/AwesomeBump"; description = "Program to generate normal, height, specular or ambient occlusion textures from a single image"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "AwesomeBump"; }; diff --git a/pkgs/applications/kde/ktorrent.nix b/pkgs/applications/kde/ktorrent.nix index f63865d30303..b33cc3bc541b 100644 --- a/pkgs/applications/kde/ktorrent.nix +++ b/pkgs/applications/kde/ktorrent.nix @@ -11,7 +11,7 @@ mkDerivation { description = "KDE integrated BtTorrent client"; homepage = "https://apps.kde.org/ktorrent/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/libktorrent.nix b/pkgs/applications/kde/libktorrent.nix index 20975c7eb0ee..63732bb8dcdf 100644 --- a/pkgs/applications/kde/libktorrent.nix +++ b/pkgs/applications/kde/libktorrent.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, karchive, kcrash, ki18n, kio, libgcrypt, qca-qt5, solid, boost, gmp @@ -7,10 +7,10 @@ mkDerivation { pname = "libktorrent"; - meta = with lib; { + meta = { description = "BitTorrent library used by KTorrent"; homepage = "https://apps.kde.org/ktorrent/"; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index d45c7f6dd575..48d14d78d8e1 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; mainProgram = "sylpheed"; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index ec18ec2bfb3e..85ff6c8e5087 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -21,7 +21,7 @@ let description = "Full-featured e-mail client"; homepage = "https://thunderbird.net/"; mainProgram = "thunderbird"; - maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; + maintainers = with maintainers; [ lovesegfault pierron vcunat ]; platforms = platforms.unix; badPlatforms = platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 1f01b52ee650..0d1a2dea7d6a 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "GTK-based Usenet newsreader good at both text and binaries"; mainProgram = "pan"; homepage = "http://pan.rebelbase.com/"; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; platforms = platforms.linux; license = with licenses; [ gpl2Only fdl11Only ]; }; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index aa979a78cb48..dbe7b6d241ab 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://projects.coin-or.org/Cbc"; license = lib.licenses.epl10; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; description = "Mixed integer programming solver"; }; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index e6f08bc6dea0..466cc643c39f 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -92,7 +92,7 @@ let downloadPage = "https://www.mercurial-scm.org/release/"; changelog = "https://wiki.mercurial-scm.org/Release${versions.majorMinor version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco lukegb pacien techknowlogick ]; + maintainers = with maintainers; [ lukegb pacien techknowlogick ]; platforms = platforms.unix; mainProgram = "hg"; }; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 40d909c8e028..b838eb6f74f9 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ eelco ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index d2301db3df2e..72f21fd8e2a3 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -115,7 +115,7 @@ let license = licenses.asl20; homepage = "https://subversion.apache.org/"; mainProgram = "svn"; - maintainers = with maintainers; [ eelco lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 6b546b5111eb..41a7279cf47e 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -200,7 +200,7 @@ stdenv.mkDerivation rec { description = "Movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = licenses.gpl2Only; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0edba1c5f008..b722405908f8 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -296,7 +296,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.qemu.org/"; description = "Generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco qyliss ]; + maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; } # toolsOnly: Does not have qemu-kvm and there's no main support tool diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix index 6425f814f2d5..20f89c501dde 100644 --- a/pkgs/by-name/fa/fail2ban/package.nix +++ b/pkgs/by-name/fa/fail2ban/package.nix @@ -94,6 +94,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://www.fail2ban.org/"; description = "Program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index 7b8db4c7c3c2..487bc033a23f 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/hello/manual/"; changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}"; license = licenses.gpl3Plus; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; mainProgram = "hello"; platforms = platforms.all; }; diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index da6fa7c3ec11..7a06851b01c1 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://www.greenwoodsoftware.com/less/news.${finalAttrs.version}.html"; license = lib.licenses.gpl3Plus; mainProgram = "less"; - maintainers = with lib.maintainers; [ eelco dtzWill ]; + maintainers = with lib.maintainers; [ dtzWill ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index 68bc6101d03c..89439f0b8e08 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation"; homepage = "https://docbook.org/xml/5.0/"; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 66ebf105ffd0..8798d11fb0cd 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -70,7 +70,7 @@ let homepage = "https://github.com/docbook/wiki/wiki/DocBookXslStylesheets"; description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.all; }; }; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix index 23ad1069fb74..2e0b23f5c848 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { description = "Icons for Xfce"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ eelco ] ++ teams.xfce.members; + maintainers = teams.xfce.members; }; } diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index ff95ac83a301..2afdcded3db4 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -235,7 +235,7 @@ stdenv.mkDerivation (rec { homepage = "https://www.perl.org/"; description = "Standard implementation of the Perl 5 programming language"; license = licenses.artistic1; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; platforms = platforms.all; priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` mainProgram = "perl"; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 50bfb7e54d63..2ddebe96e8a7 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mainProgram = "rascal"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.epl10; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 68205d83a42d..9490ff1fb6a3 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { homepage = "https://apr.apache.org/"; description = "Companion library to APR, the Apache Portable Runtime"; mainProgram = "apu-1-config"; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 11bdd53945d0..8e9b8fb88d66 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { mainProgram = "apr-1-config"; platforms = platforms.all; license = licenses.asl20; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index f6d5050be3ba..d600b1395d76 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/awslabs/aws-c-common"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ orivej eelco r-burns ]; + maintainers = with maintainers; [ orivej r-burns ]; }; } diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index 8f469d93054a..a405e7657789 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/awslabs/aws-c-event-stream"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ orivej eelco ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 41da5e247e94..f0a9a0cf665f 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/awslabs/aws-checksums"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ orivej eelco ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index ded3948907c2..631c5a90faf5 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aws/aws-sdk-cpp"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ eelco orivej ]; + maintainers = with maintainers; [ orivej ]; # building ec2 runs out of memory: cc1plus: out of memory allocating 33554372 bytes after a total of 74424320 bytes broken = stdenv.buildPlatform.is32bit && ((builtins.elem "ec2" apis) || (builtins.elem "*" apis)); }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 9260f8fc1e2c..59760504f98e 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -156,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; license = licenses.lgpl21Plus; - maintainers = [ maintainers.eelco ] ++ teams.gnome.members; + maintainers = teams.gnome.members; mainProgram = "gdk-pixbuf-thumbnailer"; pkgConfigModules = [ "gdk-pixbuf-2.0" ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 382a1eea076d..be55dd89b7c6 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -294,7 +294,7 @@ stdenv.mkDerivation ({ license = licenses.lgpl2Plus; - maintainers = with maintainers; [ eelco ma27 connorbaker ]; + maintainers = with maintainers; [ ma27 connorbaker ]; platforms = platforms.linux; } // (args.meta or {}); }) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 3c0e4668781e..12297a5da669 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { description = "OpenType text shaping engine"; homepage = "https://harfbuzz.github.io/"; changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS"; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index d3d3ae043e04..dcd2015e1d15 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library that provides GObject bindings for libudev"; homepage = "https://gitlab.gnome.org/GNOME/libgudev"; - maintainers = [ maintainers.eelco ] ++ teams.gnome.members; + maintainers = teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix index 9427febbb620..45736cea1e95 100644 --- a/pkgs/development/libraries/libmicrohttpd/generic.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/libmicrohttpd/"; - maintainers = with maintainers; [ eelco fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; } // meta; }) diff --git a/pkgs/development/libraries/libpqxx/6.nix b/pkgs/development/libraries/libpqxx/6.nix index ff394526ea20..612a6c204482 100644 --- a/pkgs/development/libraries/libpqxx/6.nix +++ b/pkgs/development/libraries/libpqxx/6.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 13fecb9b56bf..842be540a67f 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 522283b7226c..82176e4fab89 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { description = "XML parsing library for C"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ eelco jtojnar ]; + maintainers = with maintainers; [ jtojnar ]; pkgConfigModules = [ "libxml-2.0" ]; }; }) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 10ee52a027a3..f86c6068e2da 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C library and tools to do XSL transformations"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ eelco jtojnar ]; + maintainers = with maintainers; [ jtojnar ]; broken = pythonSupport && !libxml2.pythonSupport; # see #73102 for why this is not an assert }; }) diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index bee15715fcfc..6ecb76c0eed7 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling the COLLADA file format"; homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.mit; }; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 0cf848ac44b7..b5c2847fb9ba 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "http://graphics.pixar.com/opensubdiv"; broken = openclSupport && cudaSupport; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 27b2e4c993fd..dd4e15ea566f 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { homepage = "https://www.sqlite.org/"; license = licenses.publicDomain; mainProgram = "sqlite3"; - maintainers = with maintainers; [ eelco np ]; + maintainers = with maintainers; [ np ]; platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ "sqlite3" ]; }; diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 17f750a9450c..5e00d302ac4c 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 9f5a4bfa3a47..78c88f3420e9 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -107,6 +107,6 @@ stdenv.mkDerivation rec { # licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins, # but since this package isn't split that way, all three are listed. license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ]; - maintainers = with maintainers; [ eelco r-burns ]; + maintainers = with maintainers; [ r-burns ]; }; } diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 9af2265b8a7e..d079f08a294a 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; description = "Small utility to modify the dynamic linker and RPATH of ELF executables"; mainProgram = "patchelf"; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index cf1f713848e9..951493b84395 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,6 +1,6 @@ { lib, stdenv, autoreconfHook, fetchFromGitHub, unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "patchelf"; version = "0.18.0-unstable-2024-06-15"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; description = "Small utility to modify the dynamic linker and RPATH of ELF executables"; mainProgram = "patchelf"; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index eddb96f301da..ab09e4efed40 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://exult.info"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ azahi eelco ]; + maintainers = with maintainers; [ azahi ]; }; } diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index 5e2468a8f9ea..348f2bf8e671 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation { meta = { description = "Commander Keen Episode 4: Secret of the Oracle"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 6340ea8c82f9..b21a65f3933e 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { description = "Fast-paced 3D first-person shooter, a community effort to continue supporting/developing id's Quake III Arena"; license = lib.licenses.gpl2Plus; mainProgram = "ioquake3"; - maintainers = with lib.maintainers; [ abbradar drupol eelco rvolosatovs ]; + maintainers = with lib.maintainers; [ abbradar drupol rvolosatovs ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 13ee9400cfff..886450869f33 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { mainProgram = "rogue"; platforms = platforms.all; license = licenses.bsd3; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 4b0af2879144..90167977cf5c 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/amzn/amzn-drivers"; license = licenses.gpl2Only; maintainers = with maintainers; [ - eelco sielicki arianvp ]; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index d14b6210f257..35e1dfb7fc33 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "Collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = platforms.linux; license = licenses.gpl2Only; - maintainers = with maintainers; [ primeos eelco fpletz globin ]; + maintainers = with maintainers; [ primeos fpletz globin ]; }; } diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 656a3e62caca..eca49afa63fe 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/jbeverly/pam_ssh_agent_auth"; description = "PAM module for authentication through the SSH agent"; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index 8c3e31e45384..c4b8cceb5855 100644 --- a/pkgs/os-specific/linux/perf-tools/default.nix +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { platforms = platforms.linux; homepage = "https://github.com/brendangregg/perf-tools"; description = "Performance analysis tools based on Linux perf_events (aka perf) and ftrace"; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index bfeb5902a423..cd8633303c8b 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://www.selenic.com/smem/"; description = "Memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 67e077049078..2a5112e9fdd0 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "Collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index a9c67f7a1195..245f26434cef 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { description = "Daemon that provides mouse support on the Linux console"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.cygwin; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 3d0879cecba9..3ffa0278d637 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -55,7 +55,7 @@ buildGoModule rec { homepage = "https://www.minio.io/"; description = "S3-compatible object storage server"; changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; - maintainers = with maintainers; [ eelco bachp ]; + maintainers = with maintainers; [ bachp ]; license = licenses.agpl3Plus; mainProgram = "minio"; }; diff --git a/pkgs/servers/minio/legacy_fs.nix b/pkgs/servers/minio/legacy_fs.nix index 345d39630349..2ba0f26ed424 100644 --- a/pkgs/servers/minio/legacy_fs.nix +++ b/pkgs/servers/minio/legacy_fs.nix @@ -45,7 +45,7 @@ buildGoModule rec { description = "S3-compatible object storage server"; mainProgram = "minio"; changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; - maintainers = with maintainers; [ eelco bachp ]; + maintainers = with maintainers; [ bachp ]; license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 28360b17527c..9d3274195977 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -306,7 +306,7 @@ stdenv.mkDerivation (self: { homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "Set of command line tools that assist applications with a variety of desktop integration tasks"; license = if mimiSupport then licenses.gpl2Only else licenses.mit; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; platforms = platforms.all; }; }) diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index 51238e97f42a..c13d3d3cfc42 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ftrvxmtrx/9pfs"; description = "FUSE-based client of the 9P network filesystem protocol"; mainProgram = "9pfs"; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = with lib.licenses; [ lpl-102 bsd2 ]; }; diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index 039a0a52b5bf..af4e20ac55ee 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/edolstra/aefs"; description = "Cryptographic filesystem implemented in userspace using FUSE"; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; broken = stdenv.isDarwin; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 1ed100a3fe6b..b8443e8ac880 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { mit # lib/et, lib/ss ]; platforms = platforms.unix; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index fdc05cbff04d..3d9d89af0c96 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://niftools.sourceforge.net/wiki/NifSkope"; description = "Tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; platforms = platforms.linux; license = licenses.bsd3; mainProgram = "NifSkope"; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 077d2f416438..6221034dc285 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://roy.marples.name/projects/dhcpcd"; platforms = platforms.linux ++ platforms.freebsd; license = licenses.bsd2; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; mainProgram = "dhcpcd"; }; } diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 2b0a6bfc8726..5c6d90b00a98 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -93,6 +93,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; mainProgram = "dnsmasq"; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ eelco fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index e9168218f8a1..76df35e780ce 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/minio/mc"; description = "Replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; - maintainers = with maintainers; [ bachp eelco ]; + maintainers = with maintainers; [ bachp ]; mainProgram = "mc"; license = licenses.asl20; }; diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 6463c1e94ddb..e4df6551184b 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.remlab.net/ndisc6/"; description = "Small collection of useful tools for IPv6 networking"; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; platforms = platforms.linux; license = licenses.gpl2Only; }; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index b984d6aa0b74..1ba389e38c02 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # very close to isc and bsd2 url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"; }; - maintainers = with maintainers; [ eelco thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 3b4f65278d40..a8fc33df2fcc 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mainProgram = "resolvconf"; homepage = "https://roy.marples.name/projects/openresolv"; license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; } diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 17e228b041f3..48d387347b24 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://www.openssh.com/releasenotes.html"; license = licenses.bsd2; platforms = platforms.unix ++ platforms.windows; - maintainers = (extraMeta.maintainers or []) ++ (with maintainers; [ eelco aneeshusa ]); + maintainers = (extraMeta.maintainers or []) ++ (with maintainers; [ aneeshusa ]); mainProgram = "ssh"; } // extraMeta; }) diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 58d33bc886f5..138f8f7489a1 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "http://www.dest-unreach.org/socat/"; platforms = platforms.unix; license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; mainProgram = "socat"; }; } diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 424831daad97..875b757d1fbd 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://checkinstall.izto.org/"; description = "Tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; knownVulnerabilities = [ diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index 9fe76c59052f..e4d24802a54f 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -68,6 +68,6 @@ assert enableQt -> qwt != null; ''; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; - maintainers = with maintainers; [ fgaz eelco ]; + maintainers = with maintainers; [ fgaz ]; }; } diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index d358dcdd0c4e..767e02059a5d 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Comparing files on a word by word basis"; mainProgram = "wdiff"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ eelco SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c38a20517317..13d5924ab25f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1022,7 +1022,7 @@ with self; { description = "Simple Statistics"; homepage = "https://github.com/nferraz/st"; license = with lib.licenses; [ mit ]; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; mainProgram = "st"; }; }; @@ -17039,7 +17039,7 @@ with self; { description = "Postmodern object system for Perl 5"; homepage = "http://moose.perl.org"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; mainProgram = "moose-outdated"; }; }; @@ -24121,7 +24121,7 @@ with self; { meta = { description = "Perl Template Toolkit Plugin for IO::All"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; }; }; From 699c320171c1f0b34dff44ba8b83e617b8b48603 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 4 Aug 2024 13:54:04 +0100 Subject: [PATCH 04/78] libsndfile: enable on all platforms This builds fine with `pkgsCross.mingwW64`. --- pkgs/development/libraries/libsndfile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 0e1dfb0bc08b..a1ffdae6bb33 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/libsndfile/libsndfile/releases/tag/${version}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.all; longDescription = '' Libsndfile is a C library for reading and writing files containing From 2543d1581728b37c4f35e2dfef1c7ecf2a68fb5a Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 4 Aug 2024 13:54:04 +0100 Subject: [PATCH 05/78] libsamplerate: mark broken on MinGW This should work in principle, but fails in practice. --- pkgs/development/libraries/libsamplerate/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index bebe6c591ba4..45cd9d091dd0 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -32,5 +32,7 @@ in stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; + # Linker is unhappy with the `.def` file. + broken = stdenv.hostPlatform.isMinGW; }; } From d7988eb8266e0d3020c37bd9b7e3435075ef22c2 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 3 Aug 2024 16:10:45 +0100 Subject: [PATCH 06/78] libresample: move to `pkgs/by-name` --- .../default.nix => by-name/li/libresample/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libresample/default.nix => by-name/li/libresample/package.nix} (100%) diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/by-name/li/libresample/package.nix similarity index 100% rename from pkgs/development/libraries/libresample/default.nix rename to pkgs/by-name/li/libresample/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a529941abd26..5279a511f82b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22031,8 +22031,6 @@ with pkgs; python = python3; }; - libresample = callPackage ../development/libraries/libresample { }; - librevenge = callPackage ../development/libraries/librevenge { }; librime = callPackage ../development/libraries/librime { }; From 1e0e30ab0ba3779033115ac34893e543e363beda Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 3 Aug 2024 16:11:27 +0100 Subject: [PATCH 07/78] libresample: format with `nixfmt-rfc-style` --- pkgs/by-name/li/libresample/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libresample/package.nix b/pkgs/by-name/li/libresample/package.nix index 6ca1d09ef202..56c4a4445848 100644 --- a/pkgs/by-name/li/libresample/package.nix +++ b/pkgs/by-name/li/libresample/package.nix @@ -1,4 +1,9 @@ -{lib, stdenv, fetchurl, cmake}: +{ + lib, + stdenv, + fetchurl, + cmake, +}: let patch = fetchurl { From 7ca429f26f93fff0b2387ac30707f0bbccdd1a80 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 21 Aug 2024 17:57:50 +0100 Subject: [PATCH 08/78] libresample: add myself to maintainers --- pkgs/by-name/li/libresample/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libresample/package.nix b/pkgs/by-name/li/libresample/package.nix index 56c4a4445848..44daf41d2645 100644 --- a/pkgs/by-name/li/libresample/package.nix +++ b/pkgs/by-name/li/libresample/package.nix @@ -28,7 +28,10 @@ stdenv.mkDerivation rec { description = "Real-time library for sampling rate conversion library"; license = lib.licenses.lgpl2Plus; homepage = "https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ + lib.maintainers.sander + lib.maintainers.emily + ]; platforms = lib.platforms.unix; }; } From cb52b4198c518a2fef04f4531c2b0f48e5f8e8cc Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 25 Aug 2024 01:09:38 +0200 Subject: [PATCH 09/78] nanopb: fix build by resolving name collision --- pkgs/by-name/na/nanopb/generator-out.nix | 34 ++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/na/nanopb/generator-out.nix b/pkgs/by-name/na/nanopb/generator-out.nix index a9e179d90298..62cd4fd6464c 100644 --- a/pkgs/by-name/na/nanopb/generator-out.nix +++ b/pkgs/by-name/na/nanopb/generator-out.nix @@ -1,11 +1,13 @@ -{ stdenv -, cmake -, python3 -, writeTextFile -, protobuf -, src -, version +{ + stdenv, + cmake, + python3, + writeTextFile, + protobuf, + src, + version, }: + let pyproject_toml = writeTextFile { name = "pyproject.toml"; @@ -38,22 +40,26 @@ stdenv.mkDerivation { pname = "nanopb-generator-out"; inherit src version; - nativeBuildInputs = [ cmake protobuf python3 ]; + nativeBuildInputs = [ + cmake + protobuf + ]; + + # don't let `find_program` find the bundled `protoc` script, so it will use the system `protoc` instead + preConfigure = '' + rm generator/protoc + ''; cmakeFlags = [ "-Dnanopb_BUILD_RUNTIME=OFF" "-Dnanopb_BUILD_GENERATOR=ON" - "-Dnanopb_PYTHON_INSTDIR_OVERRIDE=$out/lib/python/site-packages" + "-Dnanopb_PYTHON_INSTDIR_OVERRIDE=${placeholder "out"}/${python3.sitePackages}" ]; - preConfigure = '' - cmakeFlags+=" -Dnanopb_PYTHON_INSTDIR_OVERRIDE=$out/lib/python/site-packages" - ''; - postInstall = '' rm -rf $out/include rm -rf $out/lib/cmake - ln -s $out/lib/python/site-packages $out/src + ln -s $out/${python3.sitePackages} $out/src ln -s ${pyproject_toml} $out/pyproject.toml ''; } From aa28ddcbe8279dad0d9c663a3e476e6f50346aae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 00:58:47 +0000 Subject: [PATCH 10/78] gtree: 1.10.10 -> 1.10.11 --- pkgs/tools/text/gtree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index e9710ae7a654..e02eb363a17d 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.10.10"; + version = "1.10.11"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-sljqO1aYVD7l3ngAeShqzAXKSannBHY7Cx19Kf1xPa0="; + hash = "sha256-wxN4bvSSeCTPGjIIDLotr0XsiCf0u0GochEo1SPyopM="; }; - vendorHash = "sha256-yxbnASN3vUpRdsxfVsN/zigfpPJKcJaLfFBTtUUW2t0="; + vendorHash = "sha256-s3GsqrXd84VVGuxY18ielAt0BZGMyl1tNavlD66rWoA="; subPackages = [ "cmd/gtree" From f9b1c688e58bc6f70cea4d9fb63696b6322db69c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 03:15:15 +0000 Subject: [PATCH 11/78] graphite-cli: 1.4.2 -> 1.4.3 --- pkgs/by-name/gr/graphite-cli/package-lock.json | 4 ++-- pkgs/by-name/gr/graphite-cli/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index c5cc597f3985..dc5a8f42f57a 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.4.2", + "version": "1.4.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.4.2", + "version": "1.4.3", "hasInstallScript": true, "license": "None", "dependencies": { diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index a20561199e5e..1692badcca6e 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-bh5BSpzmxSMgr1wKOCrOTQSpsSdgaVtBcw9jiE4IzI8="; + hash = "sha256-ITROAsDlkNJx5z1DN41Y3kOQzlm2CmciPVn9IrtjCQc="; }; - npmDepsHash = "sha256-gluPxs1NPVjv5K64FtED7b4zWmOXufVquuBHqz1JUzU="; + npmDepsHash = "sha256-G2J0yu/loihlrgGSMEJmVK496bVwJehLwYAPh0f8UbM="; postPatch = '' ln -s ${./package-lock.json} package-lock.json From b2a6a86d33748d3718b8eeabfe7f2c4994d69c88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 07:23:49 +0000 Subject: [PATCH 12/78] koboldcpp: 1.73 -> 1.73.1 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index c99fce56a214..124cdbebd470 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -53,13 +53,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.73"; + version = "1.73.1"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-S0MonY2rIAkbJnTaDVc2YiGPjOaevgp82mt6JwWdN1U="; + hash = "sha256-LRXtmQ5u+/vgcU6YC9IN2CazfDtg5+jZnJV2o9jEAaY="; }; enableParallelBuilding = true; From af75da344479a36d1a99ac60641d02bfb74935dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 07:54:18 +0000 Subject: [PATCH 13/78] powerpipe: 0.4.2 -> 0.4.3 --- pkgs/by-name/po/powerpipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/powerpipe/package.nix b/pkgs/by-name/po/powerpipe/package.nix index 352b8b6ddd60..8fd2003f0354 100644 --- a/pkgs/by-name/po/powerpipe/package.nix +++ b/pkgs/by-name/po/powerpipe/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "powerpipe"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "turbot"; repo = "powerpipe"; rev = "refs/tags/v${version}"; - hash = "sha256-wZav0MKnXEcIaO4WttCRJ+0sTabJeHHxL0vyb8qi4w8="; + hash = "sha256-WrjdxLlDvC+rq3bJ0U8pqSJvfqH9Y54BOoWUfb5pMho="; }; - vendorHash = "sha256-2n1fImOLk1KIr2rqvbiw/Ze2LPeNlqaQ7mAdUuS/KQM="; + vendorHash = "sha256-zBwk03aEjWs+CfbIZh0g7absKc5+SNLTVhrctuTpjMk="; proxyVendor = true; nativeBuildInputs = [ From 6f750af5940adf74a499cf8f0718f8c06e876f67 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:09:48 +0200 Subject: [PATCH 14/78] tomcat9: 9.0.91 -> 9.0.93 https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.93_(remm) --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index c05e62f50c3a..f883f3d3e58a 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -59,8 +59,8 @@ let in { tomcat9 = common { - version = "9.0.91"; - hash = "sha256-DFspyh06Mbu4+ratH+7Yo3Au0yXRSDlVCmd0x2yQuFY="; + version = "9.0.93"; + hash = "sha256-aeDzU+p9hQBPneN5wepo5XdSh/4uCFnFYIHghcGykiY="; }; tomcat10 = common { From 60e9c9d7e6c0905adfe7f50bf11a6260ae6f3998 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Sun, 25 Aug 2024 12:46:26 +0200 Subject: [PATCH 15/78] vmware-workstation: Use current gdbm Does not seem to cause any issues and fixes the build. --- .../vmware-workstation/default.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 83d2361a9990..e4d5673305f0 100644 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -79,20 +79,6 @@ let sha256 = "sha256-JSEW1gqQuLGRkathlwZU/TnG6dL/xWKW4//SfE+kO0A="; }; - gdbm3 = gdbm.overrideAttrs (old: rec { - version = "1.8.3"; - - src = fetchurl { - url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz"; - sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck="; - }; - - installPhase = '' - mkdir -p $out/lib - cp .libs/libgdbm*.so* $out/lib/ - ''; - }); - vmware-unpack-env = buildFHSEnv rec { name = "vmware-unpack-env"; targetPkgs = pkgs: [ zlib ]; @@ -114,7 +100,7 @@ stdenv.mkDerivation rec { libxslt libxml2 libuuid - gdbm3 + gdbm readline xz cups From c9b5a624015e902cc70ecb72095722aec4994911 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Aug 2024 14:56:45 +0200 Subject: [PATCH 16/78] slumber: 1.5.0 -> 1.8.1 Diff: https://github.com/LucasPickering/slumber/compare/refs/tags/v1.5.0...v1.8.1 Changelog: https://github.com/LucasPickering/slumber/blob/v1.8.1/CHANGELOG.md --- pkgs/by-name/sl/slumber/package.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index b992ffe48c1f..5c52ad9ad484 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -1,28 +1,30 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin -, +{ + lib, + stdenv, + darwin, + fetchFromGitHub, + rustPlatform, }: + rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "1.5.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; - rev = "v${version}"; - hash = "sha256-7JXkyRhoSjGYhse+2/v3Ndogar10K4N3ZUZNGpMiQ/A="; + rev = "refs/tags/v${version}"; + hash = "sha256-u+IONDK3X+4kPmW9YXa0qQbAezBD+UADnlNEH1coKNE="; }; - cargoHash = "sha256-wZcnaT8EjbdSX6Y/UNS7v9/hQ9ISxkyRwRqRotXPCWU="; + cargoHash = "sha256-V/wPzEoUppLu8E5/SbBT4sPftz/SIg4s00/AHQL9R+o="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; meta = with lib; { description = "Terminal-based HTTP/REST client"; homepage = "https://slumber.lucaspickering.me"; + changelog = "https://github.com/LucasPickering/slumber/blob/v${version}/CHANGELOG.md"; license = licenses.mit; mainProgram = "slumber"; maintainers = with maintainers; [ javaes ]; From 83df8cead3521bb8d4986ccac780c525097d2ac8 Mon Sep 17 00:00:00 2001 From: Vri Date: Sun, 25 Aug 2024 13:41:17 +0200 Subject: [PATCH 17/78] maintainer: add vrifox --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 25802a260cff..58a487d7a603 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21911,6 +21911,14 @@ githubId = 230381; name = "Daniel Nilsson"; }; + vrifox = { + email = "vrifox@vrifox.cc"; + github = "vrifox"; + githubId = 109021367; + keys = [ { fingerprint = "413C 73F0 C5BD 6318 826A 42D9 D400 98E5 B60B 2197"; } ]; + matrix = "@vri:cozy.town"; + name = "Vri"; + }; vrinek = { email = "vrinek@hey.com"; github = "vrinek"; From 0b1f19f48571e64ac4fc5a4426c00e6dbafa4887 Mon Sep 17 00:00:00 2001 From: Vri Date: Sun, 25 Aug 2024 13:44:01 +0200 Subject: [PATCH 18/78] netbird: 0.28.8 -> 0.28.9 --- pkgs/tools/networking/netbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index e33c43e806a2..c4bce67ff89d 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.28.8"; + version = "0.28.9"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; rev = "v${version}"; - hash = "sha256-DfY8CVBHgE/kLALKNzSgmUxM0flWLesU0XAgVsHHLKc="; + hash = "sha256-SM288I+N645vzGmLO5hfDeFDqSJOe11+0VZVPneagHw="; }; - vendorHash = "sha256-CqknRMijAkWRLXCcIjRBX2wB64+RivD/mXq28TqzNjg="; + vendorHash = "sha256-UlxylKiszgB2XQ4bZI23/YY/RsFCE7OlHT3DBsRhvCk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; @@ -110,7 +110,7 @@ buildGoModule rec { changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}"; description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; license = licenses.bsd3; - maintainers = with maintainers; [ misuzu ]; + maintainers = with maintainers; [ misuzu vrifox ]; mainProgram = "netbird"; }; } From 7960c509932432fdff7200d46ab68f5fa0772152 Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 25 Aug 2024 22:08:40 +0800 Subject: [PATCH 19/78] dippi: move to by-name --- .../graphics/dippi/default.nix => by-name/di/dippi/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/graphics/dippi/default.nix => by-name/di/dippi/package.nix} (100%) diff --git a/pkgs/tools/graphics/dippi/default.nix b/pkgs/by-name/di/dippi/package.nix similarity index 100% rename from pkgs/tools/graphics/dippi/default.nix rename to pkgs/by-name/di/dippi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff352964cc01..8b4e5c150ddb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -905,8 +905,6 @@ with pkgs; umoci = callPackage ../applications/virtualization/umoci { }; - dippi = callPackage ../tools/graphics/dippi { }; - diswall = callPackage ../applications/networking/diswall { }; dupeguru = callPackage ../applications/misc/dupeguru { From 3366d35db00602e310e25b74aa8c2b7fa75bd1a8 Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 25 Aug 2024 22:14:12 +0800 Subject: [PATCH 20/78] dippi: 4.0.6 -> 4.1.0 --- pkgs/by-name/di/dippi/package.nix | 54 ++++++++++++------------------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/di/dippi/package.nix b/pkgs/by-name/di/dippi/package.nix index 1a094c2750e2..14865ba980ec 100644 --- a/pkgs/by-name/di/dippi/package.nix +++ b/pkgs/by-name/di/dippi/package.nix @@ -1,29 +1,28 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, python3 -, vala -, glib -, gtk3 -, gtk4 -, libadwaita -, wrapGAppsHook4 -, appstream-glib -, desktop-file-utils +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + glib, + gtk4, + libadwaita, + wrapGAppsHook4, + appstream-glib, + desktop-file-utils, }: stdenv.mkDerivation rec { pname = "dippi"; - version = "4.0.6"; + version = "4.1.0"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "dippi"; rev = version; - hash = "sha256-oZy8WfaAPABZRm8dm4zpI4v9RwT46F6WL6Wj767FcZg="; + hash = "sha256-BYI3WqMDxzERlqtq7ISQ+U1FTrpKh5OJBMo/AsdmdlQ="; }; nativeBuildInputs = [ @@ -34,10 +33,6 @@ stdenv.mkDerivation rec { wrapGAppsHook4 appstream-glib desktop-file-utils - # For post_install.py - python3 - glib - gtk3 ]; buildInputs = [ @@ -46,19 +41,12 @@ stdenv.mkDerivation rec { libadwaita ]; - postPatch = '' - patchShebangs build-aux/meson/post_install.py - ''; - - postInstall = '' - ln -s $out/bin/com.github.cassidyjames.dippi $out/bin/dippi - ''; - - meta = with lib; { + meta = { description = "Calculate display info like DPI and aspect ratio"; homepage = "https://github.com/cassidyjames/dippi"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ zendo ]; + mainProgram = "com.github.cassidyjames.dippi"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ zendo ]; }; } From a7f7a1b43de532b53476f5aaac3c5c771538aba5 Mon Sep 17 00:00:00 2001 From: Roland Coeurjoly Date: Sun, 25 Aug 2024 16:47:02 +0200 Subject: [PATCH 21/78] alvr: subtitute --replace with --replace-fail --- pkgs/by-name/al/alvr/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index 31a96a5d8422..f4dd2f54bd07 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -18,7 +18,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' install -Dm444 ${appimageContents}/alvr.desktop -t $out/share/applications substituteInPlace $out/share/applications/alvr.desktop \ - --replace 'Exec=alvr_dashboard' 'Exec=alvr' + --replace-fail 'Exec=alvr_dashboard' 'Exec=alvr' cp -r ${appimageContents}/usr/share/icons $out/share ''; From 081b372b7d9f285ddd201a6bd51377b22426b591 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 14:54:14 +0000 Subject: [PATCH 22/78] pachyderm: 2.11.0 -> 2.11.1 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index d705e9c733f2..24888e39f485 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-tr/1A3kOYvprybqE2Ma7AUr7gdDWZly1H38qKfPQVTk="; + hash = "sha256-dg93x73Lg0JGE/q67ae+ugLrVXDRftsZRLslaPryui8="; }; vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc="; From c0948f222c7ae64eefd0298816ddaa63979ec87d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 25 Aug 2024 12:07:12 -0300 Subject: [PATCH 23/78] labwc-menu-generator: 0-unstable-2024-05-27 -> 0.1.0-unstable-2024-07-09 --- .../la/labwc-menu-generator/package.nix | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix index f3883e3855af..da51d9d73a7a 100644 --- a/pkgs/by-name/la/labwc-menu-generator/package.nix +++ b/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -1,24 +1,27 @@ { lib , stdenv , fetchFromGitHub +, meson +, ninja , glib -, perl , pkg-config , unstableGitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "labwc-menu-generator"; - version = "0-unstable-2024-05-27"; + version = "0.1.0-unstable-2024-07-09"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-menu-generator"; - rev = "efed0194947c45123287ea057c5fdb13894854cd"; - hash = "sha256-ZmuntI3NfIYkM2Fxt3J4pKOOilzgphF240mCer3cJ6c="; + rev = "a2b3e8e46068d82e97168772e7c194d6b6e03e3d"; + hash = "sha256-Y5gBaTgVu3OzZQwGDNLsmQkfS0txBm/vD0MG5av2Gv0="; }; nativeBuildInputs = [ + meson + ninja pkg-config ]; @@ -26,20 +29,10 @@ stdenv.mkDerivation (finalAttrs: { glib ]; - nativeCheckInputs = [ - perl - ]; - doCheck = true; strictDeps = true; - installPhase = '' - runHook preInstall - install -Dm755 labwc-menu-generator -t $out/bin - runHook postInstall - ''; - passthru.updateScript = unstableGitUpdater { }; meta = { From 0dd2043d8f357d7644a2572fe04e93fd912d3674 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 16:52:16 +0000 Subject: [PATCH 24/78] json-fortran: 9.0.1 -> 9.0.2 --- pkgs/development/libraries/json-fortran/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/development/libraries/json-fortran/default.nix index 52ec487c0636..c54965b386d9 100644 --- a/pkgs/development/libraries/json-fortran/default.nix +++ b/pkgs/development/libraries/json-fortran/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "json-fortran"; - version = "9.0.1"; + version = "9.0.2"; src = fetchFromGitHub { owner = "jacobwilliams"; repo = pname; rev = version; - hash = "sha256-nhT2zLyt3ORi35h9KzOiIuD50GGUCZ/Z5SX8UF3rqQs="; + hash = "sha256-mAdagehmj1s6nTDaJqwaYrirfkyIwiTWYge0ZWQBc6g="; }; nativeBuildInputs = [ From a5ee90e853d7993d4898e6f284ae1e5163282b9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Aug 2024 21:54:21 +0200 Subject: [PATCH 25/78] evcc: 0.130.3 -> 0.130.4 https://github.com/evcc-io/evcc/releases/tag/0.130.4 --- pkgs/servers/home-automation/evcc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 0c715b57d74f..c4a01449d291 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGo123Module rec { pname = "evcc"; - version = "0.130.3"; + version = "0.130.4"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-1IZyNIsXtMBDpa006/Q94Ssfj5kPV7gUDxzTcPkXSL8="; + hash = "sha256-da8TIe6KcivWlP6zmNHJVdx973sEiC2S7wc5v7u0vzg="; }; - vendorHash = "sha256-x3tcYcxDca0Us9XEljiOB8YBwHphQUKlrIj2rMcSEc8="; + vendorHash = "sha256-ATgxPydYWPOXrk3fBKVWgFO1Vd13cTq//lDMjObjHFg="; npmDeps = fetchNpmDeps { inherit src; From 9c67da2873ebff792701a1fe0490f3756b8be183 Mon Sep 17 00:00:00 2001 From: Dean Eckert Date: Sun, 25 Aug 2024 22:33:10 +0200 Subject: [PATCH 26/78] lmstudio: 0.2.31 -> 0.3.1 --- pkgs/by-name/lm/lmstudio/darwin.nix | 4 ++-- pkgs/by-name/lm/lmstudio/linux.nix | 4 ++-- pkgs/by-name/lm/lmstudio/package.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 305de818b80d..7c4701e5b277 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { inherit meta pname version; src = fetchurl { - url = "https://releases.lmstudio.ai/mac/arm64/${version}/1/LM-Studio-${version}-arm64.dmg"; - hash = "sha256-ZitdLHuGIH22Ohk7UWVz32BPFTj796HoR+5zEs5rh6E="; + url = "https://releases.lmstudio.ai/darwin/arm64/${version}/LM%20Studio-${version}-arm64.dmg"; + hash = "sha256-8m+gLZqX1rz8kVxEo880FKvU046juaO2DneeBg7Sc70="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index 827e89df406d..dafa97ea79e1 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -6,8 +6,8 @@ }: let src = fetchurl { - url = "https://files.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; - hash = "sha256-zC8QQNsT1X8ICiYLy/jYMVp8w8NP7ghtVF06UMC4eOg="; + url = "https://releases.lmstudio.ai/linux/x86/${version}/LM_Studio-${version}.AppImage"; + hash = "sha256-zkTSa0wgKcyKywnIZPF0b6ZzKtyHn3hqjrQPgILF0eI="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index c61622085ba9..4e299deb4099 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -5,7 +5,7 @@ }: let pname = "lmstudio"; - version = "0.2.31"; + version = "0.3.1"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; From d72b185df4a7bc3b0169a853151e56dd0935a911 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 25 Aug 2024 15:09:28 -0600 Subject: [PATCH 27/78] spicetify-cli: 2.37.2 -> 2.37.4 --- pkgs/by-name/sp/spicetify-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index b6f81081146f..e45ff3e5bfa3 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.37.2"; + version = "2.37.4"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; rev = "v${version}"; - hash = "sha256-SXHLkXOaHtgd4V+nzMbLw9mXZ3HeUbyqlnL7KwiyAXo="; + hash = "sha256-MiuQeyFNW0/RNYrJnVSi6Tyo1CSxciUnVytU3Wnug+g="; }; vendorHash = "sha256-kv+bMyVOJTztn8mNNTK/kp4nvc5m1I5M041s3nPpob8="; From 0fa527466e0829541b5b2b2496a7f99bc0e6821c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 21:25:44 +0000 Subject: [PATCH 28/78] fyne: 2.5.0 -> 2.5.1 --- pkgs/by-name/fy/fyne/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix index 76ea63dead12..a2e2e3826543 100644 --- a/pkgs/by-name/fy/fyne/package.nix +++ b/pkgs/by-name/fy/fyne/package.nix @@ -17,16 +17,16 @@ buildGoModule rec { pname = "fyne"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "fyne-io"; repo = "fyne"; rev = "refs/tags/v${version}"; - hash = "sha256-DUXCaPFMb6f7ROI8DC2RVCX12xf5F9MEtBJyi8CuoE4="; + hash = "sha256-21/52Uub5+l0TcuWZ9QSyckgR1kKNfDvro1CF5QuZWA="; }; - vendorHash = "sha256-Mz+p2kpPtqFb/wDkwOdIUQ2fCvzWqTH49YRjWmSlF4M="; + vendorHash = "sha256-+g11BRf9xRXjtF8InzdTHGOGOf8lJgLKEdBR5DcpEmo="; nativeBuildInputs = [ pkg-config ]; From e03bb75aa4579d00d1423a1d0896e947ff85d4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 23 Aug 2024 23:56:07 +0200 Subject: [PATCH 29/78] nextcloud-client: 3.13.2 -> 3.13.3 --- .../applications/networking/nextcloud-client/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 5c0cdf4455a8..9bc16811381a 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,18 +26,15 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - # make sure an official release has been published on - # https://github.com/nextcloud-releases/desktop/releases and re-check the - # hash afterwards - version = "3.13.2"; + version = "3.13.3"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = "nextcloud"; + owner = "nextcloud-releases"; repo = "desktop"; rev = "v${version}"; - hash = "sha256-hZjmAdh9QQ2bAIYL3K7scl59kz9Wxnv9f6rKMeuKb7U="; + hash = "sha256-Z2/WllEiz/Yj/GyIczfA4L2+3Hr8Jmo7X2W/hP1PmwI="; }; patches = [ From 04ad09164bf1d409e97845eca92a3ee9649b82b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 22:21:54 +0000 Subject: [PATCH 30/78] python312Packages.eigenpy: 3.8.0 -> 3.8.1 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index f793151c2102..d1b1b5c539b8 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.8.0"; + version = "3.8.1"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; rev = "refs/tags/v${version}"; - hash = "sha256-IqGzv/CJ1uiuvewdx6joVV9V9cXSzYuQqbJedajshTg="; + hash = "sha256-U+amWjvA4r2S9qoVW0h8daiUO9g7rMQWmq4aH3/wd+w="; }; outputs = [ From 4e284999a108d011ae606e41d384e539e969422e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 25 Aug 2024 19:12:25 -0400 Subject: [PATCH 31/78] vale: 3.7.0 -> 3.7.1 Diff: https://github.com/errata-ai/vale/compare/v3.7.0...v3.7.1 Changelog: https://github.com/errata-ai/vale/releases/tag/v3.7.1 --- pkgs/tools/text/vale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 928d2a4498ca..fa256b04aca4 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "vale"; - version = "3.7.0"; + version = "3.7.1"; subPackages = [ "cmd/vale" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-rngqTCnNQCecf/W2GkpJfKtfxfPq9Dd7yQlHzb2waKs="; + hash = "sha256-jb+ap+XQMrSqstgexycpgO+M2YyENDeSmMQXrV2FiM4="; }; - vendorHash = "sha256-OLlViQKLTark9yknnjJFiEThFtxNNjue5LUp1P/anKU="; + vendorHash = "sha256-0AeG0/ALU/mkXxVKzqGhxXLqq2XYmnF/ZRaZkJ5eQxU="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 1c14efabb3a51d42c3cf23aae0eb7acb2a251aa9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 00:23:40 +0000 Subject: [PATCH 32/78] stgit: 2.4.10 -> 2.4.11 --- pkgs/applications/version-management/stgit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index 0a498c597353..07f75af31d2e 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.4.10"; + version = "2.4.11"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-3z0MwqE7+jEuWK1/OUGDolUWzi9soKWvVtlhyA9zJEA="; + hash = "sha256-wmBbcK6oImIlgbJ1gMkCVPBLaHUUeN2y9szx8age7mo="; }; - cargoHash = "sha256-9cfgKOIxnh1YLeUVLFnRQz6PqeLrz/6Sc2QybCXo6/w="; + cargoHash = "sha256-hw5pXmwcoi76XwPFdfQoai8S6ApDit48nVuII4ksCRM="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl From 0c1cb28a42cda2d4f72fa4b44d8131770bd2ac4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 00:26:48 +0000 Subject: [PATCH 33/78] ttdl: 4.4.0 -> 4.4.1 --- pkgs/applications/misc/ttdl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix index af81be60709d..3999489625cf 100644 --- a/pkgs/applications/misc/ttdl/default.nix +++ b/pkgs/applications/misc/ttdl/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-PZ1q360gkV+mB0pgkrUmViZqJRyrX8NkmFFZhqvFIPk="; + sha256 = "sha256-pcZ/8eM8JN+DKJKdVKJEl775QUXC4CFeMAaiBN0j+zo="; }; - cargoHash = "sha256-9LoVtY9Okt2SUQLDMgM6V76OJBM4WU0sQioXHlNNzwU="; + cargoHash = "sha256-+caVo53gf7ZUMr0w/yoXfBaZ5MPe73s7vwoOdZVUcNY="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; From 871bef5417e9735b736445490b8b5f92d9c299a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 00:35:33 +0000 Subject: [PATCH 34/78] wego: 2.2 -> 2.3 --- pkgs/applications/misc/wego/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 3ff6a7279ad6..ab7debc5d22e 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wego"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "schachmat"; repo = pname; rev = version; - sha256 = "sha256-bkbH3RewlYYNamAhAZGWQmzNdGB06K3m/D8ScsQP9ic="; + sha256 = "sha256-YGUll0Wi/oulNMXSrSFeAVe+aGpyFeyXRZTW4ngC3Zk="; }; vendorHash = "sha256-aXrXw/7ZtSZXIKDMZuWPV2zAf0e0lU0QCBhua7tHGEY="; From ae6b2cb54d3690024beb252ce580a0b977edba45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 00:35:55 +0000 Subject: [PATCH 35/78] vtm: 0.9.99.06 -> 0.9.99.07 --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index a485891e190e..90b8b31c263c 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.99.06"; + version = "0.9.99.07"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${finalAttrs.version}"; - hash = "sha256-90dZzuSjFp9rbzR3ze/L9Kg9/Gb2bidVeqHBHiD4RM4="; + hash = "sha256-RKCh3lQuYD9Cpjq9R0Sle7QYinw7+E4/agGxQZvN8v4="; }; nativeBuildInputs = [ From 8effd9f2e5b33d63e46e8d45b5d36dd744adcc0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 00:38:15 +0000 Subject: [PATCH 36/78] zpaqfranz: 60.5 -> 60.6 --- pkgs/by-name/zp/zpaqfranz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 273ba7f67258..83908cd7a01a 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "60.5"; + version = "60.6"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-75+HNfxeecl/u8adw3fKRWtCqyyb7mEkT7J4esXD0Is="; + hash = "sha256-/lUczs4YrbLH7agZDyThPwtMLiSi07XMqwk0GgR/jFw="; }; nativeBuildInputs = [ From 13b82f1196b49d3e634c3d7b95f6b9cd81f4bd5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Aug 2024 17:34:03 -0700 Subject: [PATCH 37/78] home-assistant-custom-components.waste_collection_schedule: 2.0.1 -> 2.1.0 Diff: https://github.com/mampfes/hacs_waste_collection_schedule/compare/refs/tags/2.0.1...2.1.0 Changelog: https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/2.1.0 --- .../waste_collection_schedule/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix index 88a131ff3ff9..9f87bf500737 100644 --- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix @@ -5,26 +5,28 @@ , icalendar , icalevents , lxml +, pycryptodome , recurring-ical-events }: buildHomeAssistantComponent rec { owner = "mampfes"; domain = "waste_collection_schedule"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { inherit owner; repo = "hacs_${domain}"; rev = "refs/tags/${version}"; - hash = "sha256-nStfENwlPXPEvK13e8kUpPav6ul6XQO/rViHRHlZpKI="; + hash = "sha256-BRxBZecOg8R4yF1lVEfOWMmuYK4JQ1ORsY4bclVYOow="; }; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 icalendar icalevents lxml + pycryptodome recurring-ical-events ]; From 2434f2f15bdae536c79d2756ce31b271b17f973e Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 25 Aug 2024 22:34:12 -0400 Subject: [PATCH 38/78] diesel-cli: 2.2.1 -> 2.2.3 Changelog: https://github.com/diesel-rs/diesel/releases/tag/v2.2.3 Diff: https://github.com/diesel-rs/diesel/compare/v2.2.2...v2.2.3 --- pkgs/by-name/di/diesel-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 970d4458077a..1efcfdec0e96 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.2.1"; + version = "2.2.3"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-B+AHTJgOBUGVc4J2VcwuqVwAbm0wpsFHc9+gc5g2RAM="; + hash = "sha256-pv75bvswi+JfeL7B8GPaQgXyNdNvzNgXs9VYgzKRn2U="; }; - cargoHash = "sha256-HFhkePq2fZ7MxZfH0jLlS5B10jqf15+RUcGZnDbML5Q="; + cargoHash = "sha256-BMMh4BEoB1UhavoiQWfFhsSZsvfFSfEJhEewjA1ukLQ="; nativeBuildInputs = [ installShellFiles From af4e0b0c0de5d621d0958e20da277563b1014821 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 03:51:04 +0000 Subject: [PATCH 39/78] ryujinx: 1.1.1376 -> 1.1.1379 --- pkgs/by-name/ry/ryujinx/deps.nix | 4 ++-- pkgs/by-name/ry/ryujinx/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ry/ryujinx/deps.nix b/pkgs/by-name/ry/ryujinx/deps.nix index dcdfca4f5090..e87153d17d9e 100644 --- a/pkgs/by-name/ry/ryujinx/deps.nix +++ b/pkgs/by-name/ry/ryujinx/deps.nix @@ -27,7 +27,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; }) (fetchNuGet { pname = "Concentus"; version = "2.2.0"; hash = "sha256-7wbB76WoTd2CISIODGhmEiPIrydI0dqDMZGf4gdkogM="; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; hash = "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU="; }) - (fetchNuGet { pname = "DynamicData"; version = "9.0.1"; hash = "sha256-dvo4eSHg8S9oS5QhvfCrbV+y7BVtlYRwH7PN7N1GubM="; }) + (fetchNuGet { pname = "DynamicData"; version = "9.0.4"; hash = "sha256-3pyiJeWRwfaT7p1ArsoR13aI78Jo13aHOEw3BelTS9g="; }) (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; }) (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.5"; hash = "sha256-EaJ6qR2yn+7p8lf62yx2vL3sGhnPOfbP5jBjR+pGY7o="; }) (fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; hash = "sha256-680VgvYbZbztPQosO17r5y8vxg/Y/4Vmr5K3iLIJKMo="; }) @@ -133,7 +133,7 @@ (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; hash = "sha256-brvWqisI0WwE7qRhLeRdWXDedztX4lOFon4h6oxDIRU="; }) (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.16.0"; hash = "sha256-QU7xVauLOBAF6TDo8mcuRsA2sZWyVLqFq1M+Oc/WnMg="; }) (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0"; hash = "sha256-kyAQcZZOdD50Lo7l7z8qnFMerJjlAV66HNBq7BI6TNM="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.8"; hash = "sha256-5cBdYmF8I1TVi6VSXhMCYja7XTnosLaaYxYzldxHMxE="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.9"; hash = "sha256-5Gn8de23zgrlAzqH39kjVIHoGUrhNNxiVw1qNVJECvY="; }) (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0"; hash = "sha256-IH+UVkem5kk6zWAWfWsrtyINZNMh+Em1cF1CCfjvBj4="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; }) diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 9c9285edf880..d2b9d56e8b56 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -26,13 +26,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1376"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1379"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "0137c9e6353b7866153daf2859c48715a5c39349"; - sha256 = "0rpm2sni7nj9pkw9kwqfgns8g0vgbdfnsxpn40xylz2i7n3b7nn1"; + rev = "b45a81458a0b48acd519ce280c7b8f3970e0ffed"; + sha256 = "1w3nfhx496im06m3gc67xw8w1n6qprs9ggka2sq0g8w2ssz4iy7f"; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; From 7184afdba53efaf67143d834ddde4a1032c76e98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 06:54:46 +0000 Subject: [PATCH 40/78] goflow2: 2.2.0 -> 2.2.1 --- pkgs/by-name/go/goflow2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goflow2/package.nix b/pkgs/by-name/go/goflow2/package.nix index 4baed64bc723..f05c81003c93 100644 --- a/pkgs/by-name/go/goflow2/package.nix +++ b/pkgs/by-name/go/goflow2/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.2.0"; + version = "2.2.1"; in buildGoModule { pname = "goflow2"; @@ -14,7 +14,7 @@ buildGoModule { owner = "netsampler"; repo = "goflow2"; rev = "v${version}"; - hash = "sha256-kqoHYNuyzT1gsBR00KuMe/+D0YT3ZvXOvoceWGKg7G8="; + hash = "sha256-u2wdlmAwRqBPKD+aof34ud9O4aJ+4ccuMxyk8Cgpsp0="; }; ldflags = [ From f923fb4e2b7221fef92adc6a84c7915c1c3d28fc Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 10:44:42 +0200 Subject: [PATCH 41/78] python3Packages.cxxheaderparser: 1.3.3 -> 1.3.4 Diff: https://github.com/robotpy/cxxheaderparser/compare/1.3.3...1.3.4 --- pkgs/development/python-modules/cxxheaderparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix index b35cc118359c..ba53da3679a2 100644 --- a/pkgs/development/python-modules/cxxheaderparser/default.nix +++ b/pkgs/development/python-modules/cxxheaderparser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cxxheaderparser"; - version = "1.3.3"; + version = "1.3.4"; pyproject = true; src = fetchFromGitHub { owner = "robotpy"; repo = "cxxheaderparser"; rev = version; - hash = "sha256-dc+MsSJFeRho6DG21QQZSAq4PmRZl7OlWhIQNisicZo="; + hash = "sha256-Cyo+18mH1p5Zy4dWP3mjZRIkZZOyb61ABedk/amDi0g="; }; postPatch = '' From ad4d156978d14cd3c87fc2c75c03bce0860d7ef0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 09:53:32 +0000 Subject: [PATCH 42/78] git-machete: 3.28.0 -> 3.29.0 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 67a14424abe5..1e0ab925c832 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.28.0"; + version = "3.29.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-INGJYUq5sW6er27kBjtz6BOWhnEtdnRuZgLnfEpO1uE="; + hash = "sha256-QEZF6bCNAXvGTC1KUMRyhIfgUBh4wjgfuoiBEG7jKFE="; }; nativeBuildInputs = [ installShellFiles ]; From 29c3c05a34917ba16d6318372c8433b76d92d4b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 12:30:33 +0000 Subject: [PATCH 43/78] cnquery: 11.17.0 -> 11.18.0 --- pkgs/tools/security/cnquery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index 20a67ebfc718..7e889725d6c5 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.17.0"; + version = "11.18.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-UgaWhvP73H+gfUJLP1aNnnunQtMpeaCmUZW+yq8Tzw4="; + hash = "sha256-B9Pa17Fyw+t6EjDay2A0SuXkzCGX+LldF+X0qF7xHo4="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-BT9Mkm8n14m3FB8LXCso2tBX5mE4RYwA2RtkznXuKLs="; + vendorHash = "sha256-5wq5Hkw7BcfT2EgSJvTVYN0EVfCzqBAJHOVOtFKNj30="; ldflags = [ "-w" From 9a121e8fd8329397cc96479d6e37b2489fb008b7 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Mon, 26 Aug 2024 12:25:11 +0200 Subject: [PATCH 44/78] maintainers/team-list: update to match perl code owners --- maintainers/team-list.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7ed03296204c..dc0d104ffce2 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -780,7 +780,11 @@ with lib.maintainers; }; perl = { - members = [ sgo ]; + members = [ + sgo + marcusramberg + zakame + ]; scope = "Maintain the Perl interpreter and Perl packages."; shortName = "Perl"; enableFeatureFreezePing = true; From 0b3146b3c0af68239cda3e008409cfce375958d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 13:03:28 +0000 Subject: [PATCH 45/78] hclfmt: 2.21.0 -> 2.22.0 --- pkgs/by-name/hc/hclfmt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hc/hclfmt/package.nix b/pkgs/by-name/hc/hclfmt/package.nix index 730d44272b32..12a1120dbea2 100644 --- a/pkgs/by-name/hc/hclfmt/package.nix +++ b/pkgs/by-name/hc/hclfmt/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-izbctn5OqaDunQLovgCGTgqMzC9i227zXlXUNCEExvA="; + hash = "sha256-jIW2r8RWNbk4maWKeUSe1Kqll5jJYe72UCP2EEGfRYg="; }; vendorHash = "sha256-F2i7ph9GL9Xo43da6jHPn9P9FdWC6eSgqCyHPBxdFJY="; From 33538638877c61413c2b7a20e853d3498f0ada23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 13:03:35 +0000 Subject: [PATCH 46/78] heptabase: 1.35.3 -> 1.35.4 --- pkgs/by-name/he/heptabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index 0051ade78809..4511dbe6baf5 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.35.3"; + version = "1.35.4"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-2HEBQI+C/LKrIUb+6qNmm+xjvTOxS+vk5WTsOZKz3+s="; + hash = "sha256-JFIC5a0W8pmiPxgkymE8d+iULM80U85xGOF0M2vu/PI="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 8e0e4406d98463b0f81369cc72dacf446e638e11 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Mon, 26 Aug 2024 15:27:33 +0100 Subject: [PATCH 47/78] railway-wallet: 5.17.0 -> 5.17.10 --- pkgs/by-name/ra/railway-wallet/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/railway-wallet/package.nix b/pkgs/by-name/ra/railway-wallet/package.nix index 6afa77779fe8..a74930721803 100644 --- a/pkgs/by-name/ra/railway-wallet/package.nix +++ b/pkgs/by-name/ra/railway-wallet/package.nix @@ -3,14 +3,13 @@ appimageTools, fetchurl, }: - appimageTools.wrapType2 rec { pname = "railway-wallet"; - version = "5.17.0"; + version = "5.17.10"; src = fetchurl { url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway-linux-x86_64.AppImage"; - hash = "sha256-6IBVbBkYJ6Qsh87sVbx/SKRC43M9D7RElBuOo+5MA14="; + hash = "sha256-dTvoX+wC/LfSPU7/Cftkqm6fvNwzwvMzizxGgTLOJgw="; }; meta = { From 674ca2d3a197ba2bb41e377080079da89699bf5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 15:36:30 +0000 Subject: [PATCH 48/78] reposilite: 3.5.15 -> 3.5.16 --- pkgs/by-name/re/reposilite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix index 36b084718ea0..2c906b0311d6 100644 --- a/pkgs/by-name/re/reposilite/package.nix +++ b/pkgs/by-name/re/reposilite/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "Reposilite"; - version = "3.5.15"; + version = "3.5.16"; src = fetchurl { url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar"; - hash = "sha256-KsuNAF/AXScOvEBU4NHiUkxztfK/zOp4lOUfXUQeKuY="; + hash = "sha256-zketAvn0XgBRAS+Bb3KcUcpdydbQQruS+gZ5Bfrjiig="; }; dontUnpack = true; From 48cc5717c9d9d860764b06521994f888e060f3ce Mon Sep 17 00:00:00 2001 From: Arseniy Zorin Date: Mon, 26 Aug 2024 18:56:09 +0300 Subject: [PATCH 49/78] pulumi-bin: 3.129.0 -> 3.130.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 306 +++++++++++++-------------- 1 file changed, 153 insertions(+), 153 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index a6a250c2679c..1362ca3e2ef8 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,36 +1,36 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.129.0"; + version = "3.130.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.129.0-linux-x64.tar.gz"; - sha256 = "15bk095d9a6zdsh1i252051dfy3mnx1plifblpm5gx33yralcxhs"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-linux-x64.tar.gz"; + sha256 = "1rnm2p7c52xzlf527ywpywbss1j43xl7mb0dxyyal5wh3vx5251d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.21.0-linux-amd64.tar.gz"; - sha256 = "1r4pvgjdibnmklfya1jd96rnvfwi6n3fgcwxkhsjbkr38z65am2p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-amd64.tar.gz"; + sha256 = "1dd5s4d07qlcikcc7m4yh41085diciq25md4g2m1n6wfy629sllv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-amd64.tar.gz"; sha256 = "0ra89zi6ka0d9szgd0i4vlzw5wzvg9da5pi1ns3bf7kwv0mrxdmc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.60.0-linux-amd64.tar.gz"; - sha256 = "1w57km7qa85b3773z2jan6vny6z210rnh57vp3i609qk2glksgy5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-linux-amd64.tar.gz"; + sha256 = "1mmsff6xmxhrd6ymbwzw2mirks3fczcdaw7hcn8nqx3n1vp62xsb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.6.0-linux-amd64.tar.gz"; - sha256 = "1xq3j4hr9a29gfbagx6774f9v3ldg1h0m6izhjy68s7c8px7s33l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.7.1-linux-amd64.tar.gz"; + sha256 = "0pzl2d40lpr90vlr36nmsczdic91j74fm4x3517sdyzkhyb2zrmq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-linux-amd64.tar.gz"; - sha256 = "11kpczajnshx3ky6m8imsydxpw7a8k608bz3bhy9wd43x2gcg5qd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.1-linux-amd64.tar.gz"; + sha256 = "0zmq1i31b7kyasw5za652j5kmfr7fqwzcjkgvpxz0yhkm33k2rcg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.49.0-linux-amd64.tar.gz"; - sha256 = "15ssnpswda299jzqgwxsk24xqi18sl77hif6dchgwpbkviip59yi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.50.1-linux-amd64.tar.gz"; + sha256 = "1v2imk3w74ayglys7pqs881wp01sbp749d4zaxa60kbxmjwx80nc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-amd64.tar.gz"; @@ -41,20 +41,20 @@ sha256 = "02v61pqpsxj652937rm7fwdr0612cq157g8wxkah27cxyyyf6qzq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.87.0-linux-amd64.tar.gz"; - sha256 = "0wbpprpczxasx7d7qpbj88mw9jwbm5isdnhmjscycl5gkba6m8y3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-linux-amd64.tar.gz"; + sha256 = "1l7qibcbak0zmrzfrldqrhkfdvmankb8yflv6ak17y8434dfcrfa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.36.0-linux-amd64.tar.gz"; - sha256 = "0bcdsi66dwvcfa1wpwq9fzh1khizlkzn6wb8rj1i2fipj39gvs9w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-linux-amd64.tar.gz"; + sha256 = "1lc2p0x5ar0vhp0klmp6ilfl1aa8zilg4jgkiqsycsqqaj4f0hk7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.0-linux-amd64.tar.gz"; - sha256 = "10nn27kvv9l32bgy9mrzvs5s5krq1kpaw702mmq5ngiznrkj4ss8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-amd64.tar.gz"; + sha256 = "1b5iyp0rld41mpin4w297p6q17kb3ya9sv5rsfg9iqwpbsz5c0vf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-amd64.tar.gz"; - sha256 = "00px345df0gnirscmj57pvsk9z412z4r5la4y71daf2f2acl73q3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-linux-amd64.tar.gz"; + sha256 = "14pmkyxlmqy7fpj305kp3khjs6r7zg12s0v9f1gl3gml9zfq5nhy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-linux-amd64.tar.gz"; @@ -69,20 +69,20 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.9.0-linux-amd64.tar.gz"; - sha256 = "03wx8b74nr93b5z7cm94n728ljzjggpxa0x6n1zn1zcdr6f495sk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-linux-amd64.tar.gz"; + sha256 = "1jxklrzfkig8b1snhr1jz341pqhp6q17bnhm3q3zvg0ql69sl7p8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.35.0-linux-amd64.tar.gz"; - sha256 = "12055sgxpa0a14rb2zx7b42f1f2h7ih07jilapbj69kypxfppwij"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-linux-amd64.tar.gz"; + sha256 = "1knjxddn118zzcmn3srgq5a7qfxd49zdqg9ki4w6gg5qnpisdk0s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-linux-amd64.tar.gz"; sha256 = "17mfi8q10dvajh6dwahd05yral1mc5x5m2khy77mrmbxq4ivi219"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.2.0-linux-amd64.tar.gz"; - sha256 = "0ldls63d81akr3b81z302a4j1v3h46rrj8ij68hy9n0krjq8m9gx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-linux-amd64.tar.gz"; + sha256 = "10cyc1zxl70wfyq9j15804wh1sn95jr248p5n0vmlikfq9j1qwrw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; @@ -93,12 +93,12 @@ sha256 = "0biyj03nhbmq0fnlkx3v4w43cwk095sa80di1mhbszgz13zj4409"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.16.0-linux-amd64.tar.gz"; - sha256 = "11y742hhna8izpcmra2j5jqhhnd3x7mb0l6n1lark8wazjqifqx9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-linux-amd64.tar.gz"; + sha256 = "1zvspswy3lmjpwpw35xxpkssv28sapwcv52lxiam57vcr9rbyi5g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-linux-amd64.tar.gz"; - sha256 = "00yhd0a5gic68q5b8xqk10xylnda0h2zrh7l7r6crjnb811n3myx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-linux-amd64.tar.gz"; + sha256 = "1hvknh3xsvnk19ihavi3b6pp33172bc60s1k0p11mr5v608xcgbi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-amd64.tar.gz"; @@ -109,8 +109,8 @@ sha256 = "1vl57mjz23krcp7801q5v2vb64daxpyqpas57y8hxvi5np7qnpk4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.1-linux-amd64.tar.gz"; - sha256 = "1fqahbl0rh5794ck21jx4krn5ni5wkk958rf1darl2d7h9l4zr35"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-linux-amd64.tar.gz"; + sha256 = "192m4j80xqhyn8ramp3sdczcagia6xvfv99wq5ffz6yh7vyv0l2g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-amd64.tar.gz"; @@ -121,12 +121,12 @@ sha256 = "0byfb2zjymwmgd52wfk1xhp1llw6b4hniwa4faf66fmpr2i157nd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.1-linux-amd64.tar.gz"; - sha256 = "0cfmi8f8v31jbyz32mflb5lvr2hh550mrmavnk3lv631iy5pf1iw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-linux-amd64.tar.gz"; + sha256 = "1h2kql44fjq6vv2a3pvvnx78sil6jgwm792qmrvh7gqrad0dd050"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.86.0-linux-amd64.tar.gz"; - sha256 = "1qdsbgxkaci0m8k70zmjl997njp5pax4c1paa6lngdp4vbsdrq7m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-linux-amd64.tar.gz"; + sha256 = "00vz0m84bpzqj0r50n0h5w896vhapf275rs8xd5kmmwfnaijgj4r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-linux-amd64.tar.gz"; @@ -149,8 +149,8 @@ sha256 = "11g44ngbz4yar22flz6l1qxsjrjh1ks0fihln0g2b2da9n24v251"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.2-linux-amd64.tar.gz"; - sha256 = "0q4vs70zy873cwzh1y364bvfpfbmb18mr5gbiy069g38wbhk4i3g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.3-linux-amd64.tar.gz"; + sha256 = "1vz95rml45mbmrma6iaga9gfnnfixkyxkjsrp28l0nz9bqvknkkl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-amd64.tar.gz"; @@ -163,32 +163,32 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.129.0-darwin-x64.tar.gz"; - sha256 = "0wjzib3yx6dxpddqlsvwbnryyhzi9zpxscnyw1r364d00hfa6z9d"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-darwin-x64.tar.gz"; + sha256 = "1lm3xk68fpa420bj10jhp1nim5mnd263pqprchaz1racc0f2pq72"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.21.0-darwin-amd64.tar.gz"; - sha256 = "1r7rfkgp0jnvfcq02jimb3cm2bjw9amz48j0ngx9l29ljykf857a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-amd64.tar.gz"; + sha256 = "0338m5b1c2lffg6xx6zv1dnawwyq3vqvgfmm43c2pklrwwka89v6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-amd64.tar.gz"; sha256 = "1d1famsg3pg69300vl5rifjbcvf5linajgwn5hi3wiwrszk2fcg7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.60.0-darwin-amd64.tar.gz"; - sha256 = "06hdy9k38zvrv2sqd4b3vj4nf223nyrd0a8w0jg830qy92sr15x6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-darwin-amd64.tar.gz"; + sha256 = "0w8bhizga9fwvrl06yn1lp1vjwbscm65pr9md63vx0cabq9niz8g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.6.0-darwin-amd64.tar.gz"; - sha256 = "0cks5p1sqnnixgrwcswsy6mpzh7f4ldnfcyg8gh16nmpzx6bkc0j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.7.1-darwin-amd64.tar.gz"; + sha256 = "1fks67b7dc2qmxjiyai9sg8iryw27yn1ixs5kwjhk1ra077x52h0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-darwin-amd64.tar.gz"; - sha256 = "00p3b7m2rnp5w4nsh15w2s3hbhwv6wm2x30d8g939z07z6dxzq3s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.1-darwin-amd64.tar.gz"; + sha256 = "02crpv9wdx4dim14lz1n8wqp9yzf8im8sfj85ynydjd8nv076a6s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.49.0-darwin-amd64.tar.gz"; - sha256 = "1kw5fl0b7g4jn47yc461jvwz2l8p09raqw4hgdrysg67xd8bhkn3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.50.1-darwin-amd64.tar.gz"; + sha256 = "0x0slash3mmawjsjf9c33m85w27g1991a003k0zmns633n53ycwp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-amd64.tar.gz"; @@ -199,20 +199,20 @@ sha256 = "1xranra0rkcnvahna4jrb091jy23sgk9ib92dbzl2gw26yj6x9gx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.87.0-darwin-amd64.tar.gz"; - sha256 = "1vmfgzjp04fbnlvzxjlvh25w7rwldyknrfxicafryh8yz3ym44h3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-darwin-amd64.tar.gz"; + sha256 = "02czk2wwf03sswlqj4hrj83i2i53h4nclqrb3nlgzjgaal82ijv9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.36.0-darwin-amd64.tar.gz"; - sha256 = "111dl2rpjf8zkb5910sz627cw4cqi4c77vbzjimmx837mjkpij69"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-darwin-amd64.tar.gz"; + sha256 = "0iw3gf7kwpi5lckngns2ra1vyd4n05r756s18b01zbcppw8fq2mw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.0-darwin-amd64.tar.gz"; - sha256 = "0scdybl1mgdrqif6m5gkagh2jrlir2srjmbdgig2i3kqs7y5z2d0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-amd64.tar.gz"; + sha256 = "1bgq98jiaqhvgbywvydpkif154k6rlzk0sqn55bj0ng9f04vz2ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-amd64.tar.gz"; - sha256 = "0rvpv2igaq4xsw0z5fpd11zkkwxwbi3ymq08h2gvkv3zdb966bci"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-darwin-amd64.tar.gz"; + sha256 = "1ps5439lxrm1jx4hancdnxks21d0yrkzj3g6y9i20z0pw1ssjpzp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-darwin-amd64.tar.gz"; @@ -227,20 +227,20 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.9.0-darwin-amd64.tar.gz"; - sha256 = "1kcp2hryja7bn7n2115wqlc326hb5ln1bk8fzmhlbwaysamxspbj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-darwin-amd64.tar.gz"; + sha256 = "18l2ppzkypfrghmj2y2jypp0wkry5myp5vmlr3ckfwbsd81z4w3g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.35.0-darwin-amd64.tar.gz"; - sha256 = "16mk8c9wpl32nb7wf4rj258hh2x6vm8wql0c6ha8w0al0va4bsmf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-darwin-amd64.tar.gz"; + sha256 = "1gf871rl8kzxmfmmcnm6rzjx03gcv0w208jd80v8b5ic9k0wrxq9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-darwin-amd64.tar.gz"; sha256 = "03bi0qigh3rxw1cd2lyp8gp865vrxif1w85nc46sjprsxk8a1dv4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.2.0-darwin-amd64.tar.gz"; - sha256 = "1h3nzhbkmj9wdb7zkw4z3kddgnmqra1v5glxvx42sq57l28ad9d3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-darwin-amd64.tar.gz"; + sha256 = "0dnfmprrhlqr5bapw7a09yd1c0npnsdmfy5v2aahm5pjmmj0labc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; @@ -251,12 +251,12 @@ sha256 = "0pw9qawf3wrndzrz0i93al09rygr23b6gg53njq3az74gw4vjaw3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.16.0-darwin-amd64.tar.gz"; - sha256 = "0dfdc9y0rmn70fjgcnf4c8aqgvj6zai8anjjw5ifgchkp2hqi7s9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-darwin-amd64.tar.gz"; + sha256 = "170fh5nyjxc3ayk0yfpv0ypck65rmdgy8p4p90v2i7mq7b6fs53z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-darwin-amd64.tar.gz"; - sha256 = "0jkns8pmq40y4lcdrh8vjlb5wzmcqfi9f5zyc08j907lhcbh1d6j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-darwin-amd64.tar.gz"; + sha256 = "14qd7r56q668w6qdb86cav2b56hc4vkg3sk7gc8av6zcg3wy7d8f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-amd64.tar.gz"; @@ -267,8 +267,8 @@ sha256 = "1a7gd4vbkvbmk2870xc2dgkq6dd4bvcmdcrkny51m2bcns94b2xl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.1-darwin-amd64.tar.gz"; - sha256 = "0xjfhrid7jhz6mkbvf4a8fpbhphxmjbj5xhrg7r7v266vgvjjw2y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-darwin-amd64.tar.gz"; + sha256 = "1x5msm5ssslfpss1gvi56hmjc17hfnkvzmk5c1lhzzk1w94l30vj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-amd64.tar.gz"; @@ -279,12 +279,12 @@ sha256 = "0xfqi33x1crkvqdl3iqq1i7vky2s3v36fyb1adrn6067mbd7dgxj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.1-darwin-amd64.tar.gz"; - sha256 = "1vx0f9d222vvvflkza288327h5ksiff7sysnzpyaca1kf8v3qs7y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-darwin-amd64.tar.gz"; + sha256 = "01g19rm8272n6yzm7a1dyj2xr6f6xvgi0d962aw66sjhq4jc0s1h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.86.0-darwin-amd64.tar.gz"; - sha256 = "1mwp3pfr8gjq6ff1q4dsfq58pcq2v6qnm5pc1fhp083cvsxvzxkz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-darwin-amd64.tar.gz"; + sha256 = "07sgpj1aa6sfnsglfgh92hg5ai7mx9s6vhls2xsxxmqi0kyklx7c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-darwin-amd64.tar.gz"; @@ -307,8 +307,8 @@ sha256 = "1g164xrj9nkdjw9pw08y24vzhg25f8h5702rfjsk0s2z011g86p7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.2-darwin-amd64.tar.gz"; - sha256 = "0v8jpsw7x66n3v2w2mvyr7yfg2dwvm6jz0l1sl5k477j3nh97hhk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.3-darwin-amd64.tar.gz"; + sha256 = "1i2sb6nrglx1ixpg4l34zvblvs2sjzxsfzwb19d0v81lvadii1ck"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-amd64.tar.gz"; @@ -321,32 +321,32 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.129.0-linux-arm64.tar.gz"; - sha256 = "1jnmqmrc6fr8432a42x960f0m6sbqic95fkx4rnm7kbn9f0nq7c0"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-linux-arm64.tar.gz"; + sha256 = "05zhw333cmk5hqfk6q28ny9qc5jqyi5nxqfrhl1bd7vhnflnc7df"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.21.0-linux-arm64.tar.gz"; - sha256 = "1nadxwfmn6622jy5hjwxmhczsj4js049nhh128xkc51a70f7iz5k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-arm64.tar.gz"; + sha256 = "1hzxmw420rzlka6wvr9b7gljyxdngbff4bcpdsaj6672isl2zy5v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-arm64.tar.gz"; sha256 = "0zpcz79ca84lhccg2ivr442hr2gfmx7826rmw0ppnyi5cna1wvkr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.60.0-linux-arm64.tar.gz"; - sha256 = "08bfff74q9rnc1fv4zv7d9lnk4vdfg4f7j9dyq188jij1cacbz0m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-linux-arm64.tar.gz"; + sha256 = "1s5240phmjcn2p4li5b45ngf3vh4fkdb3qj3357bys9pwxiv1hlj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.6.0-linux-arm64.tar.gz"; - sha256 = "01p1xfr013apcj9jbfs22np8ix0chk286b1vp7snra1kvy78bfpr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.7.1-linux-arm64.tar.gz"; + sha256 = "01wmhkar9a8m8p16plz0cnb8m9fqb1kp1sjx2j655mmgg9y1v4rw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-linux-arm64.tar.gz"; - sha256 = "0kabsgjxhg8dlj0qa33mfsm90vsd9lzizw1a5sfmf9py7flcvn0y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.1-linux-arm64.tar.gz"; + sha256 = "19f2602l99ilvmfzp8vv1crq6i7zc0fjm83mm0wid8dbgqv0fsf5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.49.0-linux-arm64.tar.gz"; - sha256 = "1v2kwxff8l7n189vc6b2mzxc9nqn721hq0arwa5h9f9zf1rv8dqa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.50.1-linux-arm64.tar.gz"; + sha256 = "0wch7d6zh7lsxpdc0aynqi5rj0bf41xv3dlbi3sj0p3ld24b5vgs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-arm64.tar.gz"; @@ -357,20 +357,20 @@ sha256 = "03rvhz2zbjdldlp3c1335cbp2b8c3y3p88czwsfy6dsd9hry8fsa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.87.0-linux-arm64.tar.gz"; - sha256 = "0m2ddx27859n2vsgyihf9dayk10b1mfrb69hr1sjqj1bpl2mrmqg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-linux-arm64.tar.gz"; + sha256 = "0ciadynvqc0pkmy9w7zj65zbc7w6rbsnz5b6iaszlyqp9rzwahg2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.36.0-linux-arm64.tar.gz"; - sha256 = "0m7xcblqcpaiiyv0izp5inczzyn07a7s77647fmskq3wax0fgady"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-linux-arm64.tar.gz"; + sha256 = "1wmi0zwrsvphk82h7wqn0jvlsk685nl3xf48crara716xkhlr6cp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.0-linux-arm64.tar.gz"; - sha256 = "0z6c4c2g26hl999l7bpx0ma9ks8rlcin5n0jyr1sbl3myy3804hs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-arm64.tar.gz"; + sha256 = "0j53qafafq8s4rxds8anrsyylyjx6gd3jhrz16zqs4hcxwiimcfp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-arm64.tar.gz"; - sha256 = "1xfql6ggxd90vh4kb9c0iki1cs47j6v1qld9chcanm394kchavd5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-linux-arm64.tar.gz"; + sha256 = "0b9mvqzd9zyz11ih3f1vlm96ijf0ij91y15qgsljplyi67kjsn2a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-linux-arm64.tar.gz"; @@ -385,20 +385,20 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.9.0-linux-arm64.tar.gz"; - sha256 = "1fr9hm4pkrhhgw6i9ay0mrnf17p5q8sj2bjf1v3lqgchfw8z6sga"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-linux-arm64.tar.gz"; + sha256 = "0fx4rh8s8fdxllnk9i8yhwg8winh48ggw45px7jjxwnpd8g537fa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.35.0-linux-arm64.tar.gz"; - sha256 = "0w3sspn64q5h056d7ql12w4q6lnvpdfla2llac4bv7rx1sd3hh3v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-linux-arm64.tar.gz"; + sha256 = "0rcj1lc5d65m36q712a4ic87443cpb5fvk04wqcnmicybgrfyhnl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-linux-arm64.tar.gz"; sha256 = "1n8ndwfb1ckarjd2wqgyyx7xxklxwglrvw473c4w8vpr2dmsrsyb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.2.0-linux-arm64.tar.gz"; - sha256 = "0j11nl5qbl9mrbqk1g73hp5rmq4zlzsk9hn7sfd7rky1dqzjxi3m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-linux-arm64.tar.gz"; + sha256 = "06fs1jvyrqb7jbgc0b6vaqvbfc1s63py0llr46kvk6ynlb8m1apm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; @@ -409,12 +409,12 @@ sha256 = "1m18aypypjsyr18igj2kmzh1dw86hxph32agk7k0zjfj921anqmx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.16.0-linux-arm64.tar.gz"; - sha256 = "1rf6l9wzynn25nds0m7wyzzdd34yg81vf79269j268wkpif7xpmg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-linux-arm64.tar.gz"; + sha256 = "07kv3nqbfdah4i82pb8q83swr726q0bkx8wr6wwy168nff6zs98l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-linux-arm64.tar.gz"; - sha256 = "0ssj159b3vgr7gxi2b0fib7jlzn1g3gkr18wsaj1i55avmk9gm40"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-linux-arm64.tar.gz"; + sha256 = "05zy4chm6fs7h7szi23k8bi4ki4x0nai3zhfkxjpcm6b63dvvwgl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-arm64.tar.gz"; @@ -425,8 +425,8 @@ sha256 = "0krvvhm842lkxa14xfpkk2b1namgxnk3y6n5lcvhsnswga10r2xq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.1-linux-arm64.tar.gz"; - sha256 = "0fwmrxrap9wrihy4d2a85avmgzfmn0xm49b30da2x8cibsdl4g0b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-linux-arm64.tar.gz"; + sha256 = "0xyypg6rf1q9mb4brsplhaj4aj3fsrwsqli45662syhd7skmzwrm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-arm64.tar.gz"; @@ -437,12 +437,12 @@ sha256 = "064x91jvbqj142rkyphvwwds71i347nifv5akak35lf0ha4v57hw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.1-linux-arm64.tar.gz"; - sha256 = "1k61nqg0cgy5bdj8fkzf17azx4wskalf6spmfs46swdbrgq5ra2l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-linux-arm64.tar.gz"; + sha256 = "0ainz86d5bcslk4yyyw6qsqnjhw2myirlkb22l0ldfpg85j4gbnm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.86.0-linux-arm64.tar.gz"; - sha256 = "0h6cyklya3dpfbkg6n4fm5cxmmdgy1fcq45jriwqyx9isy62wq9p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-linux-arm64.tar.gz"; + sha256 = "1libjf55fr78zb3c7krkp2azvnrxznml4chss7lhmgjl6fhbla4y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-linux-arm64.tar.gz"; @@ -465,8 +465,8 @@ sha256 = "0jkjbsdmsc50jwv9rr40s0hlhwyhljwz95s5ll28xmmk413jkpfr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.2-linux-arm64.tar.gz"; - sha256 = "157xjjg5bcq1hzqpz1gw5ymc86r4jcd33f5wxl93j1yc997na0mv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.3-linux-arm64.tar.gz"; + sha256 = "19ca2rcf3xmjsrii846lvgkhclgqk5mckwm6agvmfyl8qzlaqxyc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-arm64.tar.gz"; @@ -479,32 +479,32 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.129.0-darwin-arm64.tar.gz"; - sha256 = "14jjab5xaldhn235ziysv2m4nl1hx4syhknh0swiz4kyb4fc633l"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-darwin-arm64.tar.gz"; + sha256 = "11afqpra94wcpj86ndk92m24s8z71bn4iwki82zmhwdc1im61h9w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.21.0-darwin-arm64.tar.gz"; - sha256 = "1yrccl7z5mbjnxxvvmcjsq4jwvm9ppch2wdybgrapkk7n1liwbd3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-arm64.tar.gz"; + sha256 = "1jms955rhkw8babbbdkniic3qqc1g7jsddp322c5di2x4863qs2x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-arm64.tar.gz"; sha256 = "12954vrf9fjjynrzgj8qm34bl258v4fdvvzyi0m8wp92rsp4icjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.60.0-darwin-arm64.tar.gz"; - sha256 = "1i2xsahh0a5az90zqi14qlzpj2z7np2mjabpi9zhnqc6sp3ziphj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-darwin-arm64.tar.gz"; + sha256 = "042k66xnzgljy0kbjcrg71a61kgfy6cyh3x6b3llsmih17036fy4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.6.0-darwin-arm64.tar.gz"; - sha256 = "14wy2yckvf0gfn7idv9875irgb2l83ijkihkh97316fk0whhp54r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.7.1-darwin-arm64.tar.gz"; + sha256 = "1y3ama1495zmnx3nyb0c8f9h59z9kcjkwm90wcxggvxl6bjgx9ld"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-darwin-arm64.tar.gz"; - sha256 = "1mmrvn31njs2sr9h6cj7m1ph2gh465qqx0pigvbidjfhl9ag2hrx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.1-darwin-arm64.tar.gz"; + sha256 = "151720nbxn6rrbvm1zawxc5xmlfadqgck2cmjgmj6z6qgd8zm6dv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.49.0-darwin-arm64.tar.gz"; - sha256 = "02b8ab6vk3mvyjnr1i111if22v16a9pyg1y7816j8bgcc9bi23b5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.50.1-darwin-arm64.tar.gz"; + sha256 = "1rvx92x8d5qgwp5bvn03j2s424bd4yhhsivl1nbd5sd7wgzmfp3x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-arm64.tar.gz"; @@ -515,20 +515,20 @@ sha256 = "04wibkfpq76qhyy8kf0y89qkssapwgmkv56bspdxpydlnnwvn714"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.87.0-darwin-arm64.tar.gz"; - sha256 = "1p3ybkm3xp443jbvhd4h80lxaf6rymjh7ic7fi432zgab1v4vi67"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-darwin-arm64.tar.gz"; + sha256 = "1vs8xhy7iqfadfi2397jwfnz099pqyz5js4g4mx7kw1v47bsbvdq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.36.0-darwin-arm64.tar.gz"; - sha256 = "12y6vyz8zfxhn71agzw90mhhn4czyh0xdljpxhsl6yzai3l176jb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-darwin-arm64.tar.gz"; + sha256 = "08hhsjw93g5fyivlykmrzg4sghrranprzl17p1wn8rfiwfvk3d1x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.0-darwin-arm64.tar.gz"; - sha256 = "1m8jjiq1yfiw06dgji3rw90rmzcwn2j2lrj17vilqxim708vg5fn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-arm64.tar.gz"; + sha256 = "17f53cknsyqm5r9glxmwc396y8bbl1khvg9px5ixr43gfgq4vm91"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-arm64.tar.gz"; - sha256 = "0x9fvwwx4hd7a3n0nmjnri2r5pdf72chkczdjx3n04rf7lrzbhz4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-darwin-arm64.tar.gz"; + sha256 = "0jwsaxfgsqk9hf35ciz1pr3f1n3s8i7k20yr0rry9hv1a73bpavi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-darwin-arm64.tar.gz"; @@ -543,20 +543,20 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.9.0-darwin-arm64.tar.gz"; - sha256 = "0sd24dkf2bbz113vl59yc4ka5kxjdgsz0z6a84nnfa66llgr81b7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-darwin-arm64.tar.gz"; + sha256 = "00d6j85lmfk8alvbijvjnzg9jrc1a1rsg2cxs8szdzw81an25pk5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.35.0-darwin-arm64.tar.gz"; - sha256 = "1yc35zjzr9ry1jy9avb8d1sliq4iyy59v2jsx4bdixwk9ih3ddpm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-darwin-arm64.tar.gz"; + sha256 = "1i8cwbq01fdrlsx2r14q6f06ysq9gyb8c5ak377aihj8p3rkz224"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-darwin-arm64.tar.gz"; sha256 = "1dfvzb6lh4ayxlg7m0mm7gb0j80nz5npyxrx41z9fy1x82i24130"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.2.0-darwin-arm64.tar.gz"; - sha256 = "1ffq8gh3m3xviai63cyrjvrdvqxxwbd82f0lia32iszmghcag2n8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-darwin-arm64.tar.gz"; + sha256 = "0c4503nv94hdlza617zl7wqnfks661f4r9ddgw93728diqy38p0v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; @@ -567,12 +567,12 @@ sha256 = "19nr55glr64lvxf233c2z8j5g13b7r2zxqwsri9vgj3kg52rjsbi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.16.0-darwin-arm64.tar.gz"; - sha256 = "0rp7wqz1fydj53jcnsqw2pgs015hmp7am2mps6y03yrh8zy17rnb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-darwin-arm64.tar.gz"; + sha256 = "1rh428pj6yzqy40l9gcjaacfcxy5snsy642gavwr9raw3yxdh4br"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-darwin-arm64.tar.gz"; - sha256 = "1bv6k8d6h0bv8rdzf78szavd03gqa9x1j5s5zv3fngq404zs9nn0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-darwin-arm64.tar.gz"; + sha256 = "06rbc5b87xpcb2w61d82sf5ir8ra9qqphj5kknh6j2s5wj10pwvb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-arm64.tar.gz"; @@ -583,8 +583,8 @@ sha256 = "0girslx186bif03hxkpsgs21g88sy2r1py05b2kqb67izcbh996v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.1-darwin-arm64.tar.gz"; - sha256 = "1whav393yg0w3vxnf835ryp3ah9aqya092w8kw18rgd7miqf6m5m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-darwin-arm64.tar.gz"; + sha256 = "0l48njd1dw2fmr0sgpws5c6178wcv8h1rzvyj6x6djin3va8nwsg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-arm64.tar.gz"; @@ -595,12 +595,12 @@ sha256 = "15l2609g7z2xxsblakwq3d3lyg32swb4lmfsrn7m0cwa2a2s2v1x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.1-darwin-arm64.tar.gz"; - sha256 = "0bfxi4c9bv3bwd0x9gv25pcspcvw8cqpgkfbrjnq49mcmys1wz24"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-darwin-arm64.tar.gz"; + sha256 = "09z5hdwn282xcxi4a2xsigcscnxykidm3a57r1s92jyxcvp9y2k8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.86.0-darwin-arm64.tar.gz"; - sha256 = "1dfffxx0wrrhrh8h29ffcijp5v55i85x1608l3g12a4dac5p2r3k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-darwin-arm64.tar.gz"; + sha256 = "1103zs11ih71lq4nj0s2x3v35dj90zy4d0ka27h4lazf28qvmda5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-darwin-arm64.tar.gz"; @@ -623,8 +623,8 @@ sha256 = "114cbaxhr067nf6rhxqnxhqzfwbq6sak6wmxjq5d25xxx0k0392j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.2-darwin-arm64.tar.gz"; - sha256 = "1kb0qxlzw907656jzdy3695rivcdmmik99n588znq3h1pcdn44w1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.3-darwin-arm64.tar.gz"; + sha256 = "1pmppj5k7ix02bvv21wsh619qcxrhc54iszk9wh651s20j3m0vhn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-arm64.tar.gz"; From de464c89a87a6cf35fb808ddc52ae731970414e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 16:13:42 +0000 Subject: [PATCH 50/78] terragrunt: 0.66.8 -> 0.66.9 --- pkgs/by-name/te/terragrunt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index f482a04b7bba..fa5f133e27cc 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.66.8"; + version = "0.66.9"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GDRduJMTPWhUo1dv6sFaEYj3dFUwkHg8D/QebyeOBK4="; + hash = "sha256-yL24oxuwdIMaMPQIZFHkp33B8x1TDwjXRkk9fQgMdrY="; }; nativeBuildInputs = [ go-mockery ]; From 75ad0af1b6e099d5b3bbf467abfee501349af18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Aug 2024 09:39:06 -0700 Subject: [PATCH 51/78] nixos/home-assistant: set WorkingDirectory --- nixos/modules/services/home-automation/home-assistant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 6ffe314d4574..c7b28b910515 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -655,6 +655,7 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "hass"; Group = "hass"; + WorkingDirectory = cfg.configDir; Restart = "on-failure"; RestartForceExitStatus = "100"; SuccessExitStatus = "100"; From 1c14741fe2a362064ac7816a59455c35b105cfa1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 16:45:44 +0000 Subject: [PATCH 52/78] flyctl: 0.2.114 -> 0.2.120 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index a1be35223ad1..03485e92ea95 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.114"; + version = "0.2.120"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-NzF+AAZQxQeM+x8tTyiBl0VVYphMKKj3o2koV8JmQtQ"; + hash = "sha256-n+EWwjz4+zmwqDGzBRi2rtnxe+mxd906JcqtrbGiz4w="; }; - vendorHash = "sha256-Mujrsgoabx0/+g+IFwNNpI6C532iu/BWHk6xtIPsE+M="; + vendorHash = "sha256-RtHTAigoPlmop9XURD1nw1nCkGJCdYwFUnp5AWp3x3M="; subPackages = [ "." ]; From cca78c7b1568903a69003115abdd89c9bce01d29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 17:25:30 +0000 Subject: [PATCH 53/78] mdt: 0.8.4 -> 0.8.5 --- pkgs/by-name/md/mdt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdt/package.nix b/pkgs/by-name/md/mdt/package.nix index 6bcc0ebe62b1..40090acf46e3 100644 --- a/pkgs/by-name/md/mdt/package.nix +++ b/pkgs/by-name/md/mdt/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mdt"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "henriklovhaug"; repo = "md-tui"; rev = "v${version}"; - hash = "sha256-J1UtyxDT8+UmBwayUMtcPOtnVVkRZLg6ECXnqDSJ2Ew="; + hash = "sha256-HUrL/+uXQ3753Qb5FZkftGZO+u+MsocFO3L3OzarEhg="; }; - cargoHash = "sha256-X6Pl3oMsFHaKMdXLfPxQ9xSRfRMo4eueLkmDoDBqjaM="; + cargoHash = "sha256-O25cb4aNQiU4T2SzxgzjFqL+pCzbM0d+DkkZHvCkMv8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; From bcbb41e166b369e4e3f75b60dc5f029eb1be9784 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 17:54:24 +0000 Subject: [PATCH 54/78] albert: 0.26.0 -> 0.26.2 --- pkgs/applications/misc/albert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 6baa2bac220d..dd49357c604a 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.26.0"; + version = "0.26.2"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - hash = "sha256-OdRx8fev0weXgSMEUhSm7aESN2W3BVnJpgtrlEUo+L0="; + hash = "sha256-jgSa1IvpMlwtpNT/SEysG28qaszV7gH6ZSqGrHQ/EC0="; fetchSubmodules = true; }; From f587c3bb40535ebec702bb6df2aaf4668f03c0d5 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Mon, 26 Aug 2024 11:19:43 +0300 Subject: [PATCH 55/78] codemov: fix build with rust 1.80 --- pkgs/tools/misc/codemov/default.nix | 8 +- .../codemov/fix-build-with-rust-1.80.patch | 107 ++++++++++++++++++ 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch diff --git a/pkgs/tools/misc/codemov/default.nix b/pkgs/tools/misc/codemov/default.nix index d8cc40e3d861..2134a7300f13 100644 --- a/pkgs/tools/misc/codemov/default.nix +++ b/pkgs/tools/misc/codemov/default.nix @@ -19,7 +19,13 @@ rustPlatform.buildRustPackage { hash = "sha256-nOqh8kXS5mx0AM4NvIcwvC0lAZRHsQwrxI0c+9PeroU="; }; - cargoHash = "sha256-cyzoMD97ofrbm3BDAtl8pSezcM4B2TVbW9V5J6xRVLc="; + cargoHash = "sha256-whGTGJQIjdg/tIm5sZsBs0sbwiRuFIfgYvizmL+sQCE="; + + cargoPatches = [ + # fix build with rust 1.80 by updating time crate version + # https://github.com/sloganking/codemov/pull/16 + ./fix-build-with-rust-1.80.patch + ]; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch b/pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch new file mode 100644 index 000000000000..9fd6b7d6fc24 --- /dev/null +++ b/pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch @@ -0,0 +1,107 @@ +diff --git a/Cargo.lock b/Cargo.lock +index a4c40ab..b3451ea 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -378,9 +378,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.7" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "either" +@@ -811,6 +814,12 @@ dependencies = [ + "getrandom", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -1007,6 +1016,12 @@ dependencies = [ + "miniz_oxide", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "proc-macro2" + version = "1.0.66" +@@ -1185,18 +1200,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + + [[package]] + name = "serde" +-version = "1.0.183" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" ++checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.183" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" ++checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" + dependencies = [ + "proc-macro2", + "quote", +@@ -1356,12 +1371,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.25" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -1369,16 +1386,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.11" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + From 48e00dda260902c86a948e7003fd655f22bf59f3 Mon Sep 17 00:00:00 2001 From: Zoom Date: Sun, 25 Aug 2024 15:58:27 +0400 Subject: [PATCH 56/78] Kernel: update testing to 6.11-rc5 Update `linuxPackages_testing` from 6.11-rc4 to 6.11-rc5 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ca7ec693fc00..949ad2eef5ad 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.11-rc4", - "hash": "sha256:1cjvsmnnzm2gc8m56jbn07r8zfz6b96701njhy2bbd4a800zx1hi" + "version": "6.11-rc5", + "hash": "sha256:06qq6y7cryq0xy4b68ky2hr44cw2nqhbna0dbzfbmr9d5sh9c0gn" }, "6.1": { "version": "6.1.106", From 6602decb96b8da3eebb68ab91b723885f0dabee9 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 26 Aug 2024 14:39:19 -0400 Subject: [PATCH 57/78] postgis: Do not hardcode test suite path (#336889) postgis: Fix test suite Fixes this failure: ``` Creating database 'postgis_reg-3.4'. sh: line 1: /tmp/pgis_reg/regress_log: Permission denied 2024-08-23 19:26:18.810 UTC [3295760] FATAL: database "postgis_reg-3.4" does not exist psql: error: FATAL: database "postgis_reg-3.4" does not exist Loading unpackaged components from /tmp/nix-build-postgis-3.4.2.drv-0/postgis-3.4.2/regress/00-regress-install/nix/store/kg8g82wxhar9iadxrd3pra3af174khpb-postgis-3.4.2/share/postgresql/contrib/postgis Loading PostGIS into 'postgis_reg-3.4' sh: line 1: /tmp/pgis_reg/regress_log: Permission denied failed (Error encountered loading /tmp/nix-build-postgis-3.4.2.drv-0/postgis-3.4.2/regress/00-regress-install/nix/store/kg8g82wxhar9iadxrd3pra3af174khpb-postgis-3.4.2/share/postgresql/contrib/postgis/postgis.sql: /tmp/pgis_reg/regress_log) make: *** [regress/runtest.mk:24: check-regress] Error 1 ``` --- pkgs/servers/sql/postgresql/ext/postgis.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 251d79ffe04a..5b4e4543ec96 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -96,6 +96,8 @@ stdenv.mkDerivation rec { substituteInPlace regress/Makefile --replace-fail 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' "s,\\$\$libdir,$PWD/regress/00-regress-install$out/lib,g" \ --replace-fail '$(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql' "$PWD/regress/00-regress-install$out/share/postgresql/contrib/postgis/*.sql" substituteInPlace doc/postgis-out.xml --replace-fail "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" + # The test suite hardcodes it to use /tmp. + export PGIS_REG_TMPDIR="$TMPDIR/pgis_reg" ''; # create aliases for all commands adding version information From 5714d9290977af6313b2988d076384afa1e48f62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 18:48:07 +0000 Subject: [PATCH 58/78] sabnzbd: 4.3.2 -> 4.3.3 --- pkgs/by-name/sa/sabnzbd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 63b5df4b5962..65e47bd76c62 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -15,8 +15,8 @@ }: let - sabctoolsVersion = "8.2.0"; - sabctoolsHash = "sha256-dOMNZoKWQxHJt6yHiNKVtpnYvLJkK8nktOm+djsSTcM="; + sabctoolsVersion = "8.2.5"; + sabctoolsHash = "sha256-ZEC813/JpGPEFL+nXKFAXFfUrrhECCIqONe27LwS00g="; pythonEnv = python3.withPackages ( ps: with ps; [ @@ -72,14 +72,14 @@ let ]; in stdenv.mkDerivation rec { - version = "4.3.2"; + version = "4.3.3"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-EJf5yTyGbWqS9qaCWdxnJqaSFzVu3h5N3CGGzAEsBtI="; + sha256 = "sha256-WJ58OawPSICCWMWQ042T4OmK5UBRZRU5tnLYxGPbDPc="; }; nativeBuildInputs = [ makeWrapper ]; From 1db14472d67cb628e106b10a7f86a9ea5b9394b3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 26 Aug 2024 20:45:49 +0200 Subject: [PATCH 59/78] tinymist: 0.11.19 -> 0.11.20 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.11.19...v0.11.20 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/refs/tags/v0.11.20/CHANGELOG.md --- .../myriad-dreamin.tinymist/default.nix | 2 +- pkgs/by-name/ti/tinymist/Cargo.lock | 319 +++++++++--------- pkgs/by-name/ti/tinymist/package.nix | 4 +- 3 files changed, 157 insertions(+), 168 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 0b3b499dafda..fc359311b4fe 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-8+CPlLJnMwlemMH36xOjGvL/NapPSpyFerpxER07hOU="; + hash = "sha256-m5wq1F2sjiBacdyTFtLoqrJ/B6nwoaUjiNbc+zfpJoU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 079341f5576e..36656d2cf59d 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -70,6 +70,15 @@ dependencies = [ "libc", ] +[[package]] +name = "ansi_colours" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14eec43e0298190790f41679fe69ef7a829d2a2ddd78c8c00339e84710e435fe" +dependencies = [ + "rgb", +] + [[package]] name = "anstream" version = "0.6.14" @@ -125,12 +134,6 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" -[[package]] -name = "append-only-vec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cf1d5134ae83736dc3f4dc3e6107870b29cc2a9f8f7948630c133c6fdb6ba1" - [[package]] name = "approx" version = "0.5.1" @@ -224,16 +227,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64-serde" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7" -dependencies = [ - "base64 0.21.7", - "serde", -] - [[package]] name = "biblatex" version = "0.9.3" @@ -941,15 +934,6 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -[[package]] -name = "elsa" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10" -dependencies = [ - "stable_deref_trait", -] - [[package]] name = "embedded-io" version = "0.4.0" @@ -1166,12 +1150,6 @@ dependencies = [ "libc", ] -[[package]] -name = "fst" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" - [[package]] name = "funty" version = "2.0.0" @@ -2700,9 +2678,9 @@ dependencies = [ [[package]] name = "reflexo" -version = "0.5.0-rc5" +version = "0.5.0-rc7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ae5af71dba0ab175d7e790ef57f64310c645dc300e88794bd22457d531fbc23" +checksum = "2803fc3e89d63fe9b5201726f5c4490a3d4d415facdad9581082a5e7e647db52" dependencies = [ "base64 0.22.1", "bitvec", @@ -2711,11 +2689,10 @@ dependencies = [ "ecow 0.2.2", "fxhash", "instant", - "once_cell", "parking_lot", "path-clean", "rkyv", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "serde", "serde_json", "serde_repr", @@ -2725,56 +2702,115 @@ dependencies = [ ] [[package]] -name = "reflexo-vfs" -version = "0.5.0-rc5" +name = "reflexo-typst" +version = "0.5.0-rc7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc80c7f1483dfc8ef7f413a2158181d7c8ecd18d22241c533ec2cd493d1bc0f" +checksum = "6ac7cb43d90c023f5cbeedfb24b2022c550b1e29952fc0014bac947bf69d6647" +dependencies = [ + "codespan-reporting", + "comemo 0.4.0", + "ecow 0.2.2", + "futures", + "fxhash", + "indexmap 2.2.6", + "log", + "nohash-hasher", + "notify", + "parking_lot", + "pathdiff", + "rayon", + "reflexo", + "reflexo-typst2vec", + "reflexo-vfs", + "reflexo-world", + "serde", + "serde_json", + "tar", + "tokio", + "typst", +] + +[[package]] +name = "reflexo-typst2vec" +version = "0.5.0-rc7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "104405c4eb839fecea0c88443961d1f10c7f533c13083d1b8355d83f01b1bbd1" +dependencies = [ + "bitvec", + "comemo 0.4.0", + "crossbeam-queue", + "dashmap", + "flate2", + "log", + "parking_lot", + "rayon", + "reflexo", + "rustc-hash 2.0.0", + "serde", + "serde_json", + "svgtypes", + "tiny-skia", + "tiny-skia-path", + "ttf-parser", + "typst", + "xmlparser", +] + +[[package]] +name = "reflexo-vec2svg" +version = "0.5.0-rc7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e79d065724764ff3c5cb9a6203eede0472290b8b387b2df55f6740618661d59" +dependencies = [ + "base64 0.22.1", + "comemo 0.4.0", + "log", + "reflexo", + "reflexo-typst2vec", + "typst", +] + +[[package]] +name = "reflexo-vfs" +version = "0.5.0-rc7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea592d6cfc00420d0719170a6c0dd71580b1cea6682a5f543b3b683991ec3f6" dependencies = [ - "append-only-vec", "indexmap 2.2.6", "log", "nohash-hasher", - "once_cell", "parking_lot", "reflexo", "rpds", - "rustc-hash 1.1.0", "typst", ] [[package]] name = "reflexo-world" -version = "0.5.0-rc5" +version = "0.5.0-rc7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68eb0f8f91035cbe75c17f42542be883aed8738e39b79a28c9a532b141127c5f" +checksum = "1ec0d950f4a5087dcbf875b686dd4b67d82c436c10895f98bb5cc027b1aea9e2" dependencies = [ - "append-only-vec", "chrono", "codespan-reporting", "comemo 0.4.0", - "dashmap", "dirs", + "ecow 0.2.2", "flate2", "fontdb", "hex", - "indexmap 2.2.6", "log", - "nohash-hasher", - "notify", - "once_cell", "parking_lot", "reflexo", "reflexo-vfs", "reqwest", - "rustc-hash 1.1.0", "serde", "serde_json", + "serde_with", "sha2", "strum 0.25.0", "tar", "typst", - "typst-ts-core", - "walkdir", ] [[package]] @@ -3500,7 +3536,7 @@ dependencies = [ [[package]] name = "sync-lsp" -version = "0.11.19" +version = "0.11.20" dependencies = [ "anyhow", "clap", @@ -3639,7 +3675,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.19" +version = "0.11.20" dependencies = [ "insta", "lsp-server", @@ -3736,7 +3772,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.19" +version = "0.11.20" dependencies = [ "anyhow", "async-trait", @@ -3752,6 +3788,7 @@ dependencies = [ "comemo 0.4.0", "crossbeam-channel", "dhat", + "dirs", "env_logger", "futures", "hyper", @@ -3766,13 +3803,16 @@ dependencies = [ "pin-project-lite", "rayon", "reflexo", + "reflexo-typst", + "reflexo-vec2svg", "serde", "serde_json", "serde_yaml", "sync-lsp", - "tinymist-assets 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-query", "tinymist-render", + "tinymist-world", "tokio", "tokio-util", "toml 0.8.14", @@ -3780,15 +3820,13 @@ dependencies = [ "tower-service", "typlite", "typst", + "typst-ansi-hl", "typst-assets", "typst-pdf", "typst-preview", "typst-render", "typst-svg", "typst-timing", - "typst-ts-compiler", - "typst-ts-core", - "typst-ts-svg-exporter", "typstfmt_lib", "typstyle", "unicode-script", @@ -3798,23 +3836,24 @@ dependencies = [ [[package]] name = "tinymist-assets" -version = "0.11.19" +version = "0.11.20" [[package]] name = "tinymist-assets" -version = "0.11.19" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85be1e87f7b44cafd3fa5195af352c8ea5f8e747aefff207b76986174f1085ea" +checksum = "31caeaeb5d57c7ecd5f5e64aa77504f169f930c534822ba9fd12681866a686e9" [[package]] name = "tinymist-query" -version = "0.11.19" +version = "0.11.20" dependencies = [ "anyhow", "biblatex", "chrono", "comemo 0.4.0", "dashmap", + "dirs", "ecow 0.2.2", "ena", "hashbrown 0.14.5", @@ -3830,6 +3869,7 @@ dependencies = [ "pathdiff", "percent-encoding", "reflexo", + "reflexo-typst", "regex", "rust_iso3166", "rust_iso639", @@ -3845,8 +3885,6 @@ dependencies = [ "ttf-parser", "typst", "typst-assets", - "typst-ts-compiler", - "typst-ts-core", "unscanny", "walkdir", "yaml-rust2", @@ -3854,13 +3892,29 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.19" +version = "0.11.20" dependencies = [ "base64 0.22.1", "log", + "reflexo-vec2svg", "serde", "tinymist-query", - "typst-ts-svg-exporter", +] + +[[package]] +name = "tinymist-world" +version = "0.11.20" +dependencies = [ + "anyhow", + "chrono", + "clap", + "comemo 0.4.0", + "log", + "reflexo-typst", + "serde", + "serde_json", + "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)", + "typst-assets", ] [[package]] @@ -4129,19 +4183,29 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typlite" -version = "0.11.19" +version = "0.11.20" dependencies = [ "base64 0.22.1", "comemo 0.4.0", "ecow 0.2.2", "insta", "regex", + "tinymist-query", + "tinymist-world", "typst", - "typst-assets", "typst-svg", "typst-syntax 0.11.1", ] +[[package]] +name = "typlite-cli" +version = "0.0.0" +dependencies = [ + "clap", + "tinymist-world", + "typlite", +] + [[package]] name = "typst" version = "0.11.1" @@ -4203,6 +4267,21 @@ dependencies = [ "wasmi", ] +[[package]] +name = "typst-ansi-hl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b457d0812d51dbc28f7a5b8583b8c28cd3c43628e1e7e5a0ae63975fda65351" +dependencies = [ + "ansi_colours", + "once_cell", + "syntect", + "termcolor", + "thiserror", + "two-face", + "typst-syntax 0.11.1", +] + [[package]] name = "typst-assets" version = "0.11.1" @@ -4247,7 +4326,7 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.19" +version = "0.11.20" dependencies = [ "clap", "comemo 0.4.0", @@ -4256,16 +4335,15 @@ dependencies = [ "indexmap 2.2.6", "log", "once_cell", + "reflexo-typst", + "reflexo-vec2svg", "serde", "serde_json", - "tinymist-assets 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)", "tokio", "tokio-tungstenite", "typst", "typst-assets", - "typst-ts-compiler", - "typst-ts-core", - "typst-ts-svg-exporter", ] [[package]] @@ -4348,95 +4426,6 @@ dependencies = [ "typst-syntax 0.11.1", ] -[[package]] -name = "typst-ts-compiler" -version = "0.5.0-rc5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3f3a4d7b1c28314b2d664e321e8d5252fc5ad09091930b951557e386e20fcd" -dependencies = [ - "base64 0.22.1", - "codespan-reporting", - "comemo 0.4.0", - "flate2", - "fst", - "indexmap 2.2.6", - "log", - "nohash-hasher", - "notify", - "once_cell", - "parking_lot", - "pathdiff", - "rayon", - "reflexo", - "reflexo-vfs", - "reflexo-world", - "rustc-hash 1.1.0", - "serde", - "serde_json", - "tar", - "tokio", - "typst", - "typst-ts-core", - "typst-ts-svg-exporter", -] - -[[package]] -name = "typst-ts-core" -version = "0.5.0-rc5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81026f9d356bb4d15d612a2e76274fc64379a98c356c2115c45add6565153262" -dependencies = [ - "base64 0.22.1", - "base64-serde", - "bitvec", - "byteorder", - "comemo 0.4.0", - "crossbeam-queue", - "dashmap", - "ecow 0.2.2", - "elsa", - "flate2", - "fxhash", - "hex", - "log", - "once_cell", - "parking_lot", - "path-clean", - "rayon", - "reflexo", - "rustc-hash 1.1.0", - "serde", - "serde_json", - "serde_repr", - "serde_with", - "sha2", - "siphasher 1.0.1", - "svgtypes", - "tiny-skia", - "tiny-skia-path", - "ttf-parser", - "typst", - "xmlparser", -] - -[[package]] -name = "typst-ts-svg-exporter" -version = "0.5.0-rc5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6425d6586ba1bdf3d1da75aea61717dca9774f0a3ab969e799b067010522f318" -dependencies = [ - "base64 0.22.1", - "comemo 0.4.0", - "log", - "once_cell", - "rayon", - "reflexo", - "siphasher 1.0.1", - "tiny-skia", - "typst", - "typst-ts-core", -] - [[package]] name = "typstfmt_lib" version = "0.2.7" @@ -4454,9 +4443,9 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.31" +version = "0.11.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04207b151e637bcf307d974e5963fc51c2912688343a0b7575246a3acb6aeab9" +checksum = "87f3e79e77aac4d80934811be14abd1e2b0e7d3b4059653e24b841ab1ac5bae0" dependencies = [ "anyhow", "itertools 0.13.0", diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index db975abb67cd..9928080dd117 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.19"; + version = "0.11.20"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-ejumGfG98l3N3mA7UX86GYa46hIwxjEB2/jvAW9rv0I="; + hash = "sha256-wmXFMLLMjMFRuWX9AFk+gJz/4t0+DiOBrvcTx+LQ+tI="; }; cargoLock = { From 2de55545ffeb95cf64f1c739cc53568956dfcbef Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 25 Aug 2024 14:10:59 +0200 Subject: [PATCH 60/78] gcompris: fix loading of image assets Previously some games were not able to load some WebP image assets, eg. the Erase game failed to display any cute background image, making it unattractive: > qrc:/gcompris/src/activities/erase/Erase.qml:26:20: QML Image: > Error decoding: qrc:/gcompris/src/activities/erase/resource/butterfly.webp: > Unsupported image format --- pkgs/games/gcompris/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 61778a120f93..cfa4717c05ee 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -11,6 +11,7 @@ , qtcharts , qtdeclarative , qtgraphicaleffects +, qtimageformats , qtmultimedia , qtquickcontrols2 , qtsensors @@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { qtcharts qtdeclarative qtgraphicaleffects + qtimageformats qtmultimedia qtquickcontrols2 qtsensors From 18485b25adf21fb2eea49d8eaece5ddd0fd1ccd1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Aug 2024 22:05:25 +0200 Subject: [PATCH 61/78] nixos/hardware.pulseaudio: remove `with lib;` --- nixos/modules/config/pulseaudio.nix | 110 ++++++++++++++-------------- 1 file changed, 53 insertions(+), 57 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 27c164a9a6dc..6a6aeaab6541 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -1,8 +1,4 @@ { config, lib, pkgs, ... }: - -with pkgs; -with lib; - let cfg = config.hardware.pulseaudio; @@ -10,28 +6,28 @@ let hasZeroconf = let z = cfg.zeroconf; in z.publish.enable || z.discovery.enable; overriddenPackage = cfg.package.override - (optionalAttrs hasZeroconf { zeroconfSupport = true; }); - binary = "${getBin overriddenPackage}/bin/pulseaudio"; + (lib.optionalAttrs hasZeroconf { zeroconfSupport = true; }); + binary = "${lib.getBin overriddenPackage}/bin/pulseaudio"; binaryNoDaemon = "${binary} --daemonize=no"; # Forces 32bit pulseaudio and alsa-plugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null); + enable32BitAlsaPlugins = cfg.support32Bit && pkgs.stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null); myConfigFile = let - addModuleIf = cond: mod: optionalString cond "load-module ${mod}"; - allAnon = optional cfg.tcp.anonymousClients.allowAll "auth-anonymous=1"; + addModuleIf = cond: mod: lib.optionalString cond "load-module ${mod}"; + allAnon = lib.optional cfg.tcp.anonymousClients.allowAll "auth-anonymous=1"; ipAnon = let a = cfg.tcp.anonymousClients.allowedIpRanges; - in optional (a != []) ''auth-ip-acl=${concatStringsSep ";" a}''; - in writeTextFile { + in lib.optional (a != []) ''auth-ip-acl=${lib.concatStringsSep ";" a}''; + in pkgs.writeTextFile { name = "default.pa"; text = '' .include ${cfg.configFile} ${addModuleIf cfg.zeroconf.publish.enable "module-zeroconf-publish"} ${addModuleIf cfg.zeroconf.discovery.enable "module-zeroconf-discover"} - ${addModuleIf cfg.tcp.enable (concatStringsSep " " + ${addModuleIf cfg.tcp.enable (lib.concatStringsSep " " ([ "module-native-protocol-tcp" ] ++ allAnon ++ ipAnon))} ${addModuleIf config.services.jack.jackd.enable "module-jack-sink"} ${addModuleIf config.services.jack.jackd.enable "module-jack-source"} @@ -49,7 +45,7 @@ let # Create pulse/client.conf even if PulseAudio is disabled so # that we can disable the autospawn feature in programs that # are built with PulseAudio support (like KDE). - clientConf = writeText "client.conf" '' + clientConf = pkgs.writeText "client.conf" '' autospawn=no ${cfg.extraClientConf} ''; @@ -82,16 +78,16 @@ in { options = { hardware.pulseaudio = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the PulseAudio sound server. ''; }; - systemWide = mkOption { - type = types.bool; + systemWide = lib.mkOption { + type = lib.types.bool; default = false; description = '' If false, a PulseAudio server is launched automatically for @@ -105,8 +101,8 @@ in { ''; }; - support32Bit = mkOption { - type = types.bool; + support32Bit = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to include the 32-bit pulseaudio libraries in the system or not. @@ -114,8 +110,8 @@ in { ''; }; - configFile = mkOption { - type = types.nullOr types.path; + configFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; description = '' The path to the default configuration options the PulseAudio server should use. By default, the "default.pa" configuration @@ -123,8 +119,8 @@ in { ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Literal string to append to `configFile` @@ -132,21 +128,21 @@ in { ''; }; - extraClientConf = mkOption { - type = types.lines; + extraClientConf = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra configuration appended to pulse/client.conf file. ''; }; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = if config.services.jack.jackd.enable then pkgs.pulseaudioFull else pkgs.pulseaudio; - defaultText = literalExpression "pkgs.pulseaudio"; - example = literalExpression "pkgs.pulseaudioFull"; + defaultText = lib.literalExpression "pkgs.pulseaudio"; + example = lib.literalExpression "pkgs.pulseaudioFull"; description = '' The PulseAudio derivation to use. This can be used to enable features (such as JACK support, Bluetooth) via the @@ -154,10 +150,10 @@ in { ''; }; - extraModules = mkOption { - type = types.listOf types.package; + extraModules = lib.mkOption { + type = lib.types.listOf lib.types.package; default = []; - example = literalExpression "[ pkgs.pulseaudio-modules-bt ]"; + example = lib.literalExpression "[ pkgs.pulseaudio-modules-bt ]"; description = '' Extra pulseaudio modules to use. This is intended for out-of-tree pulseaudio modules like extra bluetooth codecs. @@ -167,8 +163,8 @@ in { }; daemon = { - logLevel = mkOption { - type = types.str; + logLevel = lib.mkOption { + type = lib.types.str; default = "notice"; description = '' The log level that the system-wide pulseaudio daemon should use, @@ -176,31 +172,31 @@ in { ''; }; - config = mkOption { - type = types.attrsOf types.unspecified; + config = lib.mkOption { + type = lib.types.attrsOf lib.types.unspecified; default = {}; description = "Config of the pulse daemon. See `man pulse-daemon.conf`."; - example = literalExpression ''{ realtime-scheduling = "yes"; }''; + example = lib.literalExpression ''{ realtime-scheduling = "yes"; }''; }; }; zeroconf = { discovery.enable = - mkEnableOption "discovery of pulseaudio sinks in the local network"; + lib.mkEnableOption "discovery of pulseaudio sinks in the local network"; publish.enable = - mkEnableOption "publishing the pulseaudio sink in the local network"; + lib.mkEnableOption "publishing the pulseaudio sink in the local network"; }; # TODO: enable by default? tcp = { - enable = mkEnableOption "tcp streaming support"; + enable = lib.mkEnableOption "tcp streaming support"; anonymousClients = { - allowAll = mkEnableOption "all anonymous clients to stream to the server"; - allowedIpRanges = mkOption { - type = types.listOf types.str; + allowAll = lib.mkEnableOption "all anonymous clients to stream to the server"; + allowedIpRanges = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; - example = literalExpression ''[ "127.0.0.1" "192.168.1.0/24" ]''; + example = lib.literalExpression ''[ "127.0.0.1" "192.168.1.0/24" ]''; description = '' A list of IP subnets that are allowed to stream to the server. ''; @@ -213,7 +209,7 @@ in { }; - config = lib.mkIf cfg.enable (mkMerge [ + config = lib.mkIf cfg.enable (lib.mkMerge [ { environment.etc."pulse/client.conf".source = clientConf; @@ -222,21 +218,21 @@ in { environment.etc = { "alsa/conf.d/99-pulseaudio.conf".text = alsaConf; - "pulse/daemon.conf".source = writeText "daemon.conf" + "pulse/daemon.conf".source = pkgs.writeText "daemon.conf" (lib.generators.toKeyValue {} cfg.daemon.config); - "openal/alsoft.conf".source = writeText "alsoft.conf" "drivers=pulse"; + "openal/alsoft.conf".source = pkgs.writeText "alsoft.conf" "drivers=pulse"; - "libao.conf".source = writeText "libao.conf" "default_driver=pulse"; + "libao.conf".source = pkgs.writeText "libao.conf" "default_driver=pulse"; }; - hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa"; + hardware.pulseaudio.configFile = lib.mkDefault "${lib.getBin overriddenPackage}/etc/pulse/default.pa"; # Disable flat volumes to enable relative ones - hardware.pulseaudio.daemon.config.flat-volumes = mkDefault "no"; + hardware.pulseaudio.daemon.config.flat-volumes = lib.mkDefault "no"; # Upstream defaults to speex-float-1 which results in audible artifacts - hardware.pulseaudio.daemon.config.resample-method = mkDefault "speex-float-5"; + hardware.pulseaudio.daemon.config.resample-method = lib.mkDefault "speex-float-5"; # Allow PulseAudio to get realtime priority using rtkit. security.rtkit.enable = true; @@ -247,7 +243,7 @@ in { services.udev.packages = [ overriddenPackage ]; } - (mkIf (cfg.extraModules != []) { + (lib.mkIf (cfg.extraModules != []) { hardware.pulseaudio.daemon.config.dl-search-path = let overriddenModules = builtins.map (drv: drv.override { pulseaudio = overriddenPackage; }) @@ -259,15 +255,15 @@ in { in lib.concatStringsSep ":" modulePaths; }) - (mkIf hasZeroconf { + (lib.mkIf hasZeroconf { services.avahi.enable = true; }) - (mkIf cfg.zeroconf.publish.enable { + (lib.mkIf cfg.zeroconf.publish.enable { services.avahi.publish.enable = true; services.avahi.publish.userServices = true; }) - (mkIf (!cfg.systemWide) { + (lib.mkIf (!cfg.systemWide) { environment.etc = { "pulse/default.pa".source = myConfigFile; }; @@ -278,7 +274,7 @@ in { RestartSec = "500ms"; PassEnvironment = "DISPLAY"; }; - } // optionalAttrs config.services.jack.jackd.enable { + } // lib.optionalAttrs config.services.jack.jackd.enable { environment.JACK_PROMISCUOUS_SERVER = "jackaudio"; }; sockets.pulseaudio = { @@ -287,7 +283,7 @@ in { }; }) - (mkIf cfg.systemWide { + (lib.mkIf cfg.systemWide { users.users.pulse = { # For some reason, PulseAudio wants UID == GID. uid = assert uid == gid; uid; From a48228d5bb369fe5bb3b78f45a71fd90e73a45aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 19:34:16 +0000 Subject: [PATCH 62/78] trealla: 2.55.22 -> 2.55.25 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index f1e6e5ffd38c..a632c7a4bae3 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.55.22"; + version = "2.55.25"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-qrOVirSJKLF3fzUoD5lxxtj0Uv67WgxEsdG/GNVLZvk="; + hash = "sha256-SQ80jT8uMOaQVr9ZmrV6IYbMMdNIcdxEJ2czsRHP2XI="; }; postPatch = '' From 79ed718bf5fa685c44ed4607c314527ff832e53f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 26 Aug 2024 11:22:06 +0200 Subject: [PATCH 63/78] php84.extensions.redis: Fix build on Darwin --- pkgs/development/php-packages/redis/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index f36568aaed17..ddb25c8db88b 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -26,6 +26,18 @@ buildPecl { url = "https://github.com/phpredis/phpredis/commit/a51215ce2b22bcd1f506780c35b6833471e0b8cb.patch"; hash = "sha256-DoGPMyuI/IZdF+8jG5faoyG2aM+WDz0obH6S7HoOMX8="; }) + + # Fix warning on Darwin. + (fetchpatch { + url = "https://github.com/phpredis/phpredis/commit/7de29d57d919f835f902f87a83312ed2549c1a13.patch"; + hash = "sha256-INsSQTwcHQhQiqplAYQGS4zAtaIHWABG61MxnPCsrUM="; + }) + + # Fix build on Darwin. + (fetchpatch { + url = "https://github.com/phpredis/phpredis/commit/c139de3abac1dd33b97ef0de5af41b6e3a78f7ab.patch"; + hash = "sha256-jM9N4ktGU5KAk81sZZJQmzV7y//39nVnfc52KqIvfpU="; + }) ]; internalDeps = with php.extensions; [ session ]; From f306ab429f287d009c27e3f774e507f7585ba24a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 26 Aug 2024 16:01:29 -0400 Subject: [PATCH 64/78] python312Packages.snakemake-storage-plugin-xrootd: unstable-2023-12-16 -> 0.1.3 (#336600) --- .../snakemake-storage-plugin-xrootd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix index 3f67ce74218f..99a540790bca 100644 --- a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix +++ b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-storage-plugin-xrootd"; - version = "unstable-2023-12-16"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = pname; - rev = "408f1e956b5427c34b49eeca340492a438e8eccb"; - hash = "sha256-CcSG//D9kz0Q4LtaSngJpCtY0dbNFFuKMVmBxR1fcMo="; + rev = "refs/tags/v${version}"; + hash = "sha256-Wo6eF8XlHh9OiD2rTMCchyq1sQ8gjkKnoD4JsKDmJ2A="; }; # xrootd<6.0.0,>=5.6.4 not satisfied by version 5.7rc20240303 From f23fe03ff8527072977e1bf8343fec689806fe02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 20:11:45 +0000 Subject: [PATCH 65/78] eigenmath: 3.27-unstable-2024-06-20 -> 3.27-unstable-2024-08-24 --- pkgs/applications/science/math/eigenmath/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index a120de87b9ff..00b69e03f1b8 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "3.27-unstable-2024-06-20"; + version = "3.27-unstable-2024-08-24"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "c3e3da104dbef888c3e52659134d5e9bdc12764d"; - hash = "sha256-fqCphnRQw79v7ZTCZU9ucm/R7BKY7yCZYDSnxD7uRS8="; + rev = "92ae1a3f9c9f6808f3faefa10ae66c0ff480dab2"; + hash = "sha256-AHZ9p7yyYENHywNppsSTfaM3KFqpX5ehxfjPwocHv5Q="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' From 7354bda2081a43cfe13f7df67b09af90b309615a Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:25:31 -0300 Subject: [PATCH 66/78] maintainers: remove superherointj --- maintainers/maintainer-list.nix | 7 ------- maintainers/team-list.nix | 2 -- pkgs/applications/editors/vscode/extensions/default.nix | 6 +++--- pkgs/applications/networking/cluster/cilium/default.nix | 2 +- .../networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md | 2 +- pkgs/by-name/fl/fluxcd/package.nix | 1 - pkgs/by-name/go/godot_4/package.nix | 1 - pkgs/by-name/vc/vcluster/package.nix | 1 - pkgs/servers/etcd/3.5/default.nix | 2 +- 9 files changed, 6 insertions(+), 18 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f756e9314f62..c0a4e295ecad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19946,13 +19946,6 @@ githubId = 36031171; name = "Supa"; }; - superherointj = { - email = "sergiomarcelo@yandex.com"; - github = "superherointj"; - githubId = 5861043; - matrix = "@superherointj:matrix.org"; - name = "Sérgio Marcelo"; - }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index dc0d104ffce2..1daee20ff7cc 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -507,7 +507,6 @@ with lib.maintainers; marcusramberg mic92 rorosen - superherointj wrmilling yajo ]; @@ -951,7 +950,6 @@ with lib.maintainers; stridtech = { # Verify additions by approval of an already existing member of the team members = [ - superherointj ulrikstrid ]; scope = "Group registration for Strid Tech AB team members who collectively maintain packages"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dbee7be768d2..710a342307a2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -771,7 +771,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=bradgashler.htmltagwrap"; homepage = "https://github.com/bgashler1/vscode-htmltagwrap"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = [ ]; }; }; @@ -2600,7 +2600,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-nix-syntax"; homepage = "https://github.com/jeff-hykin/better-nix-syntax"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = [ ]; }; }; @@ -4301,7 +4301,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=signageos.signageos-vscode-sops"; homepage = "https://github.com/signageos/vscode-sops"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = [ ]; }; }; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index ac77afd7b537..fb097191cb58 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -42,7 +42,7 @@ buildGoModule rec { description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; license = lib.licenses.asl20; homepage = "https://www.cilium.io/"; - maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly superherointj ]; + maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly ]; mainProgram = "cilium"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md index 9c2365d6f2dd..1b43e4d5712a 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md +++ b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md @@ -26,7 +26,7 @@ If you cause a regression (we've all been there), you are responsible for fixing To merge code, you need to be a committer, or use the merge-bot, but currently the merge-bot only works for packages located at `pkgs/by-name/`, which means, K3s still need to be migrated there before you can use merge-bot for merging. As a non-committer, once you have approved a PR you need to forward the request to a committer. For deciding which committer, give preference initially to K3s committers, but any committer can commit. A committer usually has a green approval in PRs. -K3s's committers currently are: superherointj, marcusramberg, Mic92. +K3s's committers currently are: marcusramberg, Mic92. @euank is often silent but still active and has always handled anything dreadful, internal parts of K3s/Kubernetes or architecture things, he initially packaged K3s for nixpkgs, think of him as a last resort, when we fail to accomplish a fix, he comes to rescue us from ourselves. diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 8d691f58b5a5..782fcb50bf74 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -81,7 +81,6 @@ buildGoModule rec { maintainers = with lib.maintainers; [ bryanasdev000 jlesquembre - superherointj ]; mainProgram = "flux"; }; diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index 1296da9e48d0..25c36e07a1b3 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -192,7 +192,6 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ shiryel - superherointj ]; mainProgram = "godot4"; }; diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix index bee814c8a0ca..9af18805a12c 100644 --- a/pkgs/by-name/vc/vcluster/package.nix +++ b/pkgs/by-name/vc/vcluster/package.nix @@ -68,7 +68,6 @@ buildGoModule rec { berryp peterromfeldhk qjoly - superherointj ]; }; } diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index b293d5f45ade..914dc777156d 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -20,7 +20,7 @@ let description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline superherointj ]; + maintainers = with maintainers; [ offline ]; platforms = platforms.darwin ++ platforms.linux; }; From 095ef5ef9e18669c062b0203ae7e27d62a6c9b58 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 00:35:15 +0100 Subject: [PATCH 67/78] libresample: 0.1.3 -> 0.1.4-unstable-2024-08-23 The Debian CMake build system rewrite patch was broken and generated an unusable `.pc` file, so I rewrote it again in Meson. This was accepted upstream, but is still awaiting a final release. The licence also changed to BSD-2-Clause OR LGPL-2.1-or-later in 2013. --- pkgs/by-name/li/libresample/fix-test.patch | 108 +++++++++++++++++++++ pkgs/by-name/li/libresample/package.nix | 73 ++++++++++---- 2 files changed, 160 insertions(+), 21 deletions(-) create mode 100644 pkgs/by-name/li/libresample/fix-test.patch diff --git a/pkgs/by-name/li/libresample/fix-test.patch b/pkgs/by-name/li/libresample/fix-test.patch new file mode 100644 index 000000000000..eacb859dcca7 --- /dev/null +++ b/pkgs/by-name/li/libresample/fix-test.patch @@ -0,0 +1,108 @@ +From fb8e3c74d582038a358936d827f53c4c0c43d4e6 Mon Sep 17 00:00:00 2001 +From: Matt Harvey +Date: Mon, 27 Nov 2023 16:28:53 -0800 +Subject: [PATCH] Fix testresample.c output span; add exit code + +Prior to this chance, the "Resample with different factors" test only +passed for 60 of the 63 factors, with the 3 failing ones being the +largest. + +1. Since only 63 distinct factors were being considered, 100 random + samples was overkill. +2. To support noticing failure in continuous build systems, it's nice if + the test exit()s with nonzero when there are failures. +3. The root cause was a formula error when determining which indices in + the resampled output ought be compared. Details are explained in a + comment. +--- + tests/testresample.c | 32 ++++++++++++++++++++++++-------- + 1 file changed, 24 insertions(+), 8 deletions(-) + +diff --git a/tests/testresample.c b/tests/testresample.c +index aa83a46..640df5a 100644 +--- a/tests/testresample.c ++++ b/tests/testresample.c +@@ -19,6 +19,8 @@ + + #define MIN(A, B) (A) < (B)? (A) : (B) + ++int global_error; ++ + void runtest(int srclen, double freq, double factor, + int srcblocksize, int dstblocksize) + { +@@ -65,10 +67,12 @@ void runtest(int srclen, double freq, double factor, + + if (o < 0) { + printf("Error: resample_process returned an error: %d\n", o); ++ global_error = 1; + } + + if (out <= 0) { + printf("Error: resample_process returned %d samples\n", out); ++ global_error = 1; + free(src); + free(dst); + return; +@@ -79,15 +83,16 @@ void runtest(int srclen, double freq, double factor, + printf(" Expected ~%d, got %d samples out\n", + expectedlen, out); + } +- ++ + sum = 0.0; + sumsq = 0.0; + errcount = 0.0; + +- /* Don't compute statistics on all output values; the last few +- are guaranteed to be off because it's based on far less +- interpolation. */ +- statlen = out - fwidth; ++ /* Don't compute statistics on all output values; the last small fraction ++ are guaranteed to be off since they are interpolated based on far fewer ++ values. When upsampling, the length of the range where this concern ++ applies is in direct proportion to the upsampling factor. */ ++ statlen = out - ((int)round(fwidth * factor)); + + for(i=0; i Date: Sat, 3 Aug 2024 16:23:00 +0100 Subject: [PATCH 68/78] kissfft: move to `pkgs/by-name` --- .../libraries => by-name/ki}/kissfft/0001-pkgconfig-darwin.patch | 0 .../kissfft/default.nix => by-name/ki/kissfft/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 deletion(-) rename pkgs/{development/libraries => by-name/ki}/kissfft/0001-pkgconfig-darwin.patch (100%) rename pkgs/{development/libraries/kissfft/default.nix => by-name/ki/kissfft/package.nix} (100%) diff --git a/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch b/pkgs/by-name/ki/kissfft/0001-pkgconfig-darwin.patch similarity index 100% rename from pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch rename to pkgs/by-name/ki/kissfft/0001-pkgconfig-darwin.patch diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/by-name/ki/kissfft/package.nix similarity index 100% rename from pkgs/development/libraries/kissfft/default.nix rename to pkgs/by-name/ki/kissfft/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5279a511f82b..e702709f774d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23641,7 +23641,6 @@ with pkgs; rtrlib = callPackage ../development/libraries/rtrlib { }; - kissfft = callPackage ../development/libraries/kissfft { }; kissfftFloat = kissfft.override { datatype = "float"; }; From 990e96533e4acb7f975bf9d9ffff50bffd11df07 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 3 Aug 2024 16:25:31 +0100 Subject: [PATCH 69/78] kissfft: format with `nixfmt-rfc-style` --- pkgs/by-name/ki/kissfft/package.nix | 57 +++++++++++++++-------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/ki/kissfft/package.nix b/pkgs/by-name/ki/kissfft/package.nix index 5156e1ccd898..e7bb8aecca29 100644 --- a/pkgs/by-name/ki/kissfft/package.nix +++ b/pkgs/by-name/ki/kissfft/package.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, fftw -, fftwFloat -, python3 -, datatype ? "double" -, withTools ? false -, libpng -, enableStatic ? stdenv.hostPlatform.isStatic -, enableOpenmp ? false -, llvmPackages +{ + lib, + stdenv, + fetchFromGitHub, + fftw, + fftwFloat, + python3, + datatype ? "double", + withTools ? false, + libpng, + enableStatic ? stdenv.hostPlatform.isStatic, + enableOpenmp ? false, + llvmPackages, }: let py = python3.withPackages (ps: with ps; [ numpy ]); @@ -26,22 +27,23 @@ stdenv.mkDerivation rec { sha256 = "1yfws5bn4kh62yk6hdyp9h9775l6iz7wsfisbn58jap6b56s8j5s"; }; - patches = [ - ./0001-pkgconfig-darwin.patch - ]; + patches = [ ./0001-pkgconfig-darwin.patch ]; # https://bugs.llvm.org/show_bug.cgi?id=45034 - postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "10") '' - substituteInPlace test/Makefile \ - --replace "-ffast-math" "" - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin) '' - substituteInPlace test/Makefile \ - --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" - # Don't know how to make math.h's double long constants available - substituteInPlace test/testcpp.cc \ - --replace "M_PIl" "M_PI" - ''; + postPatch = + lib.optionalString + (stdenv.hostPlatform.isLinux && stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "10") + '' + substituteInPlace test/Makefile \ + --replace "-ffast-math" "" + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' + substituteInPlace test/Makefile \ + --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" + # Don't know how to make math.h's double long constants available + substituteInPlace test/testcpp.cc \ + --replace "M_PIl" "M_PI" + ''; makeFlags = [ "PREFIX=${placeholder "out"}" @@ -51,7 +53,8 @@ stdenv.mkDerivation rec { "KISSFFT_OPENMP=${option enableOpenmp}" ]; - buildInputs = lib.optionals (withTools && datatype != "simd") [ libpng ] + buildInputs = + lib.optionals (withTools && datatype != "simd") [ libpng ] # TODO: This may mismatch the LLVM version in the stdenv, see #79818. ++ lib.optional (enableOpenmp && stdenv.cc.isClang) llvmPackages.openmp; From 1f81efc8a0cc20b131572e5e0e2f5cae3f993c55 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 00:35:15 +0100 Subject: [PATCH 70/78] kissfft: build with CMake Fix the library install names on macOS and replace a patch with a smaller one. --- .../ki/kissfft/0001-pkgconfig-darwin.patch | 48 -------- .../kissfft/fix-fftw-dependency-check.patch | 23 ++++ pkgs/by-name/ki/kissfft/package.nix | 108 +++++++++--------- 3 files changed, 76 insertions(+), 103 deletions(-) delete mode 100644 pkgs/by-name/ki/kissfft/0001-pkgconfig-darwin.patch create mode 100644 pkgs/by-name/ki/kissfft/fix-fftw-dependency-check.patch diff --git a/pkgs/by-name/ki/kissfft/0001-pkgconfig-darwin.patch b/pkgs/by-name/ki/kissfft/0001-pkgconfig-darwin.patch deleted file mode 100644 index 534d46f0c8ba..000000000000 --- a/pkgs/by-name/ki/kissfft/0001-pkgconfig-darwin.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c0dc376be9154d143574a818417ceed23308b5f2 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Sun, 18 Apr 2021 01:45:20 +0200 -Subject: [PATCH] pkgconfig darwin - ---- - Makefile | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 971c6d6..0f4be0c 100644 ---- a/Makefile -+++ b/Makefile -@@ -153,7 +153,6 @@ endif - # -DKISS_FFT_BUILD to TYPEFLAGS - # - --ifneq ($(shell uname -s),Darwin) - PKGCONFIG_KISSFFT_VERSION = $(KFVER_MAJOR).$(KFVER_MINOR).$(KFVER_PATCH) - PKGCONFIG_KISSFFT_OUTPUT_NAME = $(KISSFFTLIB_SHORTNAME) - PKGCONFIG_PKG_KISSFFT_DEFS = $(TYPEFLAGS) -@@ -170,7 +169,6 @@ ifneq ($(shell uname -s),Darwin) - PKGCONFIG_KISSFFT_LIBDIR = $(ABS_LIBDIR) - endif - PKGCONFIG_KISSFFT_PKGINCLUDEDIR = $${includedir}/kissfft --endif - - export TYPEFLAGS - -@@ -226,7 +224,6 @@ ifneq ($(KISSFFT_STATIC), 1) - ln -sf $(KISSFFTLIB_NAME) $(KISSFFTLIB_SODEVELNAME) - endif - endif --ifneq ($(shell uname -s),Darwin) - mkdir "$(ABS_LIBDIR)/pkgconfig" - sed \ - -e 's+@PKGCONFIG_KISSFFT_VERSION@+$(PKGCONFIG_KISSFFT_VERSION)+' \ -@@ -238,7 +235,6 @@ ifneq ($(shell uname -s),Darwin) - -e 's+@PKGCONFIG_KISSFFT_LIBDIR@+$(PKGCONFIG_KISSFFT_LIBDIR)+' \ - -e 's+@PKGCONFIG_KISSFFT_PKGINCLUDEDIR@+$(PKGCONFIG_KISSFFT_PKGINCLUDEDIR)+' \ - kissfft.pc.in 1>"$(ABS_LIBDIR)/pkgconfig/$(KISSFFT_PKGCONFIG)" --endif - ifneq ($(KISSFFT_TOOLS), 0) - make -C tools install - endif --- -2.29.3 - diff --git a/pkgs/by-name/ki/kissfft/fix-fftw-dependency-check.patch b/pkgs/by-name/ki/kissfft/fix-fftw-dependency-check.patch new file mode 100644 index 000000000000..0e2cf0c9c452 --- /dev/null +++ b/pkgs/by-name/ki/kissfft/fix-fftw-dependency-check.patch @@ -0,0 +1,23 @@ +From a73134e594d85abc32e27a34a78ce75c5f006f92 Mon Sep 17 00:00:00 2001 +From: Emily +Date: Sat, 3 Aug 2024 17:49:57 +0100 +Subject: [PATCH] Fix FFTW dependency check + +`KISFFT_FLOAT` is not defined anywhere. +--- + test/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 0a0e403..d7d8350 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -24,7 +24,7 @@ add_kissfft_test_executable(bm_kiss benchkiss.c pstats.c) + # set_tests_properties(${NAME} PROPERTIES TIMEOUT 3600) + + include(FindPkgConfig) +-if(KISSFFT_FLOAT) ++if(KISSFFT_DATATYPE MATCHES "^float$") + set(fftw3_pkg fftw3f) + else() + set(fftw3_pkg fftw3) diff --git a/pkgs/by-name/ki/kissfft/package.nix b/pkgs/by-name/ki/kissfft/package.nix index e7bb8aecca29..1480d73b537e 100644 --- a/pkgs/by-name/ki/kissfft/package.nix +++ b/pkgs/by-name/ki/kissfft/package.nix @@ -2,87 +2,85 @@ lib, stdenv, fetchFromGitHub, + cmake, + ninja, + pkg-config, fftw, fftwFloat, python3, datatype ? "double", - withTools ? false, libpng, enableStatic ? stdenv.hostPlatform.isStatic, enableOpenmp ? false, llvmPackages, }: -let - py = python3.withPackages (ps: with ps; [ numpy ]); - option = cond: if cond then "1" else "0"; -in -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "kissfft-${datatype}${lib.optionalString enableOpenmp "-openmp"}"; version = "131.1.0"; + outputs = [ + "bin" + "dev" + "out" + ]; + src = fetchFromGitHub { owner = "mborgerding"; repo = "kissfft"; - rev = version; - sha256 = "1yfws5bn4kh62yk6hdyp9h9775l6iz7wsfisbn58jap6b56s8j5s"; + rev = finalAttrs.version; + hash = "sha256-ukikTVnmKomKXTo6zc+PhpZzEkzXN2imFwZOYlfR3Pk="; }; - patches = [ ./0001-pkgconfig-darwin.patch ]; + patches = [ + # Fix FFTW dependency check + # https://github.com/mborgerding/kissfft/pull/95 + ./fix-fftw-dependency-check.patch + ]; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = + lib.optionals (datatype != "simd") [ libpng ] + # TODO: This may mismatch the LLVM version in the stdenv, see #79818. + ++ lib.optional (enableOpenmp && stdenv.cc.isClang) llvmPackages.openmp; + + nativeCheckInputs = [ (python3.withPackages (ps: [ ps.numpy ])) ]; + + checkInputs = [ (if datatype == "float" then fftwFloat else fftw) ]; + + cmakeFlags = [ + (lib.cmakeFeature "KISSFFT_DATATYPE" datatype) + (lib.cmakeBool "KISSFFT_STATIC" enableStatic) + # `test/testkiss.py` expects this… + (lib.cmakeFeature "KISSFFT_OPENMP" (if enableOpenmp then "ON" else "OFF")) + ]; + + # Required for `test/testcpp.c`. + env = { + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__MATH_LONG_DOUBLE_CONSTANTS=1"; + }; + + doCheck = true; # https://bugs.llvm.org/show_bug.cgi?id=45034 postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "10") '' - substituteInPlace test/Makefile \ + substituteInPlace CMakeLists.txt \ --replace "-ffast-math" "" - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin) '' - substituteInPlace test/Makefile \ - --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" - # Don't know how to make math.h's double long constants available - substituteInPlace test/testcpp.cc \ - --replace "M_PIl" "M_PI" - ''; + ''; - makeFlags = [ - "PREFIX=${placeholder "out"}" - "KISSFFT_DATATYPE=${datatype}" - "KISSFFT_TOOLS=${option withTools}" - "KISSFFT_STATIC=${option enableStatic}" - "KISSFFT_OPENMP=${option enableOpenmp}" - ]; - - buildInputs = - lib.optionals (withTools && datatype != "simd") [ libpng ] - # TODO: This may mismatch the LLVM version in the stdenv, see #79818. - ++ lib.optional (enableOpenmp && stdenv.cc.isClang) llvmPackages.openmp; - - doCheck = true; - - nativeCheckInputs = [ - py - (if datatype == "float" then fftwFloat else fftw) - ]; - - checkFlags = [ "testsingle" ]; - - postInstall = '' - ln -s ${pname}.pc $out/lib/pkgconfig/kissfft.pc - ''; - - # Tools can't find kissfft libs on Darwin - postFixup = lib.optionalString (withTools && stdenv.hostPlatform.isDarwin) '' - for bin in $out/bin/*; do - install_name_tool -change lib${pname}.dylib $out/lib/lib${pname}.dylib $bin - done - ''; - - meta = with lib; { + meta = { description = "Mixed-radix Fast Fourier Transform based up on the KISS principle"; homepage = "https://github.com/mborgerding/kissfft"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) From b7ac426794488568f89a71a0d5d3d8ad528bbc20 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 3 Aug 2024 17:59:08 +0100 Subject: [PATCH 71/78] qm-dsp: fix kissfft include path Please use `pkg-config`, people! --- pkgs/development/libraries/audio/qm-dsp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix index 06b08b7e0c92..2201f02c62e8 100644 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { rmdir $out/include/qm-dsp ''; - env.NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude kissfft}/include/kissfft"; meta = with lib; { description = "C++ library of functions for DSP and Music Informatics purposes"; From 9561c35c47c271a3077420d4fcb82835b52fbcb2 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 3 Aug 2024 16:32:14 +0100 Subject: [PATCH 72/78] musly: move to `pkgs/by-name` --- .../audio/musly/default.nix => by-name/mu/musly/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/musly/default.nix => by-name/mu/musly/package.nix} (100%) diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/by-name/mu/musly/package.nix similarity index 100% rename from pkgs/applications/audio/musly/default.nix rename to pkgs/by-name/mu/musly/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e702709f774d..8a3bec9f490e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38777,8 +38777,6 @@ with pkgs; museeks = callPackage ../applications/audio/museeks { }; - musly = callPackage ../applications/audio/musly { }; - mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; mynewt-newtmgr = callPackage ../tools/misc/mynewt-newtmgr { }; From cbb58be8c2f7329d200793e384f2c0ebe6268472 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 3 Aug 2024 16:32:37 +0100 Subject: [PATCH 73/78] musly: format with `nixfmt-rfc-style` --- pkgs/by-name/mu/musly/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/musly/package.nix b/pkgs/by-name/mu/musly/package.nix index 1f8e1a9f3aef..e68f0a02f931 100644 --- a/pkgs/by-name/mu/musly/package.nix +++ b/pkgs/by-name/mu/musly/package.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg_4 }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + eigen, + ffmpeg_4, +}: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -9,7 +16,10 @@ stdenv.mkDerivation { sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen ffmpeg_4 ]; + buildInputs = [ + eigen + ffmpeg_4 + ]; fixupPhase = lib.optionalString stdenv.isDarwin '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly From c3c5af2c4bdfcfc303463fc86e25d8b3bcda4fc7 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 00:35:15 +0100 Subject: [PATCH 74/78] musly: unstable-2017-04-26 -> 0.1-unstable-2019-09-05 --- pkgs/by-name/mu/musly/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/mu/musly/package.nix b/pkgs/by-name/mu/musly/package.nix index e68f0a02f931..48c11111b946 100644 --- a/pkgs/by-name/mu/musly/package.nix +++ b/pkgs/by-name/mu/musly/package.nix @@ -3,19 +3,24 @@ stdenv, fetchFromGitHub, cmake, + ninja, eigen, ffmpeg_4, }: stdenv.mkDerivation { pname = "musly"; - version = "unstable-2017-04-26"; + version = "0.1-unstable-2019-09-05"; + src = fetchFromGitHub { owner = "dominikschnitzer"; repo = "musly"; - rev = "f911eacbbe0b39ebe87cb37d0caef09632fa40d6"; - sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; + rev = "7a0c6a9a2782e6fca84fb86fce5232a8c8a104ed"; + hash = "sha256-DOvGGx3pCcvPPsT97sQlINjT1sJy8ZWvxLsFGGZbgzE="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ninja + ]; buildInputs = [ eigen ffmpeg_4 @@ -26,7 +31,7 @@ stdenv.mkDerivation { install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib ''; - meta = with lib; { + meta = { homepage = "https://www.musly.org"; description = "Fast and high-quality audio music similarity library written in C/C++"; longDescription = '' @@ -36,9 +41,9 @@ stdenv.mkDerivation { or try the command line application included in the package and start generating some automatic music playlists right away. ''; - license = licenses.mpl20; - maintainers = with maintainers; [ ggpeti ]; - platforms = with platforms; darwin ++ linux; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ ggpeti ]; + platforms = lib.platforms.unix; mainProgram = "musly"; }; } From 7245ee2b5da08f4288cc0e6342745462b21d7dae Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 00:35:15 +0100 Subject: [PATCH 75/78] musly: add patches for FFmpeg 7, C++17, and external deps --- .../musly/0001-Fix-build-with-FFmpeg-7.patch | 341 ++++++++++++++++++ .../mu/musly/0002-Fix-build-with-C-17.patch | 35 ++ .../0003-Modernize-CMake-build-system.patch | 151 ++++++++ ...nfig-to-find-libresample-and-kissfft.patch | 110 ++++++ pkgs/by-name/mu/musly/package.nix | 37 +- 5 files changed, 667 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/mu/musly/0001-Fix-build-with-FFmpeg-7.patch create mode 100644 pkgs/by-name/mu/musly/0002-Fix-build-with-C-17.patch create mode 100644 pkgs/by-name/mu/musly/0003-Modernize-CMake-build-system.patch create mode 100644 pkgs/by-name/mu/musly/0004-Use-pkg-config-to-find-libresample-and-kissfft.patch diff --git a/pkgs/by-name/mu/musly/0001-Fix-build-with-FFmpeg-7.patch b/pkgs/by-name/mu/musly/0001-Fix-build-with-FFmpeg-7.patch new file mode 100644 index 000000000000..13fbe6a374c3 --- /dev/null +++ b/pkgs/by-name/mu/musly/0001-Fix-build-with-FFmpeg-7.patch @@ -0,0 +1,341 @@ +From ab430ea4460aba050d97d3e3a712a3b6dd809db9 Mon Sep 17 00:00:00 2001 +From: Emily +Date: Mon, 15 Jul 2024 00:41:04 +0100 +Subject: [PATCH 1/4] Fix build with FFmpeg 7 + +--- + libmusly/CMakeLists.txt | 5 -- + libmusly/decoders/libav.cpp | 136 +++++++++++------------------------- + 2 files changed, 42 insertions(+), 99 deletions(-) + +diff --git a/libmusly/CMakeLists.txt b/libmusly/CMakeLists.txt +index d6d3680..98151df 100644 +--- a/libmusly/CMakeLists.txt ++++ b/libmusly/CMakeLists.txt +@@ -16,11 +16,6 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external") + PROPERTIES COMPILE_FLAGS "-DLIBMUSLY_EXTERNAL ${LIBMUSLY_EXTERNAL_FLAGS}") + endif() + +-if(EXISTS "${LIBAV_INCLUDE_DIRS}/libavutil/channel_layout.h") +- set_source_files_properties(decoders/libav.cpp +- PROPERTIES COMPILE_FLAGS "-DHAVE_AVUTIL_CHANNEL_LAYOUT") +-endif() +- + if(USE_OPENMP AND OPENMP_FOUND) + # disable OpenMP for kiss FFT, it slows things down terribly + set_source_files_properties(kissfft/kiss_fft.c +diff --git a/libmusly/decoders/libav.cpp b/libmusly/decoders/libav.cpp +index a78b904..90f93ae 100644 +--- a/libmusly/decoders/libav.cpp ++++ b/libmusly/decoders/libav.cpp +@@ -20,37 +20,13 @@ + extern "C" { + #include + #include +-#ifdef HAVE_AVUTIL_CHANNEL_LAYOUT + #include +-#endif + } + + #include "minilog.h" + #include "resampler.h" + #include "libav.h" + +-// We define some macros to be compatible to different libav versions +-// without spreading #if and #else all over the place. +-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 45, 101) +-#define AV_FRAME_ALLOC avcodec_alloc_frame +-#define AV_FRAME_UNREF avcodec_get_frame_defaults +-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0) +-#define AV_FRAME_FREE(X) av_free(*(X)) +-#else +-#define AV_FRAME_FREE avcodec_free_frame +-#endif +-#else +-#define AV_FRAME_ALLOC av_frame_alloc +-#define AV_FRAME_UNREF av_frame_unref +-#define AV_FRAME_FREE av_frame_free +-#endif +- +-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 7, 0) +-#define AV_PACKET_UNREF av_free_packet +-#else +-#define AV_PACKET_UNREF av_packet_unref +-#endif +- + namespace musly { + namespace decoders { + +@@ -58,12 +34,6 @@ MUSLY_DECODER_REGIMPL(libav, 0); + + libav::libav() + { +-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100) +- av_register_all(); +-#endif +-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100) +- avcodec_register_all(); +-#endif + } + + int +@@ -177,13 +147,7 @@ libav::decodeto_22050hz_mono_float( + AVStream *st = fmtx->streams[audio_stream_idx]; + + // find a decoder for the stream +-#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 14, 0)) || ((LIBAVCODEC_VERSION_MICRO >= 100) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 33, 100))) +- // old libav version (libavcodec < 57.14 for libav, < 57.33 for ffmpeg): +- // stream has a codec context we can use +- AVCodecContext *decx = st->codec; +- #define AVCODEC_FREE_CONTEXT(x) +-#else +- // new libav version: need to create codec context for stream ++ // need to create codec context for stream + AVCodecParameters *decp = st->codecpar; + AVCodecContext *decx = avcodec_alloc_context3(NULL); + if (!decx) { +@@ -200,71 +164,63 @@ libav::decodeto_22050hz_mono_float( + avformat_close_input(&fmtx); + return std::vector(0); + } +- #if LIBAVCODEC_VERSION_MICRO >= 100 +- #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,3,102) +- // only available in ffmpeg, deprecated after 58 +- av_codec_set_pkt_timebase(decx, st->time_base); +- #endif +- #endif +- #define AVCODEC_FREE_CONTEXT(x) avcodec_free_context(x) +-#endif +- AVCodec *dec = avcodec_find_decoder(decx->codec_id); ++ const AVCodec *dec = avcodec_find_decoder(decx->codec_id); + if (!dec) { + MINILOG(logERROR) << "Could not find codec."; + +- AVCODEC_FREE_CONTEXT(&decx); ++ avcodec_free_context(&decx); + avformat_close_input(&fmtx); + return std::vector(0); + } + + // open the decoder + // (kindly ask for stereo downmix and floats, but not all decoders care) +- decx->request_channel_layout = AV_CH_LAYOUT_STEREO_DOWNMIX; + decx->request_sample_fmt = AV_SAMPLE_FMT_FLT; + #ifdef _OPENMP + #pragma omp critical + #endif + { +- avret = avcodec_open2(decx, dec, NULL); ++ AVDictionary *options = NULL; ++ av_dict_set(&options, "downmix", "stereo", 0); ++ avret = avcodec_open2(decx, dec, &options); + } + if (avret < 0) { + MINILOG(logERROR) << "Could not open codec."; + +- AVCODEC_FREE_CONTEXT(&decx); ++ avcodec_free_context(&decx); + avformat_close_input(&fmtx); + return std::vector(0); + } + + // Currently only mono and stereo files are supported. +- if ((decx->channels != 1) && (decx->channels != 2)) { ++ if ((decx->ch_layout.nb_channels != 1) && (decx->ch_layout.nb_channels != 2)) { + MINILOG(logWARNING) << "Unsupported number of channels: " +- << decx->channels; ++ << decx->ch_layout.nb_channels; + +- AVCODEC_FREE_CONTEXT(&decx); ++ avcodec_free_context(&decx); + avformat_close_input(&fmtx); + return std::vector(0); + } + + // allocate a frame +- AVFrame* frame = AV_FRAME_ALLOC(); ++ AVFrame* frame = av_frame_alloc(); + if (!frame) { + MINILOG(logWARNING) << "Could not allocate frame"; + +- AVCODEC_FREE_CONTEXT(&decx); ++ avcodec_free_context(&decx); + avformat_close_input(&fmtx); + return std::vector(0); + } + + // allocate and initialize a packet +- AVPacket pkt; +- av_init_packet(&pkt); +- pkt.data = NULL; +- pkt.size = 0; ++ AVPacket* pkt = av_packet_alloc(); ++ pkt->data = NULL; ++ pkt->size = 0; + int got_frame = 0; + + // configuration + const int input_stride = av_get_bytes_per_sample(decx->sample_fmt); +- const int num_planes = av_sample_fmt_is_planar(decx->sample_fmt) ? decx->channels : 1; ++ const int num_planes = av_sample_fmt_is_planar(decx->sample_fmt) ? decx->ch_layout.nb_channels : 1; + const int output_stride = sizeof(float) * num_planes; + int decode_samples; // how many samples to decode; zero to decode all + +@@ -296,7 +252,7 @@ libav::decodeto_22050hz_mono_float( + // fault when trying to access frame->data[i] for i > 0 further below) + if ((excerpt_start > 0) and (av_seek_frame(fmtx, audio_stream_idx, + excerpt_start * st->time_base.den / st->time_base.num, +- AVSEEK_FLAG_BACKWARD || AVSEEK_FLAG_ANY) >= 0)) { ++ AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)) { + // skipping went fine: decode only what's needed + decode_samples = excerpt_length * decx->sample_rate; + excerpt_start = 0; +@@ -333,7 +289,7 @@ libav::decodeto_22050hz_mono_float( + // excerpt_start tells us up to how many seconds to cut from the beginning. + + // read packets +- const int channels = decx->channels; ++ const int channels = decx->ch_layout.nb_channels; + const int sample_rate = decx->sample_rate; + float* buffer = NULL; + int buffersize = 0; +@@ -344,35 +300,29 @@ libav::decodeto_22050hz_mono_float( + { + // skip all frames that are not part of the audio stream, and spurious + // frames possibly found after seeking (wrong channels / sample_rate) +- while (((avret = av_read_frame(fmtx, &pkt)) >= 0) +- && ((pkt.stream_index != audio_stream_idx) || +- (decx->channels != channels) || ++ while (((avret = av_read_frame(fmtx, pkt)) >= 0) ++ && ((pkt->stream_index != audio_stream_idx) || ++ (decx->ch_layout.nb_channels != channels) || + (decx->sample_rate != sample_rate))) + { +- AV_PACKET_UNREF(&pkt); ++ av_packet_unref(pkt); + MINILOG(logTRACE) << "Skipping frame..."; + } + if (avret < 0) { + // stop decoding if av_read_frame() failed +- AV_PACKET_UNREF(&pkt); ++ av_packet_unref(pkt); + break; + } + +- uint8_t* data = pkt.data; +- int size = pkt.size; +- while (pkt.size > 0) { ++ uint8_t* data = pkt->data; ++ int size = pkt->size; ++ while (pkt->size > 0) { + + // try to decode a frame +- AV_FRAME_UNREF(frame); ++ av_frame_unref(frame); + + int len = 0; + got_frame = 0; +-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 48, 101) +- len = avcodec_decode_audio4(decx, frame, &got_frame, &pkt); +- if (len < 0) { +- avret = AVERROR(EINVAL); +- } +-#else + avret = avcodec_receive_frame(decx, frame); + if (avret == 0) { + got_frame = 1; +@@ -381,14 +331,13 @@ libav::decodeto_22050hz_mono_float( + avret = 0; + } + if (avret == 0) { +- avret = avcodec_send_packet(decx, &pkt); ++ avret = avcodec_send_packet(decx, pkt); + if (avret == 0) { +- len = pkt.size; ++ len = pkt->size; + } else if (avret == AVERROR(EAGAIN)) { + avret = 0; + } + } +-#endif + if (avret < 0) { + MINILOG(logWARNING) << "Error decoding an audio frame"; + +@@ -400,8 +349,8 @@ libav::decodeto_22050hz_mono_float( + + // if too many frames failed decoding, abort + MINILOG(logERROR) << "Too many errors, aborting."; +- AV_FRAME_FREE(&frame); +- AV_PACKET_UNREF(&pkt); ++ av_frame_free(&frame); ++ av_packet_unref(pkt); + avformat_close_input(&fmtx); + if (buffer) { + delete[] buffer; +@@ -414,7 +363,7 @@ libav::decodeto_22050hz_mono_float( + // if we got a frame + if (got_frame) { + // do we need to increase the buffer size? +- int input_samples = frame->nb_samples*decx->channels; ++ int input_samples = frame->nb_samples*decx->ch_layout.nb_channels; + if (input_samples > buffersize) { + if (buffer) { + delete[] buffer; +@@ -434,8 +383,8 @@ libav::decodeto_22050hz_mono_float( + input_samples / num_planes) < 0) { + MINILOG(logERROR) << "Strange sample format. Abort."; + +- AV_FRAME_FREE(&frame); +- AV_PACKET_UNREF(&pkt); ++ av_frame_free(&frame); ++ av_packet_unref(pkt); + avformat_close_input(&fmtx); + if (buffer) { + delete[] buffer; +@@ -445,7 +394,7 @@ libav::decodeto_22050hz_mono_float( + } + + // inplace downmix to mono, if required +- if (decx->channels == 2) { ++ if (decx->ch_layout.nb_channels == 2) { + for (int i = 0; i < frame->nb_samples; i++) { + buffer[i] = (buffer[i*2] + buffer[i*2+1]) / 2.0f; + } +@@ -457,13 +406,13 @@ libav::decodeto_22050hz_mono_float( + } + + // consume the packet +- pkt.data += len; +- pkt.size -= len; ++ pkt->data += len; ++ pkt->size -= len; + } +- pkt.data = data; +- pkt.size = size; ++ pkt->data = data; ++ pkt->size = size; + +- AV_PACKET_UNREF(&pkt); ++ av_packet_unref(pkt); + } + MINILOG(logTRACE) << "Decoding loop finished."; + +@@ -514,13 +463,12 @@ libav::decodeto_22050hz_mono_float( + if (buffer) { + delete[] buffer; + } +- AV_FRAME_FREE(&frame); ++ av_frame_free(&frame); + #ifdef _OPENMP + #pragma omp critical + #endif + { +- avcodec_close(decx); +- AVCODEC_FREE_CONTEXT(&decx); ++ avcodec_free_context(&decx); + avformat_close_input(&fmtx); + } + +-- +2.45.2 + diff --git a/pkgs/by-name/mu/musly/0002-Fix-build-with-C-17.patch b/pkgs/by-name/mu/musly/0002-Fix-build-with-C-17.patch new file mode 100644 index 000000000000..f128bd4d0c02 --- /dev/null +++ b/pkgs/by-name/mu/musly/0002-Fix-build-with-C-17.patch @@ -0,0 +1,35 @@ +From 75efe27cbb03f2883e53e7a7f68386d93e2c1874 Mon Sep 17 00:00:00 2001 +From: Emily +Date: Sat, 3 Aug 2024 12:17:19 +0100 +Subject: [PATCH 2/4] Fix build with C++17 + +--- + musly/main.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/musly/main.cpp b/musly/main.cpp +index a9644f2..bb8b7ae 100644 +--- a/musly/main.cpp ++++ b/musly/main.cpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -239,7 +240,9 @@ tracks_initialize( + else { + // use a random subset of 1000 tracks + std::vector tracks2(tracks); +- std::random_shuffle(tracks2.begin(), tracks2.end()); ++ std::random_device seeder; ++ std::default_random_engine rng(seeder()); ++ std::shuffle(tracks2.begin(), tracks2.end(), rng); + ret = musly_jukebox_setmusicstyle(mj, tracks2.data(), 1000); + } + if (ret != 0) { +-- +2.45.2 + diff --git a/pkgs/by-name/mu/musly/0003-Modernize-CMake-build-system.patch b/pkgs/by-name/mu/musly/0003-Modernize-CMake-build-system.patch new file mode 100644 index 000000000000..3696fee9ba40 --- /dev/null +++ b/pkgs/by-name/mu/musly/0003-Modernize-CMake-build-system.patch @@ -0,0 +1,151 @@ +From 8abe6385e433b44c43134b4deef208c7498ab0d7 Mon Sep 17 00:00:00 2001 +From: Emily +Date: Sat, 3 Aug 2024 12:21:12 +0100 +Subject: [PATCH 3/4] Modernize CMake build system + +Use GNUInstallDirs, CTest, and FindPkgConfig. +--- + .travis.yml | 2 +- + CMakeLists.txt | 25 +++++++++++-------------- + libmusly/CMakeLists.txt | 11 +++-------- + musly/CMakeLists.txt | 6 +----- + 4 files changed, 16 insertions(+), 28 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 8556b26..b051004 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -19,7 +19,7 @@ matrix: + script: + - mkdir -p build + - cd build +- - cmake -DBUILD_TEST=ON .. ++ - cmake .. + - make -j + - ctest -V + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4fab4ab..8d8bf0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,9 +4,11 @@ + # (c) 2013-2014, Dominik Schnitzer + # 2014, Jan Schlueter + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.17) + + project(musly) ++include(GNUInstallDirs) ++include(CTest) + set(MUSLY_VERSION "0.2") + add_definitions(-DMUSLY_VERSION="${MUSLY_VERSION}") + +@@ -36,8 +38,6 @@ else () + set(BUILD_SHARED_LIBS ON) + endif () + +-option(BUILD_TEST "Build selftest executable" OFF) +- + option(USE_OPENMP "Compile with OpenMP support (Parallelization)" OFF) + if (USE_OPENMP) + find_package(OpenMP) +@@ -54,26 +54,23 @@ if (USE_OPENMP) + endif() + endif () + +-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +- +-find_package(Eigen3 REQUIRED) +-find_package(LibAV 0.8 COMPONENTS avcodec avformat avutil REQUIRED) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(EIGEN3 REQUIRED IMPORTED_TARGET eigen3) ++pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET ++ libavcodec ++ libavformat ++ libavutil) + + include_directories( +- "${PROJECT_BINARY_DIR}" + "${PROJECT_SOURCE_DIR}/include") + + add_subdirectory(libmusly) + add_subdirectory(musly) + add_subdirectory(include) +-if (BUILD_TEST) +- enable_testing() ++if (BUILD_TESTING) + add_subdirectory(test) + endif () + + # Documentation + set(musly_DOC_FILES AUTHORS COPYING README.md) +-set(musly_DOC_PATH "share/doc/musly") +-install(FILES ${musly_DOC_FILES} +- DESTINATION ${musly_DOC_PATH}) +- ++install(FILES ${musly_DOC_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR}) +diff --git a/libmusly/CMakeLists.txt b/libmusly/CMakeLists.txt +index 98151df..b9f6d11 100644 +--- a/libmusly/CMakeLists.txt ++++ b/libmusly/CMakeLists.txt +@@ -4,9 +4,6 @@ + # (c) 2013-2014, Dominik Schnitzer + # 2014-2016, Jan Schlueter + +-add_subdirectory( +- libresample) +- + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external") + add_subdirectory( + external) +@@ -24,8 +21,6 @@ endif() + + include_directories( + ${LIBMUSLY_INCLUDE} +- ${EIGEN3_INCLUDE_DIR} +- ${LIBAV_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR}) + + add_library(libmusly +@@ -60,7 +55,8 @@ set_target_properties(libmusly + + target_link_libraries(libmusly + ${LIBMUSLY_LIBS} +- ${LIBAV_LIBRARIES}) ++ PkgConfig::EIGEN3 ++ PkgConfig::FFMPEG) + if(WIN32 OR MINGW) + # link against winsock2 for ntohl() and htonl() + target_link_libraries(libmusly ws2_32) +@@ -69,5 +65,4 @@ endif() + set_target_properties(libmusly + PROPERTIES PREFIX "") + +-install(TARGETS libmusly +- DESTINATION lib) ++install(TARGETS libmusly) +diff --git a/musly/CMakeLists.txt b/musly/CMakeLists.txt +index 88d153b..846ed2c 100644 +--- a/musly/CMakeLists.txt ++++ b/musly/CMakeLists.txt +@@ -3,10 +3,6 @@ + + # (c) 2013, Dominik Schnitzer + +-include_directories( +- ${EIGEN3_INCLUDE_DIR}) +- +- + add_executable(musly + tools.cpp + fileiterator.cpp +@@ -17,4 +13,4 @@ add_executable(musly + target_link_libraries(musly + libmusly) + +-install(TARGETS musly DESTINATION bin) ++install(TARGETS musly) +-- +2.45.2 + diff --git a/pkgs/by-name/mu/musly/0004-Use-pkg-config-to-find-libresample-and-kissfft.patch b/pkgs/by-name/mu/musly/0004-Use-pkg-config-to-find-libresample-and-kissfft.patch new file mode 100644 index 000000000000..c7f893a6a866 --- /dev/null +++ b/pkgs/by-name/mu/musly/0004-Use-pkg-config-to-find-libresample-and-kissfft.patch @@ -0,0 +1,110 @@ +From e4a0d0b48905bb949831c30c941e921da0b6f09c Mon Sep 17 00:00:00 2001 +From: Emily +Date: Sat, 3 Aug 2024 12:21:12 +0100 +Subject: [PATCH 4/4] Use pkg-config to find libresample and kissfft + +--- + .travis.yml | 2 ++ + CMakeLists.txt | 12 ++++++++++++ + libmusly/CMakeLists.txt | 12 +++--------- + libmusly/powerspectrum.h | 2 +- + libmusly/resampler.h | 2 +- + 5 files changed, 19 insertions(+), 11 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index b051004..b354641 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -31,3 +31,5 @@ addons: + - libavcodec-dev + - libavformat-dev + - libavutil-dev ++ - libresample-dev ++ - libkissfft-dev +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d8bf0e..c5b0d2c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,6 +60,18 @@ pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET + libavcodec + libavformat + libavutil) ++pkg_check_modules(LIBRESAMPLE REQUIRED IMPORTED_TARGET libresample) ++pkg_search_module(KISSFFT REQUIRED IMPORTED_TARGET ++ kissfft-simd ++ kissfft-double ++ kissfft-float ++ kissfft-int32_t ++ kissfft-int16_t ++ kissfft-simd-openmp ++ kissfft-double-openmp ++ kissfft-float-openmp ++ kissfft-int32_t-openmp ++ kissfft-int16_t-openmp) + + include_directories( + "${PROJECT_SOURCE_DIR}/include") +diff --git a/libmusly/CMakeLists.txt b/libmusly/CMakeLists.txt +index b9f6d11..6f8c8e9 100644 +--- a/libmusly/CMakeLists.txt ++++ b/libmusly/CMakeLists.txt +@@ -13,19 +13,11 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external") + PROPERTIES COMPILE_FLAGS "-DLIBMUSLY_EXTERNAL ${LIBMUSLY_EXTERNAL_FLAGS}") + endif() + +-if(USE_OPENMP AND OPENMP_FOUND) +- # disable OpenMP for kiss FFT, it slows things down terribly +- set_source_files_properties(kissfft/kiss_fft.c +- PROPERTIES COMPILE_FLAGS "-U_OPENMP") +-endif() +- + include_directories( + ${LIBMUSLY_INCLUDE} + ${CMAKE_CURRENT_SOURCE_DIR}) + + add_library(libmusly +- kissfft/kiss_fft.c +- kissfft/kiss_fftr.c + methods/mandelellis.cpp + methods/timbre.cpp + decoders/libav.cpp +@@ -56,7 +48,9 @@ set_target_properties(libmusly + target_link_libraries(libmusly + ${LIBMUSLY_LIBS} + PkgConfig::EIGEN3 +- PkgConfig::FFMPEG) ++ PkgConfig::FFMPEG ++ PkgConfig::LIBRESAMPLE ++ PkgConfig::KISSFFT) + if(WIN32 OR MINGW) + # link against winsock2 for ntohl() and htonl() + target_link_libraries(libmusly ws2_32) +diff --git a/libmusly/powerspectrum.h b/libmusly/powerspectrum.h +index 6957db4..096fc31 100644 +--- a/libmusly/powerspectrum.h ++++ b/libmusly/powerspectrum.h +@@ -14,7 +14,7 @@ + + #include + extern "C" { +- #include "kissfft/kiss_fftr.h" ++ #include + } + + +diff --git a/libmusly/resampler.h b/libmusly/resampler.h +index df8aaa4..f48e22a 100644 +--- a/libmusly/resampler.h ++++ b/libmusly/resampler.h +@@ -14,7 +14,7 @@ + + #include + extern "C" { +- #include "libresample/libresample.h" ++ #include + } + + namespace musly { +-- +2.45.2 + diff --git a/pkgs/by-name/mu/musly/package.nix b/pkgs/by-name/mu/musly/package.nix index 48c11111b946..25938c2059fa 100644 --- a/pkgs/by-name/mu/musly/package.nix +++ b/pkgs/by-name/mu/musly/package.nix @@ -4,32 +4,55 @@ fetchFromGitHub, cmake, ninja, + pkg-config, eigen, - ffmpeg_4, + ffmpeg_7, + libresample, + kissfft, }: + stdenv.mkDerivation { pname = "musly"; version = "0.1-unstable-2019-09-05"; + outputs = [ + "bin" + "dev" + "out" + "doc" + ]; + src = fetchFromGitHub { owner = "dominikschnitzer"; repo = "musly"; rev = "7a0c6a9a2782e6fca84fb86fce5232a8c8a104ed"; hash = "sha256-DOvGGx3pCcvPPsT97sQlINjT1sJy8ZWvxLsFGGZbgzE="; }; + + patches = [ + # Fix build with FFmpeg 7, C++17, and external libresample and kissfft + # https://github.com/dominikschnitzer/musly/pull/53 + # Last commit omitted, as it is a large non‐functional removal + ./0001-Fix-build-with-FFmpeg-7.patch + ./0002-Fix-build-with-C-17.patch + ./0003-Modernize-CMake-build-system.patch + ./0004-Use-pkg-config-to-find-libresample-and-kissfft.patch + ]; + nativeBuildInputs = [ cmake ninja + pkg-config ]; + buildInputs = [ eigen - ffmpeg_4 + ffmpeg_7 + libresample + kissfft ]; - fixupPhase = lib.optionalString stdenv.isDarwin '' - install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly - install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly - install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib - ''; + + doCheck = true; meta = { homepage = "https://www.musly.org"; From 7784cfde314469a28a8a5a8c5a0bbfa35e7bfc50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 22:32:13 +0000 Subject: [PATCH 76/78] python312Packages.airthings-ble: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/airthings-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 9e84b10802f9..766e321f45ea 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = "airthings-ble"; rev = "refs/tags/${version}"; - hash = "sha256-920Vgk8kY5NsjYrOGYoRtcdHl4KKO7ytieH8cJ0S3RE="; + hash = "sha256-pk/S0ufzirH4Xny0+nFVH366d0imqB2K6NvkGP7jAU4="; }; postPatch = '' From a07db3ad1cb8afe49a1de26cb0f27c372e068cef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 17:22:28 +0000 Subject: [PATCH 77/78] mediamtx: 1.8.5 -> 1.9.0 Co-authored-by: Franz Pletz --- pkgs/servers/mediamtx/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 0fb38244558b..ef30a8772f9a 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -8,23 +8,23 @@ let hlsJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.13/dist/hls.min.js"; - hash = "sha256-5XU7EPxl6uNfIYg+aE0ixDzmbelo01FmeSWFubij8aI="; + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.15/dist/hls.min.js"; + hash = "sha256-qRwhj9krOcLJKbGghAC8joXfNKXUdN7OkgEDosUWdd8="; }; in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.8.5"; + version = "1.9.0"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-wBavNhyscjWzgz+iwY2uB2vI8z0sWdfMM9Zpwi3obm4="; + hash = "sha256-iCUCQLMWB0cH9SuudP1KvSD1X58hvYgE30nIh2FpKlY="; }; - vendorHash = "sha256-UQM1MFDhIo2NkxHvr054SB0YzjP/LHDeS9An0k9Q6Ls="; + vendorHash = "sha256-TiI02M6k1zN/iWJntOfc9EY5xFo3ESOtdDSumxYmSU0="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js From dca28d1c9644a18dec92680f8c9a5c2c83b77c96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 22:22:11 +0000 Subject: [PATCH 78/78] python312Packages.iminuit: 2.28.0 -> 2.29.1 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 241599652ab5..0234210689c0 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.28.0"; + version = "2.29.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ZkauC2akdg4CzXNxHUYKbPI3U4K3jOg0QUF1FZVZaq0="; + hash = "sha256-R00Q6y+SS5Mg9vcJPkwUnQo4wSTQQZwSoHo+ypQt4CU="; }; nativeBuildInputs = [