diff options
34 files changed, 350 insertions, 189 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f7d16df87249b..9e49990909692 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -32,4 +32,5 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module + - [ ] (Release notes changes) Ran `nixos/doc/manual/md-to-db.sh` to update generated release notes - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 43c1b669f2cdb..bc9aaed9c80af 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9827,12 +9827,6 @@ } ]; }; - rittelle = { - email = "rittelle@posteo.de"; - github = "rittelle"; - githubId = 33598633; - name = "Lennart Rittel"; - }; rixed = { email = "rixed-github@happyleptic.org"; github = "rixed"; diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index b19b688a1fb8a..b931b27ad8170 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -139,6 +139,7 @@ in { gzip gitMinimal config.nix.package.out + config.programs.ssh.package ]; script = let diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index 1187dd1ba26e5..8c37e8901a333 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,7 +1,24 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, which -, docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, intltool +, libtool +, pkg-config +, which +, docbook_xml_dtd_45 +, docbook_xsl +, gtkmm2 +, pangomm_2_42 +, libgig +, libsndfile +, libxslt }: +let + gtkmm2_with_pango242 = gtkmm2.override { pangomm = pangomm_2_42; }; +in stdenv.mkDerivation rec { pname = "gigedit"; version = "1.1.1"; @@ -15,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake intltool libtool pkg-config which ]; - buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ]; + buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2_with_pango242 libgig libsndfile libxslt ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix new file mode 100644 index 0000000000000..9d4118a439158 --- /dev/null +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -0,0 +1,118 @@ +{ coreutils +, fetchurl +, gawk +, gnused +, jdk8 +, lib +, makeDesktopItem +, makeWrapper +, stdenv +, writeScript +, writeTextFile +, recommendedUdevRules ? true +}: + +stdenv.mkDerivation rec { + pname = "roomeqwizard"; + version = "5.20.4"; + + src = fetchurl { + url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh"; + sha256 = "0m2b5hwazy4vyjk51cmayys250rircs3c0v7bv5mn28h7hyq29s8"; + }; + + dontUnpack = true; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "REW"; + genericName = "Software for audio measurements"; + categories = "AudioVideo;"; + }; + + responseFile = writeTextFile { + name = "response.varfile"; + text = '' + createDesktopLinkAction$Boolean=false + executeLauncherAction$Boolean=false + mem$Integer=1 + opengl$Boolean=false + sys.adminRights$Boolean=false + sys.installationDir=INSTALLDIR + sys.languageId=en + sys.programGroupDisabled$Boolean=true + ''; + }; + + udevRules = '' + # MiniDSP UMIK-1 calibrated USB microphone + SUBSYSTEM=="usb", ATTR{idVendor}=="2752", ATTR{idProduct}=="0007", TAG+="uaccess" + ''; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = '' + runHook preBuild + + # set JDK path in installer + sed -E 's|^#\s*(INSTALL4J_JAVA_HOME_OVERRIDE=)|\1${jdk8}|' $src > installer + chmod +x installer + + sed -e "s|INSTALLDIR|$out/share/roomeqwizard|" $responseFile > response.varfile + + export HOME=$PWD + + ./installer -q -varfile response.varfile + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/lib/udev/rules.d $out/share/icons/hicolor/256x256/apps + makeWrapper $out/share/roomeqwizard/roomeqwizard $out/bin/roomeqwizard \ + --set INSTALL4J_JAVA_HOME_OVERRIDE ${jdk8} \ + --prefix PATH : ${lib.makeBinPath [ coreutils gnused gawk ]} + + cp -r "$desktopItem/share/applications" $out/share/ + cp $out/share/roomeqwizard/.install4j/s_*.png "$out/share/icons/hicolor/256x256/apps/${pname}.png" + + ${lib.optionalString recommendedUdevRules ''echo "$udevRules" > $out/lib/udev/rules.d/90-roomeqwizard.rules''} + + runHook postInstall + ''; + + passthru.updateScript = writeScript "${pname}-update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts nixpkgs-fmt coreutils perl + + set -euo pipefail + + perlexpr='if (/current version.{1,10}v(\d+)\.(\d+)\.(\d+)/i) { print "$1.$2.$3"; break; }' + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestVersion="$(curl -sS https://www.roomeqwizard.com/index.html | perl -ne "$perlexpr")" + + if [ ! "$oldVersion" = "$latestVersion" ]; then + update-source-version ${pname} "$latestVersion" --version-key=version --print-changes + nixpkgs-fmt "pkgs/applications/audio/roomeqwizard/default.nix" + else + echo "${pname} is already up-to-date" + fi + ''; + + meta = with lib; { + homepage = "https://www.roomeqwizard.com/"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ zaninime ]; + description = "Room Acoustics Software"; + longDescription = '' + REW is free software for room acoustic measurement, loudspeaker + measurement and audio device measurement. + ''; + }; +} diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index 869a0f6ac6709..87bc95a249413 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -22,7 +22,7 @@ mkDerivation { homepage = "https://apps.kde.org/kalarm/"; description = "Personal alarm scheduler"; license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.rittelle ]; + maintainers = [ ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix index e73f6f13ce9fc..6d407e0a50d7f 100644 --- a/pkgs/applications/kde/kdebugsettings.nix +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -12,7 +12,7 @@ mkDerivation { homepage = "https://apps.kde.org/kdebugsettings/"; description = "KDE debug settings"; license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.rittelle ]; + maintainers = [ ]; broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/misc/index-fm/default.nix b/pkgs/applications/misc/index-fm/default.nix index b4f6b0ca4bec4..3165b3d34d6d6 100644 --- a/pkgs/applications/misc/index-fm/default.nix +++ b/pkgs/applications/misc/index-fm/default.nix @@ -17,14 +17,14 @@ mkDerivation rec { pname = "index"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "index-fm"; rev = "v${version}"; - sha256 = "sha256-aY8JBCIh6VyCDOGQIMWhO6asGMo6I6ZTgzpDnnDy9eo="; + sha256 = "sha256-Os/5igKGYBeY/FxO6I+7mpFohuk3yHGLd7vE2GewFpU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 193543ea54abd..7edec1f5a6250 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -150,7 +150,6 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl - ] ++ optionals (chromiumVersionAtLeast "96") [ libepoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 @@ -183,7 +182,7 @@ let substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi - chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "run_"}deno + chmod -x third_party/webgpu-cts/src/tools/run_deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 313a03d0dd2fe..d35d3fa75175c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "95.0.4638.69", - "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", - "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", + "version": "96.0.4664.45", + "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", + "sha256bin64": "0546i4yd1jahv088hjxpq0jc393pscvl5ap3s2qw5jrybliyfd2g", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-24", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "0153d369bbccc908f4da4993b1ba82728055926a", + "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" }, "ungoogled-patches": { - "rev": "95.0.4638.69-1", - "sha256": "19azr4m4rd6za9vgcggijyq9x54jrjp0n07y4falgjrdz9q4f7aj" + "rev": "96.0.4664.45-1", + "sha256": "1k0kf5ika1sz489bcbn485kmdq1xp7ssa80gbqrpd60xihkhnrm3" } } } diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 1a900e10197e3..2fb3b8c8b18c0 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -75,6 +75,6 @@ let homepage = "https://www.autodesk.com/products/eagle/overview"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.rittelle ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index a29d403672876..79d5664426bea 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: let - version = "1.3.4"; + version = "1.3.7"; name = "fricas-" + version; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "mirror://sourceforge/fricas/files/fricas/${version}/${name}-full.tar.bz2"; - sha256 = "156k9az1623y5808j845c56z2nvvdrm48dzg1v0ivpplyl7vp57x"; + url = "mirror://sourceforge/fricas/fricas/${version}/${name}-full.tar.bz2"; + sha256 = "sha256-cOqMvSe3ef/ZeVy5cj/VU/aTRtxgfxZfRbE4lWE5TU4="; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 97e707a587e3e..3183ca9bbe92d 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -19,96 +19,64 @@ , nv-codec-headers , lua , libuchardet -, libiconv ? null +, libiconv , CoreFoundation, Cocoa, CoreAudio, MediaPlayer , waylandSupport ? stdenv.isLinux - , wayland ? null - , wayland-protocols ? null - , libxkbcommon ? null + , wayland + , wayland-protocols + , libxkbcommon , x11Support ? stdenv.isLinux - , libGLU, libGL ? null - , libX11 ? null - , libXext ? null - , libXxf86vm ? null - , libXrandr ? null + , libGLU, libGL + , libX11 + , libXext + , libXxf86vm + , libXrandr , cddaSupport ? false - , libcdio ? null - , libcdio-paranoia ? null + , libcdio + , libcdio-paranoia , vulkanSupport ? stdenv.isLinux - , libplacebo ? null - , shaderc ? null - , vulkan-headers ? null - , vulkan-loader ? null + , libplacebo + , shaderc + , vulkan-headers + , vulkan-loader , drmSupport ? stdenv.isLinux - , libdrm ? null - , mesa ? null - -, alsaSupport ? stdenv.isLinux, alsa-lib ? null -, archiveSupport ? true, libarchive ? null -, bluraySupport ? true, libbluray ? null -, bs2bSupport ? true, libbs2b ? null -, cacaSupport ? true, libcaca ? null -, cmsSupport ? true, lcms2 ? null -, dvdnavSupport ? stdenv.isLinux, libdvdnav ? null -, jackaudioSupport ? false, libjack2 ? null -, libpngSupport ? true, libpng ? null -, openalSupport ? true, openalSoft ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null -, rubberbandSupport ? stdenv.isLinux, rubberband ? null -, screenSaverSupport ? true, libXScrnSaver ? null -, sdl2Support ? true, SDL2 ? null -, sixelSupport ? false, libsixel ? null -, speexSupport ? true, speex ? null -, swiftSupport ? false, swift ? null -, theoraSupport ? true, libtheora ? null -, vaapiSupport ? stdenv.isLinux, libva ? null -, vapoursynthSupport ? false, vapoursynth ? null -, vdpauSupport ? true, libvdpau ? null -, xineramaSupport ? stdenv.isLinux, libXinerama ? null -, xvSupport ? stdenv.isLinux, libXv ? null -, zimgSupport ? true, zimg ? null + , libdrm + , mesa + +, alsaSupport ? stdenv.isLinux, alsa-lib +, archiveSupport ? true, libarchive +, bluraySupport ? true, libbluray +, bs2bSupport ? true, libbs2b +, cacaSupport ? true, libcaca +, cmsSupport ? true, lcms2 +, dvdnavSupport ? stdenv.isLinux, libdvdnav +, jackaudioSupport ? false, libjack2 +, libpngSupport ? true, libpng +, openalSupport ? true, openalSoft +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, rubberbandSupport ? stdenv.isLinux, rubberband +, screenSaverSupport ? true, libXScrnSaver +, sdl2Support ? true, SDL2 +, sixelSupport ? false, libsixel +, speexSupport ? true, speex +, swiftSupport ? false, swift +, theoraSupport ? true, libtheora +, vaapiSupport ? stdenv.isLinux, libva +, vapoursynthSupport ? false, vapoursynth +, vdpauSupport ? true, libvdpau +, xineramaSupport ? stdenv.isLinux, libXinerama +, xvSupport ? stdenv.isLinux, libXv +, zimgSupport ? true, zimg }: with lib; let - available = x: x != null; -in -assert alsaSupport -> available alsa-lib; -assert archiveSupport -> available libarchive; -assert bluraySupport -> available libbluray; -assert bs2bSupport -> available libbs2b; -assert cacaSupport -> available libcaca; -assert cddaSupport -> all available [ libcdio libcdio-paranoia ]; -assert cmsSupport -> available lcms2; -assert drmSupport -> all available [ libdrm mesa ]; -assert dvdnavSupport -> available libdvdnav; -assert jackaudioSupport -> available libjack2; -assert libpngSupport -> available libpng; -assert openalSupport -> available openalSoft; -assert pulseSupport -> available libpulseaudio; -assert rubberbandSupport -> available rubberband; -assert screenSaverSupport -> available libXScrnSaver; -assert sdl2Support -> available SDL2; -assert sixelSupport -> available libsixel; -assert speexSupport -> available speex; -assert theoraSupport -> available libtheora; -assert vaapiSupport -> available libva; -assert vapoursynthSupport -> available vapoursynth; -assert vdpauSupport -> available libvdpau; -assert vulkanSupport -> all available [ libplacebo shaderc vulkan-headers vulkan-loader ]; -assert waylandSupport -> all available [ wayland wayland-protocols libxkbcommon ]; -assert x11Support -> all available [ libGLU libGL libX11 libXext libXxf86vm libXrandr ]; -assert xineramaSupport -> x11Support && available libXinerama; -assert xvSupport -> x11Support && available libXv; -assert zimgSupport -> available zimg; - -let luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); in stdenv.mkDerivation rec { @@ -127,8 +95,9 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs ./TOOLS/ ''; + NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " - + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; wafConfigureFlags = [ "--enable-libmpv-shared" @@ -227,18 +196,6 @@ in stdenv.mkDerivation rec { addOpenGLRunpath $out/bin/mpv ''; - meta = with lib; { - homepage = "https://mpv.io"; - description = "General-purpose media player, fork of MPlayer and mplayer2"; - longDescription = '' - mpv is a free and open-source general-purpose video player, based on the - MPlayer and mplayer2 projects, with great improvements above both. - ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; - platforms = platforms.darwin ++ platforms.linux; - }; - passthru = { inherit # The wrapper consults luaEnv and lua.version @@ -252,4 +209,16 @@ in stdenv.mkDerivation rec { vapoursynth ; }; + + meta = with lib; { + homepage = "https://mpv.io"; + description = "General-purpose media player, fork of MPlayer and mplayer2"; + longDescription = '' + mpv is a free and open-source general-purpose video player, based on the + MPlayer and mplayer2 projects, with great improvements above both. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; + platforms = platforms.darwin ++ platforms.linux; + }; } diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 223a1921ef9d8..e751e9fc27325 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -108,6 +108,9 @@ in makePackage { passthru.deps = deps; + # Uses a lot of RAM, OOMs otherwise + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libfprint-tod/default.nix b/pkgs/development/libraries/libfprint-tod/default.nix index 8d7df57896d4c..a7705792cd8c9 100644 --- a/pkgs/development/libraries/libfprint-tod/default.nix +++ b/pkgs/development/libraries/libfprint-tod/default.nix @@ -6,7 +6,7 @@ # for the curious, "tod" means "Touch OEM Drivers" meaning it can load # external .so's. libfprint.overrideAttrs ({ postPatch ? "", mesonFlags ? [], ... }: let - version = "1.90.7+git20210222+tod1"; + version = "1.94.1+tod1"; in { pname = "libfprint-tod"; inherit version; @@ -16,7 +16,7 @@ in { owner = "3v1n0"; repo = "libfprint"; rev = "v${version}"; - sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j"; + sha256 = "sha256-IVeTQlZjea4xgbG/N7OTHAj6RT4WutfvQhV8qFEvkKo="; }; mesonFlags = mesonFlags ++ [ diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 67605dda51d99..b36e6f34c8262 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "luabind"; repo = "luabind"; - rev = version; + rev = "v${version}"; sha256 = "sha256-sK1ca2Oj9yXdmxyXeDO3k8YZ1g+HxIXLhvdTWdPDdag="; }; diff --git a/pkgs/development/libraries/mauikit-filebrowsing/default.nix b/pkgs/development/libraries/mauikit-filebrowsing/default.nix index dd654deb88626..326f4b67ee29c 100644 --- a/pkgs/development/libraries/mauikit-filebrowsing/default.nix +++ b/pkgs/development/libraries/mauikit-filebrowsing/default.nix @@ -10,14 +10,14 @@ mkDerivation rec { pname = "mauikit-filebrowsing"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit-filebrowsing"; rev = "v${version}"; - sha256 = "sha256-mpO61VOYTBlAjtIa1gEYChREV2jjd/WG+rbZcJnbM+Q="; + sha256 = "sha256-j6VoNtMkDB5BSET/RUiQlWdL0D1dAHlW929WNCDC+PE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mauikit/default.nix b/pkgs/development/libraries/mauikit/default.nix index f730d848df86f..88436dd5e638e 100644 --- a/pkgs/development/libraries/mauikit/default.nix +++ b/pkgs/development/libraries/mauikit/default.nix @@ -14,14 +14,14 @@ mkDerivation rec { pname = "mauikit"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit"; rev = "v${version}"; - sha256 = "sha256-skukb9M6jhijCTb+tMIz/3vUCAvVJw+4zTFv9Z7HqWk="; + sha256 = "sha256-dpJQSCog/AZ4ip8NTQMt4g1ntAnL1cjjMzxJz/uCxZA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pangomm/2.42.nix b/pkgs/development/libraries/pangomm/2.42.nix new file mode 100644 index 0000000000000..fa702177781f0 --- /dev/null +++ b/pkgs/development/libraries/pangomm/2.42.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome +, ApplicationServices }: + +stdenv.mkDerivation rec { + pname = "pangomm"; + version= "2.42.2"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + ]; + propagatedBuildInputs = [ pango glibmm cairomm ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + + meta = with lib; { + description = "C++ interface to the Pango text rendering library"; + homepage = "https://www.pango.org/"; + license = with licenses; [ lgpl2 lgpl21 ]; + maintainers = with maintainers; [ lovek323 raskin ]; + platforms = platforms.unix; + + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. + ''; + }; +} diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index 83afef9292449..74f1e7cddcee3 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.1.1"; + version = "1.3.2"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = version; - sha256 = "sha256-o8wDZhNHGPV1BQ5Zi2kFNlWq5w0cqebaJUhUUwTK6So="; + sha256 = "sha256-auPpqoPeYxmkWTVbbKhEZI6gJGH9Pf1D9YLkuD3FaX0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index c07d31f77df3c..7e87fbab5d39d 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.8.2"; + version = "1.8.3"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-lIpi7GGKJSNgmX64K3xXvrzcu469Kxe3rW71Lp3LKms="; + sha256 = "sha256-DjMUI5JBomv0f2AC1Nvb3DeqWn65AvZJWhWus4AZk7w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 47f69183d6850..1f7775c1d84f8 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -83,6 +83,8 @@ buildPythonPackage rec { "test_create_server_main_convenience" "test_debug" "test_auto_reload" + "test_no_exceptions_when_cancel_pending_request" + "test_ipv6_address_is_not_wrapped" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/sanic-org/sanic/issues/2298 "test_no_exceptions_when_cancel_pending_request" diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index ac4173c514abe..9d60879d88032 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j/JHHkS4mIuDv76HtIFbrf2VRqGINyB9OODaM+fJsJc="; + sha256 = "sha256-LBU2nXpmktjyy3x5cBGsrCM6k+6BEZaoDybHVrIrVBo="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 8d06ff94a032b..dc1eac59ceda8 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -14,14 +14,9 @@ let url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js"; sha256 = "1hm5kci2g6n5ikrvp1kpkkdzimjgylv1xicg2vnkbvd9rb56qa99"; }; - js.vue-router = fetchurl { - url = - "https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js"; - sha256 = "0418waib896ywwxkxliip75zp94k3s9wld51afrqrcq70axld0c9"; - }; js.ansi_up = fetchurl { - url = "https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js"; - sha256 = "1993dywxqi2ylnxybwk7m0s0bg2bq7kfllpyr0s8ck6chd0p8i6r"; + url = "https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js"; + sha256 = "1dx8wn38ds8d01kkih26fx1yrisg3kpz61qynjr4zil03ap0hrlr"; }; js.Chart = fetchurl { url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"; @@ -29,10 +24,10 @@ let }; in stdenv.mkDerivation rec { pname = "laminar"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; - sha256 = "11m6h3rdmj2rsmsryy7r40gqccj4gg1cnqwy6blscs87gx4s423g"; + sha256 = "1lzfmfjygmbdr2n1q49kwwffw8frz5y6iczhdz5skwmzwg0chbsf"; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; @@ -40,7 +35,6 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p js css cp ${js.vue} js/vue.min.js - cp ${js.vue-router} js/vue-router.min.js cp ${js.ansi_up} js/ansi_up.js cp ${js.Chart} js/Chart.min.js ''; diff --git a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch index 355baeb837a56..33683fdb15194 100644 --- a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch +++ b/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch @@ -4,25 +4,23 @@ does so unconditionally is twice as bad. Required files are downloaded as separate fixed-output derivations and put into correct location before build phase starts. ---- laminar-0.8/CMakeLists.txt -+++ laminar-0.8-new/CMakeLists.txt -@@ -82,15 +82,6 @@ +--- laminar-1.1/CMakeLists.txt ++++ laminar-1.1-new/CMakeLists.txt +@@ -82,13 +82,6 @@ COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h' DEPENDS src/resources/index.html) -# Download 3rd-party frontend JS libs... -file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js - js/vue.min.js EXPECTED_MD5 fb192338844efe86ec759a40152fcb8e) --file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js -- js/vue-router.min.js EXPECTED_MD5 5f51d4dbbf68fd6725956a5a2b865f3b) --file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -- js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6) +-file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js +- js/ansi_up.js EXPECTED_MD5 b31968e1a8fed0fa82305e978161f7f5) -file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js - js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e) # ...and compile them - generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js + generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue.min.js js/ansi_up.js js/Chart.min.js) -@@ -141,12 +132,12 @@ +@@ -139,12 +132,12 @@ target_link_libraries(laminar-tests ${GTEST_LIBRARY} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z) endif() diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index d3a62bf331bc0..96c45104bd200 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -145,13 +145,13 @@ rec { headers = "0r1qxgkpcn03fd28zbz86ilhsqg0gzp9clbghr5w6gy5ak8y68hz"; }; - electron_16 = mkElectron "16.0.0" { - armv7l-linux = "a3bec9664a17d3f8adc072f88d105601b5d25a42e339c73c26c3b59a0ab0f44a"; - aarch64-linux = "f4dc4ba8ce14f2e64943838c85654766522c46bb8e02914d3fdf1894b6e5b2fa"; - x86_64-linux = "a5c5c0547c989207ab63e0b06b46a04b545e4cc74e6fc8f94d7beda0c0bcb0b2"; - i686-linux = "e93e5eaaf33e4c30d2ba613b67858ada311a6e28b5fd42893499b50ef97b3695"; - x86_64-darwin = "f95847ea721cbf8632a72bec504137554aa262d111aaa5e2e30a74df66ff6c97"; - aarch64-darwin = "0c71b070cf6bcfa7dc4dad65ee14af926d5dda73e4a2f96e68cff844df8aba1d"; - headers = "1gr43w8pw9b7xl1bmpap8v1wp4ixmc2qkww02kbzfw53h6m4ccn3"; + electron_16 = mkElectron "16.0.1" { + armv7l-linux = "9fe58dcc8838fc641e9fc6f2723ece6f12c29169340da3ab754e1afc57634314"; + aarch64-linux = "991369b7dee6cf9c146c48566153baf898b5ed73efaada2688d1699d69ba366c"; + x86_64-linux = "4063b6d05c9320fc53535a7d932e03f94ad0aae95432437bbf2f2f222b67c5a5"; + i686-linux = "68a817a999dcc996497c53e54f06199af0c2de278ff910c28845405d1b1828f0"; + x86_64-darwin = "7e28327d3efb013f19295e2491208491c66b117a167e9e56d141d0516d6d5587"; + aarch64-darwin = "f05684ca31d3d98746bca9ec05d425998d60af640958eeb55f464747ceb97bdf"; + headers = "0sk6h0jqfw2q9h05xdzivwfa6040r4racf82s8i5xkw5s13vsl6d"; }; } diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index 9a521bfd27434..e2be56b638e83 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "drush-ops"; repo = pname; rev = version; - sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp"; + sha256 = "sha256-0nf/m+xJmfHsFLuordiMp8UyrGGXuS70+zFHkIxLWhU="; }; consoleTable = fetchurl { diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh index b5864b8392f5b..f39edc7899955 100644 --- a/pkgs/games/keen4/builder.sh +++ b/pkgs/games/keen4/builder.sh @@ -1,10 +1,15 @@ -source $stdenv/setup +#!/usr/bin/env bash -mkdir -p $out/share/keen4 -unzip -j $dist -d $out/share/keen4 +set -o nounset -mkdir -p $out/bin -cat > $out/bin/keen4 <<EOF +# shellcheck source=/dev/null +source "${stdenv}/setup" + +mkdir -p "${out}/share/keen4" +unzip -j "$dist" -d "${out}/share/keen4" + +mkdir -p "${out}/bin" +cat > "${out}/bin/keen4" <<EOF #! $SHELL -e if test -z "\$HOME"; then echo "HOME directory not set" @@ -17,9 +22,9 @@ fi mkdir -p \$HOME/.keen4 cd \$HOME/.keen4 -ln -sf $out/share/keen4/* . +ln -sf "${out}/share/keen4/"* . -$dosbox/bin/dosbox ./KEEN4E.EXE -fullscreen -exit || true +"${dosbox}/bin/dosbox" ./KEEN4E.EXE -fullscreen -exit || true # Cleanup the symlinks. for i in *; do @@ -28,4 +33,4 @@ for i in *; do fi done EOF -chmod +x $out/bin/keen4 +chmod +x "${out}/bin/keen4" diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a46fdd1ee36dd..41b7bc383b60f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,9 +1,15 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests -, libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl -, liburing, libevent, jemalloc, cracklib, systemd, perl +{ lib, stdenv, fetchurl, nixosTests +# Native buildInputs components +, bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config +# Common components +, curl, libiconv, ncurses, openssl, pcre2 +, libkrb5, liburing, systemd +, CoreServices, cctools, perl +, jemalloc, less +# Server components , bzip2, lz4, lzo, snappy, xz, zlib, zstd -, fixDarwinDylibNames, cctools, CoreServices, less -, numactl # NUMA Support +, cracklib, judy, libevent, libxml2 +, linux-pam, numactl, pmdk , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: @@ -30,12 +36,13 @@ common = rec { # attributes common to both builds }; nativeBuildInputs = [ cmake pkg-config ] - ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper; buildInputs = [ - ncurses openssl zlib pcre2 libiconv curl - ] ++ optionals stdenv.hostPlatform.isLinux [ liburing systemd libkrb5 ] - ++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ] + curl libiconv ncurses openssl pcre2 zlib + ] ++ optionals stdenv.hostPlatform.isLinux [ libkrb5 liburing systemd ] + ++ optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl ] ++ optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]; prePatch = '' @@ -43,11 +50,11 @@ common = rec { # attributes common to both builds ''; patches = [ - ./cmake-includedir.patch + ./patch/cmake-includedir.patch ] # Fixes a build issue as documented on # https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073 - ++ lib.optional (!stdenv.isLinux) ./macos-MDEV-26769-regression-fix.patch; + ++ lib.optional (!stdenv.isLinux) ./patch/macos-MDEV-26769-regression-fix.patch; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" @@ -96,6 +103,11 @@ common = rec { # attributes common to both builds rm -r $out/lib/pkgconfig ''; + # perlPackages.DBDmysql is broken on darwin + postFixup = optionalString (!stdenv.hostPlatform.isDarwin) '' + wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]} + ''; + passthru.mysqlVersion = "5.7"; passthru.tests = { @@ -122,7 +134,7 @@ client = stdenv.mkDerivation (common // { outputs = [ "out" "man" ]; patches = common.patches ++ [ - ./cmake-plugin-includedir.patch + ./patch/cmake-plugin-includedir.patch ]; cmakeFlags = common.cmakeFlags ++ [ @@ -146,15 +158,15 @@ server = stdenv.mkDerivation (common // { outputs = [ "out" "man" ]; - nativeBuildInputs = common.nativeBuildInputs ++ [ bison boost.dev ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper; + nativeBuildInputs = common.nativeBuildInputs ++ [ bison boost.dev flex ]; buildInputs = common.buildInputs ++ [ bzip2 lz4 lzo snappy xz zstd - libxml2 judy libevent cracklib + cracklib judy libevent libxml2 ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl - ++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] - ++ optional stdenv.hostPlatform.isLinux linux-pam - ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; + ++ optionals stdenv.hostPlatform.isLinux [ linux-pam pmdk.dev ] + ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv + ++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]; patches = common.patches; @@ -196,7 +208,7 @@ server = stdenv.mkDerivation (common // { ''; postInstall = common.postInstall + '' - rm -rf "$out"/share/aclocal + rm -r "$out"/share/aclocal chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} '' + optionalString withStorageMroonga '' @@ -207,11 +219,6 @@ server = stdenv.mkDerivation (common // { rm -r "$out"/OFF ''; - # perlPackages.DBDmysql is broken on darwin - postFixup = optionalString (!stdenv.hostPlatform.isDarwin) '' - wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]} - ''; - CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive"; }); in mariadb diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 1f4bbc0586ffe..5a79dcd7d2cdb 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -4,17 +4,19 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.9"; + version = "26.4.10"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "1nf8vv0b9v7rjsxl93avgvv0lz5jjg91brnric0dhlnp2dzzxi6g"; + sha256 = "sha256-v3fKadoHCAKHZGPjuh/uLnmAaaPESrax73GEI/mH39g="; fetchSubmodules = true; }; - buildInputs = [ asio boost check openssl cmake ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ asio boost.dev check openssl ]; preConfigure = '' # make sure bundled asio cannot be used, but leave behind license, because it gets installed diff --git a/pkgs/servers/sql/mariadb/cmake-includedir.patch b/pkgs/servers/sql/mariadb/patch/cmake-includedir.patch index 0c4fe7d321e22..0c4fe7d321e22 100644 --- a/pkgs/servers/sql/mariadb/cmake-includedir.patch +++ b/pkgs/servers/sql/mariadb/patch/cmake-includedir.patch diff --git a/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch b/pkgs/servers/sql/mariadb/patch/cmake-plugin-includedir.patch index d2a4535f7ba94..d2a4535f7ba94 100644 --- a/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch +++ b/pkgs/servers/sql/mariadb/patch/cmake-plugin-includedir.patch diff --git a/pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch b/pkgs/servers/sql/mariadb/patch/macos-MDEV-26769-regression-fix.patch index 8c0e6f78e2875..8c0e6f78e2875 100644 --- a/pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch +++ b/pkgs/servers/sql/mariadb/patch/macos-MDEV-26769-regression-fix.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddda6ef6ef7f2..7545061366ecd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16729,6 +16729,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + pangomm_2_42 = callPackage ../development/libraries/pangomm/2.42.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + gdata-sharp = callPackage ../development/libraries/gdata-sharp { }; gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; @@ -27867,6 +27871,8 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; + roomeqwizard = callPackage ../applications/audio/roomeqwizard { }; + radiotray-ng = callPackage ../applications/audio/radiotray-ng { wxGTK = wxGTK30; }; |