JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-17 06:01:26 +00:00 committed by GitHub
commit 2749f6983a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 103 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pkgs/applications/audio/audacity/default.nix
View File

@ -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,24 +104,11 @@ 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
'';
# 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
@ -116,7 +119,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
alsa-lib
expat
ffmpeg
file
@ -138,9 +140,8 @@ stdenv.mkDerivation rec {
sratom
suil
twolame
wxGTK'
wxGTK'.gtk
] ++ optionals stdenv.isLinux [
alsa-lib # for portaudio
at-spi2-core
dbus
libepoxy
@ -151,6 +152,19 @@ stdenv.mkDerivation rec {
libselinux
libsepol
util-linux
wxGTK'
wxGTK'.gtk
] ++ optionals stdenv.isDarwin [
wxmac'
AppKit
Cocoa
CoreAudioKit
AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio
];
cmakeFlags = [
"-Daudacity_use_ffmpeg=linked"
"-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON"
];
doCheck = false; # Test fails
@ -159,7 +173,7 @@ stdenv.mkDerivation rec {
description = "Sound editor with graphical UI";
homepage = "https://www.audacityteam.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lheckemann ];
platforms = platforms.linux;
maintainers = with maintainers; [ lheckemann veprbl ];
platforms = platforms.unix;
};
}

4
pkgs/applications/graphics/avocode/default.nix
View File

@ -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; [

4
pkgs/applications/misc/heimer/default.nix
View File

@ -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 ];

5
pkgs/applications/misc/prusa-slicer/super-slicer.nix
View File

@ -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;

4
pkgs/applications/office/qownnotes/default.nix
View File

@ -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-<version>.tar.xz.sha256
sha256 = "sha256-gTxt3U2/x3VMWYU9cb5FPRvqezdn2K6VGYwEKBi5xFk=";
sha256 = "sha256-qS3zj5yI84Gvd4AMM5/mqoGWp6JgCBsKSPYfGuTCgCk=";
};
nativeBuildInputs = [ qmake qttools ];

24
pkgs/applications/science/logic/potassco/clingcon.nix
View File

@ -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 <xlocale.h> header in .cpp files
postPatch = ''
find ./ -type f -exec sed -i 's/<xlocale.h>/<locale.h>/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/";

33
pkgs/applications/science/math/mxnet/default.nix
View File

@ -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
}:
@ -8,18 +8,35 @@ 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 = [
# 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 +65,6 @@ stdenv.mkDerivation rec {
homepage = "https://mxnet.incubator.apache.org/";
maintainers = with maintainers; [ abbradar ];
license = licenses.asl20;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/audio/suil/default.nix
View File

@ -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;
};
}

6
pkgs/development/python-modules/tokenizers/default.nix
View File

@ -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
];

4
pkgs/development/web/twitter-bootstrap/default.nix
View File

@ -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 ];

10
pkgs/top-level/all-packages.nix
View File

@ -24224,7 +24224,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 { };
@ -32084,7 +32091,6 @@ with pkgs;
mxnet = callPackage ../applications/science/math/mxnet {
inherit (linuxPackages) nvidia_x11;
stdenv = gcc9Stdenv;
};
wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };