commit 17388f356f78adedda45841abd9517a3e843d8c5 · pyrox.dev/nixpkgs

+43 -29

pkgs/applications/audio/audacity/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , fetchpatch

     

       5
       5
        
       , cmake

     

       6
       6
       -
       , wxGTK

     

       7
       6
        
       , pkg-config

     

       8
       7
        
       , python3

     

       9
       8
        
       , gettext

     
···

       18
       17
        
       , sqlite

     

       19
       18
        
       , sratom

     

       20
       19
        
       , suil

     

       21
       21
       -
       , alsa-lib

     

       22
       20
        
       , libsndfile

     

       23
       21
        
       , soxr

     

       24
       22
        
       , flac

     
···

       28
       26
        
       , libopus

     

       29
       27
        
       , ffmpeg

     

       30
       28
        
       , soundtouch

     

       31
       31
       -
       , pcre /*, portaudio - given up fighting their portaudio.patch */

     

       29
       29
       +
       , pcre

     

       30
       30
       +
       /*, portaudio - given up fighting their portaudio.patch */

     

       32
       31
        
       , linuxHeaders

     

       32
       32
       +
       , alsa-lib

     

       33
       33
        
       , at-spi2-core

     

       34
       34
        
       , dbus

     

       35
       35
        
       , libepoxy

     
···

       40
       40
        
       , libsepol

     

       41
       41
        
       , libxkbcommon

     

       42
       42
        
       , util-linux

     

       43
       43
       +
       , wxGTK

     

       44
       44
       +
       , AppKit ? null

     

       45
       45
       +
       , AudioToolbox ? null

     

       46
       46
       +
       , AudioUnit ? null

     

       47
       47
       +
       , Carbon ? null

     

       48
       48
       +
       , Cocoa ? null

     

       49
       49
       +
       , CoreAudio ? null

     

       50
       50
       +
       , CoreAudioKit ? null

     

       51
       51
       +
       , CoreServices ? null

     

       52
       52
       +
       , wxmac

     

       43
       53
        
       }:

     

       44
       54
        
       

     

       45
       55
        
       # TODO

     
···

       49
       59
        
       let

     

       50
       60
        
         inherit (lib) optionals;

     

       51
       61
        
       

     

       62
       62
       +
         wxWidgets_src = fetchFromGitHub {

     

       63
       63
       +
           owner = "audacity";

     

       64
       64
       +
           repo = "wxWidgets";

     

       65
       65
       +
           rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985";

     

       66
       66
       +
           sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a";

     

       67
       67
       +
           fetchSubmodules = true;

     

       68
       68
       +
         };

     

       69
       69
       +
       

     

       52
       70
        
         wxGTK' = wxGTK.overrideAttrs (oldAttrs: rec {

     

       53
       53
       -
           src = fetchFromGitHub {

     

       54
       54
       -
             owner = "audacity";

     

       55
       55
       -
             repo = "wxWidgets";

     

       56
       56
       -
             rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985";

     

       57
       57
       -
             sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a";

     

       58
       58
       -
             fetchSubmodules = true;

     

       59
       59
       -
           };

     

       71
       71
       +
           src = wxWidgets_src;

     

       72
       72
       +
         });

     

       73
       73
       +
       

     

       74
       74
       +
         wxmac' = wxmac.overrideAttrs (oldAttrs: rec {

     

       75
       75
       +
           src = wxWidgets_src;

     

       60
       76
        
         });

     

       61
       77
        
       

     

       62
       78
        
       in

     
···

       88
       104
        
       

     

       89
       105
        
         postPatch = ''

     

       90
       106
        
           touch src/RevisionIdent.h

     

       91
       91
       -
       

     

       107
       107
       +
         '' + lib.optionalString stdenv.isLinux ''

     

       92
       108
        
           substituteInPlace src/FileNames.cpp \

     

       93
       109
        
             --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h

     

       94
       110
        
         '';

     

       95
       111
        
       

     

       96
       96
       -
         # audacity only looks for ffmpeg at runtime, so we need to link it in manually

     

       97
       97
       -
         NIX_LDFLAGS = toString [

     

       98
       98
       -
           "-lavcodec"

     

       99
       99
       -
           "-lavdevice"

     

       100
       100
       -
           "-lavfilter"

     

       101
       101
       -
           "-lavformat"

     

       102
       102
       -
           "-lavresample"

     

       103
       103
       -
           "-lavutil"

     

       104
       104
       -
           "-lpostproc"

     

       105
       105
       -
           "-lswresample"

     

       106
       106
       -
           "-lswscale"

     

       107
       107
       -
         ];

     

       108
       108
       -
       

     

       109
       112
        
         nativeBuildInputs = [

     

       110
       113
        
           cmake

     

       111
       114
        
           gettext

     
···

       116
       119
        
         ];

     

       117
       120
        
       

     

       118
       121
        
         buildInputs = [

     

       119
       119
       -
           alsa-lib

     

       120
       122
        
           expat

     

       121
       123
        
           ffmpeg

     

       122
       124
        
           file

     
···

       138
       140
        
           sratom

     

       139
       141
        
           suil

     

       140
       142
        
           twolame

     

       141
       141
       -
           wxGTK'

     

       142
       142
       -
           wxGTK'.gtk

     

       143
       143
        
         ] ++ optionals stdenv.isLinux [

     

       144
       144
       +
           alsa-lib # for portaudio

     

       144
       145
        
           at-spi2-core

     

       145
       146
        
           dbus

     

       146
       147
        
           libepoxy

     
···

       151
       152
        
           libselinux

     

       152
       153
        
           libsepol

     

       153
       154
        
           util-linux

     

       155
       155
       +
           wxGTK'

     

       156
       156
       +
           wxGTK'.gtk

     

       157
       157
       +
         ] ++ optionals stdenv.isDarwin [

     

       158
       158
       +
           wxmac'

     

       159
       159
       +
           AppKit

     

       160
       160
       +
           Cocoa

     

       161
       161
       +
           CoreAudioKit

     

       162
       162
       +
           AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio

     

       163
       163
       +
         ];

     

       164
       164
       +
       

     

       165
       165
       +
         cmakeFlags = [

     

       166
       166
       +
           "-Daudacity_use_ffmpeg=linked"

     

       167
       167
       +
           "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON"

     

       154
       168
        
         ];

     

       155
       169
        
       

     

       156
       170
        
         doCheck = false; # Test fails

     
···

       159
       173
        
           description = "Sound editor with graphical UI";

     

       160
       174
        
           homepage = "https://www.audacityteam.org/";

     

       161
       175
        
           license = licenses.gpl2Plus;

     

       162
       162
       -
           maintainers = with maintainers; [ lheckemann ];

     

       163
       163
       -
           platforms = platforms.linux;

     

       176
       176
       +
           maintainers = with maintainers; [ lheckemann veprbl ];

     

       177
       177
       +
           platforms = platforms.unix;

     

       164
       178
        
         };

     

       165
       179
        
       }

+2 -2

pkgs/applications/graphics/avocode/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "avocode";

     

       8
       8
       -
         version = "4.15.1";

     

       8
       8
       +
         version = "4.15.5";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";

     

       12
       12
       -
           sha256 = "sha256-Cli1tbe/eHS0yk1OhrSgFwjjGx2jvQSYStkKYj6gk4I=";

     

       12
       12
       +
           sha256 = "sha256-vPS2hTaWjundVjtguy/1eH1qBaipN2Ij8PQODka+IGg=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         libPath = lib.makeLibraryPath (with xorg; [

+2 -2

pkgs/applications/misc/heimer/default.nix

···

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
        
         pname = "heimer";

     

       5
       5
       -
         version = "2.8.0";

     

       5
       5
       +
         version = "3.0.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "juzzlin";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-838uH8nTxl3FJvtYrLDmS6tYYRdNnFzftZ5RZE8tVpE=";

     

       11
       11
       +
           sha256 = "sha256-Q1a+sGZTVUjViakBT3E7+AgqMSldAnp7UJcsSS6KZXs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ];

+3 -2

pkgs/applications/misc/prusa-slicer/super-slicer.nix

···

       5
       5
        
         description = "PrusaSlicer fork with more features and faster development cycle";

     

       6
       6
        
       

     

       7
       7
        
         versions = {

     

       8
       8
       -
           stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; };

     

       9
       9
       -
           latest = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; };

     

       8
       8
       +
           stable = { version = "2.3.57.7"; sha256 = "sha256-qYvHNGuA2YDatrY/K2g5PE2gD53VXNptCaa7TpWGV7g="; };

     

       9
       9
       +
           latest = { version = "2.3.57.7"; sha256 = "sha256-qYvHNGuA2YDatrY/K2g5PE2gD53VXNptCaa7TpWGV7g="; };

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         override = { version, sha256 }: super: {

     
···

       46
       46
        
             homepage = "https://github.com/supermerili/SuperSlicer";

     

       47
       47
        
             license = licenses.agpl3;

     

       48
       48
        
             maintainers = with maintainers; [ cab404 moredread ];

     

       49
       49
       +
             mainProgram = "superslicer";

     

       49
       50
        
           };

     

       50
       51
        
       

     

       51
       52
        
           passthru = allVersions;

+2 -2

pkgs/applications/office/qownnotes/default.nix

···

       5
       5
        
       

     

       6
       6
        
       mkDerivation rec {

     

       7
       7
        
         pname = "qownnotes";

     

       8
       8
       -
         version = "21.12.1";

     

       8
       8
       +
         version = "21.12.3";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";

     

       12
       12
        
           # Fetch the checksum of current version with curl:

     

       13
       13
        
           # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256

     

       14
       14
       -
           sha256 = "sha256-gTxt3U2/x3VMWYU9cb5FPRvqezdn2K6VGYwEKBi5xFk=";

     

       14
       14
       +
           sha256 = "sha256-qS3zj5yI84Gvd4AMM5/mqoGWp6JgCBsKSPYfGuTCgCk=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ qmake qttools ];

+9 -15

pkgs/applications/science/logic/potassco/clingcon.nix

···

       1
       1
        
       { lib, stdenv

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
        
       , cmake

     

       4
       4
       -
       , bison

     

       5
       5
       -
       , re2c

     

       4
       4
       +
       , clingo

     

       6
       5
        
       }:

     

       7
       6
        
       

     

       8
       7
        
       stdenv.mkDerivation rec {

     

       9
       8
        
         pname = "clingcon";

     

       10
       10
       -
         version = "3.3.0";

     

       9
       9
       +
         version = "5.0.0";

     

       11
       10
        
       

     

       12
       11
        
         src = fetchFromGitHub {

     

       13
       12
        
           owner = "potassco";

     

       14
       13
        
           repo = pname;

     

       15
       14
        
           rev = "v${version}";

     

       16
       16
       -
           fetchSubmodules = true;

     

       17
       17
       -
           sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs";

     

       15
       15
       +
           sha256 = "1g2xkz9nsgqnrw3fdf5jchl16f0skj5mm32va61scc2yrchll166";

     

       18
       16
        
          };

     

       19
       17
        
       

     

       20
       20
       -
         # deal with clingcon through git submodules recursively importing

     

       21
       21
       -
         # an outdated version of libpotassco which uses deprecated <xlocale.h> header in .cpp files

     

       22
       22
       -
         postPatch = ''

     

       23
       23
       -
           find ./ -type f -exec sed -i 's/<xlocale.h>/<locale.h>/g' {} \;

     

       24
       24
       -
         '';

     

       25
       25
       -
       

     

       26
       26
       -
         nativeBuildInputs = [ cmake bison re2c ];

     

       18
       18
       +
         nativeBuildInputs = [ cmake clingo ];

     

       27
       19
        
       

     

       28
       20
        
         cmakeFlags = [

     

       29
       21
        
           "-DCLINGCON_MANAGE_RPATH=ON"

     

       30
       30
       -
           "-DCLINGO_BUILD_WITH_PYTHON=OFF"

     

       31
       31
       -
           "-DCLINGO_BUILD_WITH_LUA=OFF"

     

       22
       22
       +
           "-DPYCLINGCON_ENABLE=OFF"

     

       23
       23
       +
           "-DCLINGCON_BUILD_TESTS=ON"

     

       32
       24
        
         ];

     

       33
       25
        
       

     

       26
       26
       +
         doCheck = true;

     

       27
       27
       +
       

     

       34
       28
        
         meta = {

     

       35
       29
        
           description = "Extension of clingo to handle constraints over integers";

     

       36
       36
       -
           license = lib.licenses.gpl3; # for now GPL3, next version MIT!

     

       30
       30
       +
           license = lib.licenses.mit;

     

       37
       31
        
           platforms = lib.platforms.unix;

     

       38
       32
        
           homepage = "https://potassco.org/";

     

       39
       33
        
           downloadPage = "https://github.com/potassco/clingcon/releases/";

+25 -8

pkgs/applications/science/math/mxnet/default.nix

···

       1
       1
       -
       { config, stdenv, lib, fetchurl, bash, cmake

     

       2
       2
       -
       , opencv3, gtest, blas, perl

     

       1
       1
       +
       { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake

     

       2
       2
       +
       , opencv3, gtest, blas, gomp, llvmPackages, perl

     

       3
       3
        
       , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11

     

       4
       4
        
       , cudnnSupport ? cudaSupport, cudnn

     

       5
       5
        
       }:

     
···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "mxnet";

     

       11
       11
       -
         version = "1.6.0";

     

       11
       11
       +
         version = "1.8.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
       -
           url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz";

     

       15
       15
       -
           sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1";

     

       14
       14
       +
           name = "apache-mxnet-src-${version}-incubating.tar.gz";

     

       15
       15
       +
           url = "https://dlcdn.apache.org/incubator/mxnet/${version}/apache-mxnet-src-${version}-incubating.tar.gz";

     

       16
       16
       +
           hash = "sha256-la/5hYlaukCcCNVRRRCuOLiEkM+2KBqzpf8PWCbI21Q=";

     

       16
       17
        
         };

     

       17
       18
        
       

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           # Fix build error https://github.com/apache/incubator-mxnet/issues/19405

     

       21
       21
       +
           (fetchpatch {

     

       22
       22
       +
             name = "mxnet-fix-gcc-linker-error-1.patch";

     

       23
       23
       +
             url = "https://github.com/apache/incubator-mxnet/commit/78e31d66d19e385ca4ef73245ce79a47e375d8d1.diff";

     

       24
       24
       +
             sha256 = "sha256-UfmGhh4RbvrEOXe6IJxHm1Aqpy1gS6gHxrX5KQBXjv4=";

     

       25
       25
       +
           })

     

       26
       26
       +
           (fetchpatch {

     

       27
       27
       +
             name = "mxnet-fix-gcc-linker-error-2.patch";

     

       28
       28
       +
             url = "https://github.com/apache/incubator-mxnet/commit/9bfe3116aabd01049fdbd90855cb245a30b795df.diff";

     

       29
       29
       +
             sha256 = "sha256-BL7Zf7Bgn0qpai9HbQ6LBxZNa3iLjVJSe5nxZgqI/fw=";

     

       30
       30
       +
           })

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       18
       33
        
         nativeBuildInputs = [ cmake perl ];

     

       19
       34
        
       

     

       20
       35
        
         buildInputs = [ opencv3 gtest blas.provider ]

     

       21
       21
       -
                     ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]

     

       22
       22
       -
                     ++ lib.optional cudnnSupport cudnn;

     

       36
       36
       +
           ++ lib.optional stdenv.cc.isGNU gomp

     

       37
       37
       +
           ++ lib.optional stdenv.cc.isClang llvmPackages.openmp

     

       38
       38
       +
           ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]

     

       39
       39
       +
           ++ lib.optional cudnnSupport cudnn;

     

       23
       40
        
       

     

       24
       41
        
         cmakeFlags =

     

       25
       42
        
           [ "-DUSE_MKL_IF_AVAILABLE=OFF" ]

     
···

       48
       65
        
           homepage = "https://mxnet.incubator.apache.org/";

     

       49
       66
        
           maintainers = with maintainers; [ abbradar ];

     

       50
       67
        
           license = licenses.asl20;

     

       51
       51
       -
           platforms = platforms.linux;

     

       68
       68
       +
           platforms = platforms.unix;

     

       52
       69
        
         };

     

       53
       70
        
       }

+1 -1

pkgs/development/libraries/audio/suil/default.nix

···

       31
       31
        
           description = "A lightweight C library for loading and wrapping LV2 plugin UIs";

     

       32
       32
        
           license = licenses.mit;

     

       33
       33
        
           maintainers = with maintainers; [ goibhniu ];

     

       34
       34
       -
           platforms = platforms.linux;

     

       34
       34
       +
           platforms = platforms.unix;

     

       35
       35
        
         };

     

       36
       36
        
       }

+6

pkgs/development/python-modules/tokenizers/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchFromGitHub

     

       3
       4
        
       , fetchurl

     

       4
       5
        
       , buildPythonPackage

     

       5
       6
        
       , rustPlatform

     

       6
       7
        
       , setuptools-rust

     

       8
       8
       +
       , libiconv

     

       7
       9
        
       , numpy

     

       8
       10
        
       , datasets

     

       9
       11
        
       , pytestCheckHook

     
···

       71
       73
        
           rust.cargo

     

       72
       74
        
           rust.rustc

     

       73
       75
        
         ]);

     

       76
       76
       +
       

     

       77
       77
       +
         buildInputs = lib.optionals stdenv.isDarwin [

     

       78
       78
       +
           libiconv

     

       79
       79
       +
         ];

     

       74
       80
        
       

     

       75
       81
        
         propagatedBuildInputs = [

     

       76
       82
        
           numpy

+2 -2

pkgs/development/web/twitter-bootstrap/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "bootstrap";

     

       5
       5
       -
         version = "5.1.0";

     

       5
       5
       +
         version = "5.1.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";

     

       9
       9
       -
           sha256 = "sha256-OVNCspdOM1BWDmV1LTaqtlc2UrEcxste95ouXoOtZLE=";

     

       9
       9
       +
           sha256 = "sha256-vewp21DsjR7My3AgIrgj3wozPhBYFMJksyG9UYuJxyE=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ unzip ];

+8 -2

pkgs/top-level/all-packages.nix

···

       24224
       24224
        
       

     

       24225
       24225
        
         audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };

     

       24226
       24226
        
         audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; };

     

       24227
       24227
       -
         audacity = audacity-gtk2;

     

       24227
       24227
       +
         audacity =

     

       24228
       24228
       +
           if stdenv.isDarwin then

     

       24229
       24229
       +
             callPackage ../applications/audio/audacity {

     

       24230
       24230
       +
               inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon Cocoa CoreAudio CoreAudioKit CoreServices;

     

       24231
       24231
       +
               suil = suil-qt5;

     

       24232
       24232
       +
             }

     

       24233
       24233
       +
           else

     

       24234
       24234
       +
             audacity-gtk2;

     

       24228
       24235
        
       

     

       24229
       24236
        
         audio-recorder = callPackage ../applications/audio/audio-recorder { };

     

       24230
       24237
        
       

     
···

       32084
       32091
        
       

     

       32085
       32092
        
         mxnet = callPackage ../applications/science/math/mxnet {

     

       32086
       32093
        
           inherit (linuxPackages) nvidia_x11;

     

       32087
       32087
       -
           stdenv = gcc9Stdenv;

     

       32088
       32094
        
         };

     

       32089
       32095
        
       

     

       32090
       32096
        
         wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };