Unverified Commit 50eb4d03 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 80fdc8b7 1641c8d3

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -11835,6 +11835,12 @@ 
    githubId = 26622971;

    name = "Ronnie Ebrin";

  };

  kraftnix = {

    email = "kraftnix@protonmail.com";

    github = "kraftnix";

    githubId = 83026656;

    name = "kraftnix";

  };

  kragniz = {

    email = "louis@kragniz.eu";

    github = "kragniz";

pkgs/applications/audio/adlplug/default.nix

+0 −38
Original line number Diff line number Diff line
@@ -12,22 +12,6 @@ 
, libXinerama

, libXext

, libXcursor

, Foundation

, Cocoa

, Carbon

, CoreServices

, ApplicationServices

, CoreAudio

, CoreMIDI

, AudioToolbox

, Accelerate

, CoreImage

, IOKit

, AudioUnit

, QuartzCore

, WebKit

, DiscRecording

, CoreAudioKit



  # Enabling JACK requires a JACK server at runtime, no fallback mechanism

, withJack ? false, jack
@@ -61,11 +45,6 @@ stdenv.mkDerivation rec { 
    "-DADLplug_Jack=${if withJack then "ON" else "OFF"}"

  ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [

    # "fp.h" file not found

    "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers"

  ]);



  NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [

    # Framework that JUCE needs which don't get linked properly

    "-framework CoreAudioKit"
@@ -96,23 +75,6 @@ stdenv.mkDerivation rec { 
    libXinerama

    libXext

    libXcursor

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    Foundation

    Cocoa

    Carbon

    CoreServices

    ApplicationServices

    CoreAudio

    CoreMIDI

    AudioToolbox

    Accelerate

    CoreImage

    IOKit

    AudioUnit

    QuartzCore

    WebKit

    DiscRecording

    CoreAudioKit

  ] ++ lib.optional withJack jack;



  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

pkgs/applications/editors/eclipse/default.nix

+24 −24
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ 


let

  platform_major = "4";

  platform_minor = "32";

  platform_minor = "33";

  year = "2024";

  month = "06"; #release month

  buildmonth = "06"; #sometimes differs from release month

  timestamp = "${year}${buildmonth}010610";

  month = "09"; #release month

  buildmonth = "09"; #sometimes differs from release month

  timestamp = "${year}${buildmonth}030240";

  gtk = gtk3;

  arch = if stdenv.hostPlatform.isx86_64 then

    "x86_64"
@@ -43,8 +43,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-yMyigXPd6BhSiyoLTFQhBrHnatgXMw1BrH7xWfoT0Zo=";

          aarch64 = "sha256-YZ1MhvXWcYRgQ4ZR/hXEWNKmYji/9PyKbdnm27i8Vjs=";

          x86_64 = "sha256-zCIVlrr8CPRBiv1FOVHjoW7WcKC74V+JC2ciyiBuYOw=";

          aarch64 = "sha256-Lnwz8up/WoOdth0bxxePxagwkOaTljFYkCHHu5NoCPk=";

        }.${arch};

      };

  };
@@ -58,8 +58,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-dsl-${year}-${month}-R-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-m2kcsQicvZcIHAP0zcOGYQjS4vdiTo62o1cfDpG4Ea8=";

          aarch64 = "sha256-UuMfIO6jgMpAmtGihWdJZ7RwilBVdsCaPJH3tKdwyLY=";

          x86_64 = "sha256-a/Vnbm1zzay5GSsJbU3yFGs7fSBx77wvOHJdlEs8BjE=";

          aarch64 = "sha256-ghf0Q31cudxGDmYvLXyeqTYCpqIkZNp9y1Bd/izOSl4=";

        }.${arch};

      };

  };
@@ -73,8 +73,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-embedcpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-dpsdjBfF83B8wGwoIsT4QW/n4Qo/w+n4mNYtILdCJKw=";

          aarch64 = "sha256-kDPZJbrxEBhx/KI/9SqOtOOoMVWvYJqTLLgR9YPNH5A=";

          x86_64 = "sha256-6krmMvja30Jal1w4gi1NQSZpPxAMtjvs+tPtts+YuLA=";

          aarch64 = "sha256-qYzcR+4m8QAdV6JTvMuVU2h2oxVJGmyg9UJMibdkPxM=";

        }.${arch};

      };

  };
@@ -88,8 +88,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-vANUS1IbYrhrpNX095XIhpaHlZhTkZe894nhrDPndJc=";

          aarch64 = "sha256-ykw9Og4D3hVfUvJlbtSDUB7iOmDJ9gPVTmpXlGZX304=";

          x86_64 = "sha256-AFwJNQJdULmiID3JPjQG3L631ujaNYsaDJ3QT60WwSY=";

          aarch64 = "sha256-MbvWrgHhTS1odtFCdZYdTOYZNjhb3gqvjGO1dVfdokA=";

        }.${arch};

      };

  };
@@ -103,8 +103,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-ow4i9sDPQUAolzBymvucqpdZrn+bggxR6BD2RnyBVns=";

          aarch64 = "sha256-XZY7MQr1cCToIlEXSltxWRZbHu1Ex0wzLvL1nUhuKhw=";

          x86_64 = "sha256-6vNwys0HTaJdSl+1mK7hlGU0tQVyakvzrL0GZEObniQ=";

          aarch64 = "sha256-fERBf9bkGowZkRLQEMxLUB8qUVKZgRZOZjJEz+kc+WU=";

        }.${arch};

      };

  };
@@ -135,8 +135,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-zb6/AMe7ArSw1mzPIvaSVeuNly6WO7pHQAuYUT8eGkk=";

          aarch64 = "sha256-jgT3BpD04ELV2+WuRw1mbDw6S1SYDo7jfrijSNs8GLM=";

          x86_64 = "sha256-4eYdixsPswwsBWfRng5VPp+/39mDuAO7cHc6NS3VI7o=";

          aarch64 = "sha256-UUdm7YqLOTappGwEnM3frvGZcESuh3LVl1L/HoN88Ug=";

        }.${arch};

      };

  };
@@ -150,8 +150,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-fXfj0PImyd2nPUkaGvOu7BGAeIHkTocKH94oM/Vd+LU=";

          aarch64 = "sha256-0EZXbngXIso8fS8bvSDPyRGCre2dF0+6wyldQ6GhGmo=";

          x86_64 = "sha256-gAbc049iHCPwGohQwNG1pCejCpOh0qUsnjSZosedqUU=";

          aarch64 = "sha256-VpKs4O1Rxb/qhULUK+EPIPsGSH+qQJpNsDRGNX09Bj0=";

        }.${arch};

      };

  };
@@ -165,8 +165,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-YIoa837bbnqm/4wuwRfx+5UNxyQJySbTX+lhL/FluS0=";

          aarch64 = "sha256-0hwKU29RJdjyaF4ot0OpXt/illOsx1n38nhK5zteQBk=";

          x86_64 = "sha256-BLvjy4vBuvMt3mZccp+UWw9p58taWiyZkbwaeMOOBpU=";

          aarch64 = "sha256-5tGJoOPk56/0WVZAxB8VWryJmnHMr4gHQyjET9sB1Qk=";

        }.${arch};

      };

  };
@@ -180,8 +180,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-IFQkSOs0wk7chR9Ti3WG/7WDrXBWnaRH9AqC9jTmuT8=";

          aarch64 = "sha256-iiS3hZWfinHYVhZsMntXQp+OgL7kcE/2jqx2JomBdIk=";

          x86_64 = "sha256-IQL6dWNHg5DMVkR2XYge2jHmIwx8KS968k8EoS/II+A=";

          aarch64 = "sha256-ATni52tdHyaVvacSAiiOB6eN1zwS17VZazcsd6HOemA=";

        }.${arch};

      };

  };
@@ -195,8 +195,8 @@ in rec { 
      fetchurl {

        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";

        hash = {

          x86_64 = "sha256-+U3wHbUgxkqWZjZyAXAqkZHeoNp+CwL1NBO4myDdJhE=";

          aarch64 = "sha256-zDLt3lOqf2HyUP/oqbff6XupF2Vab7+gxpQriztunH4=";

          x86_64 = "sha256-BqRcUU6GivuPFzr3e2FX+ga5OVO8o7NzuXuqUu52pN4=";

          aarch64 = "sha256-lAsur73Z/EaKVLY9URoyvcvtD9LoOO7FG6l/lUtT8H8=";

        }.${arch};

      };

  };

pkgs/applications/editors/eclipse/update.sh

+3 −2
Original line number Diff line number Diff line
@@ -59,9 +59,10 @@ sed -i 's/64 = ".*";$/64 = "";/g' pkgs/applications/editors/eclipse/default.nix 
echo;

echo "paste the following url + hash blocks into pkgs/applications/editors/eclipse/default.nix:";



for u in $(grep 'url = ' pkgs/applications/editors/eclipse/default.nix | grep arch | cut -d '"' -f 2 | sed 's/&/\\&/g'); do

for url in $(grep 'url = ' pkgs/applications/editors/eclipse/default.nix | grep arch | cut -d '"' -f 2); do

    u=$(echo "$url" | sed 's/&/\\&/g');

    echo;

    echo "        url = \"${u}\";";

    echo "        url = \"${url}\";";

    echo "        hash = {";

    for arch in x86_64 aarch64; do

        us=$(eval echo "$u");

pkgs/applications/graphics/ImageMagick/default.nix

+8 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch2

, pkg-config

, libtool

, bzip2Support ? true, bzip2
@@ -59,6 +60,13 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-NrTIx1OvwPIeVlA39hGkXZ2Atk4FCsU3/55SZeSc40E=";

  };



  patches = [

    (fetchpatch2 {

      url = "https://github.com/ImageMagick/ImageMagick/commit/bf5650f0dd41b500102a129d6867cb568f4edee4.patch";

      hash = "sha256-nxvSTyNZ35DqjR41nM5uidWwRFWzd1e/LFE0n3fpbb8=";

    })

  ];



  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

  outputMan = "out"; # it's tiny