From b39504da7265060a9bfa7b21d2e9acffc49559c7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 27 Nov 2021 22:11:09 -0500 Subject: [PATCH 01/12] mxnet: fix for gcc10+, enable on darwin --- .../science/math/mxnet/default.nix | 26 +++++++++++++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index ab360a963852..2e9c95d06cbd 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ -{ config, stdenv, lib, fetchurl, bash, cmake -, opencv3, gtest, blas, perl +{ config, stdenv, lib, fetchurl, fetchpatch, bash, cmake +, opencv3, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: @@ -15,11 +15,27 @@ stdenv.mkDerivation rec { sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1"; }; + patches = [ + # Fix build error https://github.com/apache/incubator-mxnet/issues/19405 + (fetchpatch { + name = "mxnet-fix-gcc-linker-error-1.patch"; + url = "https://github.com/apache/incubator-mxnet/commit/78e31d66d19e385ca4ef73245ce79a47e375d8d1.diff"; + sha256 = "sha256-UfmGhh4RbvrEOXe6IJxHm1Aqpy1gS6gHxrX5KQBXjv4="; + }) + (fetchpatch { + name = "mxnet-fix-gcc-linker-error-2.patch"; + url = "https://github.com/apache/incubator-mxnet/commit/9bfe3116aabd01049fdbd90855cb245a30b795df.diff"; + sha256 = "sha256-BL7Zf7Bgn0qpai9HbQ6LBxZNa3iLjVJSe5nxZgqI/fw="; + }) + ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ opencv3 gtest blas.provider ] - ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] - ++ lib.optional cudnnSupport cudnn; + ++ lib.optional stdenv.cc.isGNU gomp + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp + ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] + ++ lib.optional cudnnSupport cudnn; cmakeFlags = [ "-DUSE_MKL_IF_AVAILABLE=OFF" ] @@ -48,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://mxnet.incubator.apache.org/"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc5728ac01ed..410c511ae995 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31870,7 +31870,6 @@ with pkgs; mxnet = callPackage ../applications/science/math/mxnet { inherit (linuxPackages) nvidia_x11; - stdenv = gcc9Stdenv; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; From 51bf0090634db419bc1cfdb571dc2bf7a565c50d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 28 Nov 2021 17:26:11 -0500 Subject: [PATCH 02/12] mxnet: 1.6.0 -> 1.8.0 --- pkgs/applications/science/math/mxnet/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 2e9c95d06cbd..c9ffb8ed5cb3 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -8,11 +8,12 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "mxnet"; - version = "1.6.0"; + version = "1.8.0"; src = fetchurl { - url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1"; + name = "apache-mxnet-src-${version}-incubating.tar.gz"; + url = "https://dlcdn.apache.org/incubator/mxnet/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; + hash = "sha256-la/5hYlaukCcCNVRRRCuOLiEkM+2KBqzpf8PWCbI21Q="; }; patches = [ From bf98858c0fffa8b2a714faa28077d73947cacc9f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 29 Nov 2021 01:14:14 -0500 Subject: [PATCH 03/12] pythonPackages.tokenizers: fix darwin build --- pkgs/development/python-modules/tokenizers/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index d5d26050eeeb..55928d4fcc8e 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -1,9 +1,11 @@ { lib +, stdenv , fetchFromGitHub , fetchurl , buildPythonPackage , rustPlatform , setuptools-rust +, libiconv , numpy , datasets , pytestCheckHook @@ -72,6 +74,10 @@ in buildPythonPackage rec { rust.rustc ]); + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + propagatedBuildInputs = [ numpy ]; From df5e363509d1b8430fdf2b21af1e1f9a91a2ad40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 03:16:28 +0000 Subject: [PATCH 04/12] heimer: 2.8.0 -> 3.0.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 0aff0c6bbd19..dba3ef4ee8a8 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "2.8.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-838uH8nTxl3FJvtYrLDmS6tYYRdNnFzftZ5RZE8tVpE="; + sha256 = "sha256-Q1a+sGZTVUjViakBT3E7+AgqMSldAnp7UJcsSS6KZXs="; }; nativeBuildInputs = [ cmake ]; From 73739138064951632e78a7ca14833532ffebec26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 16:46:53 +0000 Subject: [PATCH 05/12] twitterBootstrap: 5.1.0 -> 5.1.3 --- pkgs/development/web/twitter-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 13b1e7b95c44..a09dbc51128e 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "5.1.0"; + version = "5.1.3"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-OVNCspdOM1BWDmV1LTaqtlc2UrEcxste95ouXoOtZLE="; + sha256 = "sha256-vewp21DsjR7My3AgIrgj3wozPhBYFMJksyG9UYuJxyE="; }; nativeBuildInputs = [ unzip ]; From 8ddda2b44406df625ff2bea6201333a2b5a3313b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 23:23:51 +0000 Subject: [PATCH 06/12] avocode: 4.15.1 -> 4.15.5 --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index a2a9dcd4750a..fede2c9bb51a 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.15.1"; + version = "4.15.5"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-Cli1tbe/eHS0yk1OhrSgFwjjGx2jvQSYStkKYj6gk4I="; + sha256 = "sha256-vPS2hTaWjundVjtguy/1eH1qBaipN2Ij8PQODka+IGg="; }; libPath = lib.makeLibraryPath (with xorg; [ From 7095591d7e79e5f80fedbe07cedce4e5ce611b64 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Dec 2021 17:51:50 -0500 Subject: [PATCH 07/12] audacity: fix for darwin --- pkgs/applications/audio/audacity/default.nix | 52 +++++++++++++------ .../libraries/audio/suil/default.nix | 2 +- pkgs/top-level/all-packages.nix | 9 +++- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 0832bb1dd964..a8ab856ed671 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , cmake -, wxGTK , pkg-config , python3 , gettext @@ -18,7 +17,6 @@ , sqlite , sratom , suil -, alsa-lib , libsndfile , soxr , flac @@ -28,8 +26,10 @@ , libopus , ffmpeg , soundtouch -, pcre /*, portaudio - given up fighting their portaudio.patch */ +, pcre +/*, portaudio - given up fighting their portaudio.patch */ , linuxHeaders +, alsa-lib , at-spi2-core , dbus , libepoxy @@ -40,6 +40,16 @@ , libsepol , libxkbcommon , util-linux +, wxGTK +, AppKit ? null +, AudioToolbox ? null +, AudioUnit ? null +, Carbon ? null +, Cocoa ? null +, CoreAudio ? null +, CoreAudioKit ? null +, CoreServices ? null +, wxmac }: # TODO @@ -49,14 +59,20 @@ let inherit (lib) optionals; + wxWidgets_src = fetchFromGitHub { + owner = "audacity"; + repo = "wxWidgets"; + rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985"; + sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a"; + fetchSubmodules = true; + }; + wxGTK' = wxGTK.overrideAttrs (oldAttrs: rec { - src = fetchFromGitHub { - owner = "audacity"; - repo = "wxWidgets"; - rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985"; - sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a"; - fetchSubmodules = true; - }; + src = wxWidgets_src; + }); + + wxmac' = wxmac.overrideAttrs (oldAttrs: rec { + src = wxWidgets_src; }); in @@ -88,7 +104,7 @@ stdenv.mkDerivation rec { postPatch = '' touch src/RevisionIdent.h - + '' + lib.optionalString stdenv.isLinux '' substituteInPlace src/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h ''; @@ -116,7 +132,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsa-lib expat ffmpeg file @@ -138,9 +153,8 @@ stdenv.mkDerivation rec { sratom suil twolame - wxGTK' - wxGTK'.gtk ] ++ optionals stdenv.isLinux [ + alsa-lib # for portaudio at-spi2-core dbus libepoxy @@ -151,6 +165,14 @@ stdenv.mkDerivation rec { libselinux libsepol util-linux + wxGTK' + wxGTK'.gtk + ] ++ optionals stdenv.isDarwin [ + wxmac' + AppKit + Cocoa + CoreAudioKit + AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio ]; doCheck = false; # Test fails @@ -160,6 +182,6 @@ stdenv.mkDerivation rec { homepage = "https://www.audacityteam.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lheckemann ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 1c978a18f8f9..ac10472e014e 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9471a61f9b4..2232d82573e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24179,7 +24179,14 @@ with pkgs; audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; }; - audacity = audacity-gtk2; + audacity = + if stdenv.isDarwin then + callPackage ../applications/audio/audacity { + inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon Cocoa CoreAudio CoreAudioKit CoreServices; + suil = suil-qt5; + } + else + audacity-gtk2; audio-recorder = callPackage ../applications/audio/audio-recorder { }; From 7c578a1d3f17d15e683c01e26b4ec8a051de543e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Dec 2021 18:14:53 -0500 Subject: [PATCH 08/12] audacity: configure ffmpeg linking via cmake flags --- pkgs/applications/audio/audacity/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index a8ab856ed671..43f23f3a628f 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -109,19 +109,6 @@ stdenv.mkDerivation rec { --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h ''; - # audacity only looks for ffmpeg at runtime, so we need to link it in manually - NIX_LDFLAGS = toString [ - "-lavcodec" - "-lavdevice" - "-lavfilter" - "-lavformat" - "-lavresample" - "-lavutil" - "-lpostproc" - "-lswresample" - "-lswscale" - ]; - nativeBuildInputs = [ cmake gettext @@ -175,6 +162,11 @@ stdenv.mkDerivation rec { AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio ]; + cmakeFlags = [ + "-Daudacity_use_ffmpeg=linked" + "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON" + ]; + doCheck = false; # Test fails meta = with lib; { From e74aa0da70651564664df097884877451db59e76 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 16 Dec 2021 22:00:34 +0800 Subject: [PATCH 09/12] qownnotes: 21.12.1 -> 21.12.3 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 851b367ac453..fdbf0093e077 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.12.1"; + version = "21.12.3"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "sha256-gTxt3U2/x3VMWYU9cb5FPRvqezdn2K6VGYwEKBi5xFk="; + sha256 = "sha256-qS3zj5yI84Gvd4AMM5/mqoGWp6JgCBsKSPYfGuTCgCk="; }; nativeBuildInputs = [ qmake qttools ]; From 48fe2ffdec52a0e78701a40faf0e78333b56a8d1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Dec 2021 10:37:52 -0500 Subject: [PATCH 10/12] audacity: add veprbl to maintainers --- pkgs/applications/audio/audacity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 43f23f3a628f..55d5383a819b 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { description = "Sound editor with graphical UI"; homepage = "https://www.audacityteam.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lheckemann ]; + maintainers = with maintainers; [ lheckemann veprbl ]; platforms = platforms.unix; }; } From a457e2d8a2674fd86170bcf50bff313784853b43 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Thu, 16 Dec 2021 18:26:34 +0000 Subject: [PATCH 11/12] =?UTF-8?q?super-slicer:=202.3.56.9=20=E2=86=92=202.?= =?UTF-8?q?3.57.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 976292716611..99f1f79ce7cb 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -5,8 +5,8 @@ let description = "PrusaSlicer fork with more features and faster development cycle"; versions = { - stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; }; - latest = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; }; + stable = { version = "2.3.57.7"; sha256 = "sha256-qYvHNGuA2YDatrY/K2g5PE2gD53VXNptCaa7TpWGV7g="; }; + latest = { version = "2.3.57.7"; sha256 = "sha256-qYvHNGuA2YDatrY/K2g5PE2gD53VXNptCaa7TpWGV7g="; }; }; override = { version, sha256 }: super: { @@ -46,6 +46,7 @@ let homepage = "https://github.com/supermerili/SuperSlicer"; license = licenses.agpl3; maintainers = with maintainers; [ cab404 moredread ]; + mainProgram = "superslicer"; }; passthru = allVersions; From 1509f463a074e682b062fe0f7caf9137de4833cd Mon Sep 17 00:00:00 2001 From: mucaho Date: Thu, 16 Dec 2021 20:06:06 +0100 Subject: [PATCH 12/12] clingcon: 3.3.0 -> 5.0.0 --- .../science/logic/potassco/clingcon.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index 0f3218b76736..1614adf45537 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -1,39 +1,33 @@ { lib, stdenv , fetchFromGitHub , cmake -, bison -, re2c +, clingo }: stdenv.mkDerivation rec { pname = "clingcon"; - version = "3.3.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "potassco"; repo = pname; rev = "v${version}"; - fetchSubmodules = true; - sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs"; + sha256 = "1g2xkz9nsgqnrw3fdf5jchl16f0skj5mm32va61scc2yrchll166"; }; - # deal with clingcon through git submodules recursively importing - # an outdated version of libpotassco which uses deprecated header in .cpp files - postPatch = '' - find ./ -type f -exec sed -i 's///g' {} \; - ''; - - nativeBuildInputs = [ cmake bison re2c ]; + nativeBuildInputs = [ cmake clingo ]; cmakeFlags = [ "-DCLINGCON_MANAGE_RPATH=ON" - "-DCLINGO_BUILD_WITH_PYTHON=OFF" - "-DCLINGO_BUILD_WITH_LUA=OFF" + "-DPYCLINGCON_ENABLE=OFF" + "-DCLINGCON_BUILD_TESTS=ON" ]; + doCheck = true; + meta = { description = "Extension of clingo to handle constraints over integers"; - license = lib.licenses.gpl3; # for now GPL3, next version MIT! + license = lib.licenses.mit; platforms = lib.platforms.unix; homepage = "https://potassco.org/"; downloadPage = "https://github.com/potassco/clingcon/releases/";