commit a59dda942cbe3d40c1ae424d4d8a6db715cac0d5 · pyrox.dev/nixpkgs

+1 -3

pkgs/development/beam-modules/build-erlang-mk.nix

···

       17
       17
        
       , ...

     

       18
       18
        
       }@attrs:

     

       19
       19
        
       

     

       20
       20
       -
       with lib;

     

       21
       21
       -
       

     

       22
       20
        
       let

     

       23
       21
        
         debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info";

     

       24
       22
        
       

     
···

       107
       105
        
           };

     

       108
       106
        
         });

     

       109
       107
        
       in

     

       110
       110
       -
       fix pkg

     

       108
       108
       +
       lib.fix pkg

+1 -3

pkgs/development/beam-modules/build-hex.nix

···

       5
       5
        
       , hexPkg ? name

     

       6
       6
        
       , ... }@attrs:

     

       7
       7
        
       

     

       8
       8
       -
       with lib;

     

       9
       9
       -
       

     

       10
       8
        
       let

     

       11
       9
        
         pkg = self: builder (attrs // {

     

       12
       10
        
       

     
···

       17
       15
        
           };

     

       18
       16
        
         });

     

       19
       17
        
       in

     

       20
       20
       -
         fix pkg

     

       18
       18
       +
         lib.fix pkg

+1 -2

pkgs/development/beam-modules/build-mix.nix

···

       15
       15
        
       , ...

     

       16
       16
        
       }@attrs:

     

       17
       17
        
       

     

       18
       18
       -
       with lib;

     

       19
       18
        
       let

     

       20
       19
        
         shell = drv: stdenv.mkDerivation {

     

       21
       20
        
           name = "interactive-shell-${drv.name}";

     
···

       90
       89
        
           };

     

       91
       90
        
         });

     

       92
       91
        
       in

     

       93
       93
       -
       fix pkg

     

       92
       92
       +
       lib.fix pkg

     

       94
       93

+3 -5

pkgs/development/beam-modules/build-rebar3.nix

···

       16
       16
        
       , ...

     

       17
       17
        
       }@attrs:

     

       18
       18
        
       

     

       19
       19
       -
       with lib;

     

       20
       20
       -
       

     

       21
       19
        
       let

     

       22
       20
        
         debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";

     

       23
       21
        
       

     
···

       30
       28
        
           buildInputs = [ drv ];

     

       31
       29
        
         };

     

       32
       30
        
       

     

       33
       33
       -
         customPhases = filterAttrs

     

       31
       31
       +
         customPhases = lib.filterAttrs

     

       34
       32
        
           (_: v: v != null)

     

       35
       33
        
           { inherit setupHook configurePhase buildPhase installPhase; };

     

       36
       34
        
       

     
···

       40
       38
        
           inherit version;

     

       41
       39
        
       

     

       42
       40
        
           buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];

     

       43
       43
       -
           propagatedBuildInputs = unique beamDeps;

     

       41
       41
       +
           propagatedBuildInputs = lib.unique beamDeps;

     

       44
       42
        
       

     

       45
       43
        
           inherit src;

     

       46
       44
        
       

     
···

       85
       83
        
           };

     

       86
       84
        
         } // customPhases);

     

       87
       85
        
       in

     

       88
       88
       -
       fix pkg

     

       86
       86
       +
       lib.fix pkg

-2

pkgs/development/beam-modules/fetch-hex.nix

···

       6
       6
        
       , meta ? { }

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
       -
       with lib;

     

       10
       10
       -
       

     

       11
       9
        
       stdenv.mkDerivation ({

     

       12
       10
        
         pname = "hex-source-${pkg}";

     

       13
       11
        
         inherit version;

-2

pkgs/development/beam-modules/fetch-rebar-deps.nix

···

       7
       7
        
       , meta ? { }

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
       -
       with lib;

     

       11
       11
       -
       

     

       12
       10
        
       stdenv.mkDerivation ({

     

       13
       11
        
         pname = "rebar-deps-${name}";

     

       14
       12
        
         inherit version;

+2 -4

pkgs/development/beam-modules/rebar3-release.nix

···

       22
       22
        
       , ...

     

       23
       23
        
       }@attrs:

     

       24
       24
        
       

     

       25
       25
       -
       with lib;

     

       26
       26
       -
       

     

       27
       25
        
       let

     

       28
       26
        
         shell = drv: stdenv.mkDerivation {

     

       29
       27
        
           name = "interactive-shell-${drv.pname}";

     

       30
       28
        
           buildInputs = [ drv ];

     

       31
       29
        
         };

     

       32
       30
        
       

     

       33
       33
       -
         customPhases = filterAttrs

     

       31
       31
       +
         customPhases = lib.filterAttrs

     

       34
       32
        
           (_: v: v != null)

     

       35
       33
        
           { inherit setupHook configurePhase buildPhase installPhase; };

     

       36
       34
        
       

     
···

       105
       103
        
             } // (if attrs ? passthru then attrs.passthru else { }));

     

       106
       104
        
           } // customPhases);

     

       107
       105
        
       in

     

       108
       108
       -
       fix pkg

     

       106
       106
       +
       lib.fix pkg

+1 -2

pkgs/development/compilers/intercal/default.nix

···

       3
       3
        
       , bison, flex

     

       4
       4
        
       , makeWrapper }:

     

       5
       5
        
       

     

       6
       6
       -
       with lib;

     

       7
       6
        
       stdenv.mkDerivation rec {

     

       8
       7
        
       

     

       9
       8
        
         pname = "intercal";

     
···

       31
       30
        
           wrapProgram $out/bin/ick --suffix PATH ':' ${stdenv.cc}/bin

     

       32
       31
        
         '';

     

       33
       32
        
       

     

       34
       34
       -
         meta = {

     

       33
       33
       +
         meta = with lib; {

     

       35
       34
        
           description = "The original esoteric programming language";

     

       36
       35
        
           longDescription = ''

     

       37
       36
        
             INTERCAL, an abbreviation for "Compiler Language With No

+1 -3

pkgs/development/compilers/scala/2.x.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, writeScript

     

       2
       2
        
       , common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }:

     

       3
       3
        
       

     

       4
       4
       -
       with lib;

     

       5
       5
       -
       

     

       6
       4
        
       let

     

       7
       5
        
         repo = "git@github.com:scala/scala.git";

     

       8
       6
        
       

     
···

       102
       100
        
           '';

     

       103
       101
        
         };

     

       104
       102
        
       

     

       105
       105
       -
         meta = {

     

       103
       103
       +
         meta = with lib; {

     

       106
       104
        
           description = "A general purpose programming language";

     

       107
       105
        
           longDescription = ''

     

       108
       106
        
             Scala is a general purpose programming language designed to express

+2 -4

pkgs/development/compilers/sdcc/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null

     

       2
       2
        
       , excludePorts ? [] }:

     

       3
       3
        
       

     

       4
       4
       -
       with lib;

     

       5
       5
       -
       

     

       6
       4
        
       let

     

       7
       5
        
         # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8

     

       8
       8
       -
         excludedPorts = excludePorts ++ (optionals (gputils == null) [ "pic14" "pic16" ]);

     

       6
       6
       +
         excludedPorts = excludePorts ++ (lib.optionals (gputils == null) [ "pic14" "pic16" ]);

     

       9
       7
        
       in

     

       10
       8
        
       

     

       11
       9
        
       stdenv.mkDerivation rec {

     
···

       29
       27
        
           fi

     

       30
       28
        
         '';

     

       31
       29
        
       

     

       32
       32
       -
         meta = {

     

       30
       30
       +
         meta = with lib; {

     

       33
       31
        
           description = "Small Device C Compiler";

     

       34
       32
        
           longDescription = ''

     

       35
       33
        
             SDCC is a retargettable, optimizing ANSI - C compiler suite that targets

+1 -2

pkgs/development/interpreters/lolcode/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, pkg-config, doxygen, cmake, readline }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       3
        
       stdenv.mkDerivation rec {

     

       5
       4
        
       

     

       6
       5
        
         pname = "lolcode";

     
···

       19
       18
        
         # Maybe it clashes with lci scientific logic software package...

     

       20
       19
        
         postInstall = "mv $out/bin/lci $out/bin/lolcode-lci";

     

       21
       20
        
       

     

       22
       22
       -
         meta = {

     

       21
       21
       +
         meta = with lib; {

     

       23
       22
        
           homepage = "http://lolcode.org";

     

       24
       23
        
           description = "An esoteric programming language";

     

       25
       24
        
           longDescription = ''

+16 -18

pkgs/development/interpreters/perl/default.nix

···

       12
       12
        
       # cgit) that are needed here should be included directly in Nixpkgs as

     

       13
       13
        
       # files.

     

       14
       14
        
       

     

       15
       15
       -
       with lib;

     

       16
       16
       -
       

     

       17
       15
        
       let

     

       18
       16
        
       

     

       19
       17
        
         libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";

     
···

       33
       31
        
           strictDeps = true;

     

       34
       32
        
           # TODO: Add a "dev" output containing the header files.

     

       35
       33
        
           outputs = [ "out" "man" "devdoc" ] ++

     

       36
       36
       -
             optional crossCompiling "mini";

     

       34
       34
       +
             lib.optional crossCompiling "mini";

     

       37
       35
        
           setOutputFlags = false;

     

       38
       36
        
       

     

       39
       37
        
           # On FreeBSD, if Perl is built with threads support, having

     
···

       57
       55
        
               # Enable TLS/SSL verification in HTTP::Tiny by default

     

       58
       56
        
               ./http-tiny-verify-ssl-by-default.patch

     

       59
       57
        
             ]

     

       60
       60
       -
             ++ optional stdenv.isSunOS ./ld-shared.patch

     

       61
       61
       -
             ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]

     

       62
       62
       -
             ++ optional crossCompiling ./MakeMaker-cross.patch;

     

       58
       58
       +
             ++ lib.optional stdenv.isSunOS ./ld-shared.patch

     

       59
       59
       +
             ++ lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]

     

       60
       60
       +
             ++ lib.optional crossCompiling ./MakeMaker-cross.patch;

     

       63
       61
        
       

     

       64
       62
        
           # This is not done for native builds because pwd may need to come from

     

       65
       63
        
           # bootstrap tools when building bootstrap perl.

     
···

       93
       91
        
               "-Dlocincpth=${libcInc}/include"

     

       94
       92
        
               "-Dloclibpth=${libcLib}/lib"

     

       95
       93
        
             ]

     

       96
       96
       -
             ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]

     

       97
       97
       -
             ++ optional stdenv.isSunOS "-Dcc=gcc"

     

       98
       98
       -
             ++ optional enableThreading "-Dusethreads"

     

       99
       99
       -
             ++ optional (!enableCrypt) "-A clear:d_crypt_r"

     

       100
       100
       -
             ++ optional stdenv.hostPlatform.isStatic "--all-static"

     

       101
       101
       -
             ++ optionals (!crossCompiling) [

     

       94
       94
       +
             ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]

     

       95
       95
       +
             ++ lib.optional stdenv.isSunOS "-Dcc=gcc"

     

       96
       96
       +
             ++ lib.optional enableThreading "-Dusethreads"

     

       97
       97
       +
             ++ lib.optional (!enableCrypt) "-A clear:d_crypt_r"

     

       98
       98
       +
             ++ lib.optional stdenv.hostPlatform.isStatic "--all-static"

     

       99
       99
       +
             ++ lib.optionals (!crossCompiling) [

     

       102
       100
        
               "-Dprefix=${placeholder "out"}"

     

       103
       101
        
               "-Dman1dir=${placeholder "out"}/share/man/man1"

     

       104
       102
        
               "-Dman3dir=${placeholder "out"}/share/man/man3"

     

       105
       103
        
             ];

     

       106
       104
        
       

     

       107
       107
       -
           configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure";

     

       105
       105
       +
           configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure";

     

       108
       106
        
       

     

       109
       107
        
           dontAddStaticConfigureFlags = true;

     

       110
       108
        
       

     
···

       138
       136
        
               OLD_ZLIB     = False

     

       139
       137
        
               GZIP_OS_CODE = AUTO_DETECT

     

       140
       138
        
               EOF

     

       141
       141
       -
             '' + optionalString stdenv.isDarwin ''

     

       139
       139
       +
             '' + lib.optionalString stdenv.isDarwin ''

     

       142
       140
        
               substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""

     

       143
       143
       -
             '' + optionalString (!enableThreading) ''

     

       141
       141
       +
             '' + lib.optionalString (!enableThreading) ''

     

       144
       142
        
               # We need to do this because the bootstrap doesn't have a static libpthread

     

       145
       143
        
               sed -i 's,\(libswanted.*\)pthread,\1,g' Configure

     

       146
       144
        
             '';

     
···

       183
       181
        
                   }" /no-such-path \

     

       184
       182
        
                 --replace "${stdenv.cc}" /no-such-path \

     

       185
       183
        
                 --replace "$man" /no-such-path

     

       186
       186
       -
             '' + optionalString crossCompiling

     

       184
       184
       +
             '' + lib.optionalString crossCompiling

     

       187
       185
        
             ''

     

       188
       186
        
               mkdir -p $mini/lib/perl5/cross_perl/${version}

     

       189
       187
        
               for dir in cnf/{stub,cpan}; do

     
···

       207
       205
        
                 "$mini/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch"

     

       208
       206
        
             ''; # */

     

       209
       207
        
       

     

       210
       210
       -
           meta = {

     

       208
       208
       +
           meta = with lib; {

     

       211
       209
        
             homepage = "https://www.perl.org/";

     

       212
       210
        
             description = "The standard implementation of the Perl 5 programmming language";

     

       213
       211
        
             license = licenses.artistic1;

     
···

       215
       213
        
             platforms = platforms.all;

     

       216
       214
        
             priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`

     

       217
       215
        
           };

     

       218
       218
       -
         } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {

     

       216
       216
       +
         } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {

     

       219
       217
        
           crossVersion = "c876045741f5159318085d2737b0090f35a842ca"; # June 5, 2022

     

       220
       218
        
       

     

       221
       219
        
           perl-cross-src = fetchFromGitHub {

+4 -5

pkgs/development/interpreters/picolisp/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:

     

       2
       2
       -
       with lib;

     

       3
       2
        
       

     

       4
       3
        
       stdenv.mkDerivation rec {

     

       5
       4
        
         pname = "picoLisp";

     
···

       9
       8
        
           sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2";

     

       10
       9
        
         };

     

       11
       10
        
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       -
         buildInputs = [openssl] ++ optional stdenv.is64bit jdk;

     

       11
       11
       +
         buildInputs = [openssl] ++ lib.optional stdenv.is64bit jdk;

     

       13
       12
        
         patchPhase = ''

     

       14
       13
        
           sed -i "s/which java/command -v java/g" mkAsm

     

       15
       14
        
       

     

       16
       16
       -
           ${optionalString stdenv.isAarch32 ''

     

       15
       15
       +
           ${lib.optionalString stdenv.isAarch32 ''

     

       17
       16
        
             sed -i s/-m32//g Makefile

     

       18
       17
        
             cat >>Makefile <<EOF

     

       19
       18
        
             ext.o: ext.c

     
···

       23
       22
        
             EOF

     

       24
       23
        
           ''}

     

       25
       24
        
         '';

     

       26
       26
       -
         sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';

     

       25
       25
       +
         sourceRoot = ''picoLisp/src${lib.optionalString stdenv.is64bit "64"}'';

     

       27
       26
        
         postBuild = ''

     

       28
       27
        
           cd ../src; make gate

     

       29
       28
        
         '';

     
···

       49
       48
        
           ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp"

     

       50
       49
        
         '';

     

       51
       50
        
       

     

       52
       52
       -
         meta = {

     

       51
       51
       +
         meta = with lib; {

     

       53
       52
        
           # darwin: build times out

     

       54
       53
        
           broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;

     

       55
       54
        
           description = "A simple Lisp with an integrated database";

+31 -33

pkgs/development/interpreters/python/cpython/2.7/default.nix

···

       54
       54
        
       assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode))

     

       55
       55
        
         "Deterministic builds are not achieved when (default unoptimized) bytecode is created.";

     

       56
       56
        
       

     

       57
       57
       -
       with lib;

     

       58
       58
       -
       

     

       59
       57
        
       let

     

       60
       58
        
         buildPackages = pkgsBuildHost;

     

       61
       59
        
         inherit (passthru) pythonForBuild;

     
···

       133
       131
        
             # * https://github.com/python/cpython/commit/e6b247c8e524

     

       134
       132
        
             ../3.7/no-win64-workaround.patch

     

       135
       133
        
       

     

       136
       136
       -
           ] ++ optionals (x11Support && stdenv.isDarwin) [

     

       134
       134
       +
           ] ++ lib.optionals (x11Support && stdenv.isDarwin) [

     

       137
       135
        
             ./use-correct-tcl-tk-on-darwin.patch

     

       138
       138
       -
           ] ++ optionals stdenv.isLinux [

     

       136
       136
       +
           ] ++ lib.optionals stdenv.isLinux [

     

       139
       137
        
       

     

       140
       138
        
             # Disable the use of ldconfig in ctypes.util.find_library (since

     

       141
       139
        
             # ldconfig doesn't work on NixOS), and don't use

     
···

       147
       145
        
             # Fix ctypes.util.find_library with gcc10.

     

       148
       146
        
             ./find_library-gcc10.patch

     

       149
       147
        
       

     

       150
       150
       -
           ] ++ optionals stdenv.hostPlatform.isCygwin [

     

       148
       148
       +
           ] ++ lib.optionals stdenv.hostPlatform.isCygwin [

     

       151
       149
        
             ./2.5.2-ctypes-util-find_library.patch

     

       152
       150
        
             ./2.5.2-tkinter-x11.patch

     

       153
       151
        
             ./2.6.2-ssl-threads.patch

     
···

       158
       156
        
             ./2.7.3-dylib.patch

     

       159
       157
        
             ./2.7.3-getpath-exe-extension.patch

     

       160
       158
        
             ./2.7.3-no-libm.patch

     

       161
       161
       -
           ] ++ optionals hasDistutilsCxxPatch [

     

       159
       159
       +
           ] ++ lib.optionals hasDistutilsCxxPatch [

     

       162
       160
        
       

     

       163
       161
        
             # Patch from http://bugs.python.org/issue1222585 adapted to work with

     

       164
       162
        
             # `patch -p1' and with a last hunk removed

     
···

       166
       164
        
             # only works for GCC and Apple Clang. This makes distutils to call C++

     

       167
       165
        
             # compiler when needed.

     

       168
       166
        
             ./python-2.7-distutils-C++.patch

     

       169
       169
       -
           ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       167
       167
       +
           ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       170
       168
        
             ./cross-compile.patch

     

       171
       169
        
           ];

     

       172
       170
        
       

     
···

       175
       173
        
             for i in /usr /sw /opt /pkg; do

     

       176
       174
        
               substituteInPlace ./setup.py --replace $i /no-such-path

     

       177
       175
        
             done

     

       178
       178
       -
           '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''

     

       176
       176
       +
           '' + lib.optionalString (stdenv ? cc && stdenv.cc.libc != null) ''

     

       179
       177
        
             for i in Lib/plat-*/regen; do

     

       180
       178
        
               substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/

     

       181
       179
        
             done

     

       182
       182
       -
           '' + optionalString stdenv.isDarwin ''

     

       180
       180
       +
           '' + lib.optionalString stdenv.isDarwin ''

     

       183
       181
        
             substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'

     

       184
       182
        
             substituteInPlace Lib/multiprocessing/__init__.py \

     

       185
       183
        
               --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'

     

       186
       184
        
           '';

     

       187
       185
        
       

     

       188
       188
       -
         configureFlags = optionals enableOptimizations [

     

       186
       186
       +
         configureFlags = lib.optionals enableOptimizations [

     

       189
       187
        
           "--enable-optimizations"

     

       190
       190
       -
         ] ++ optionals (!static) [

     

       188
       188
       +
         ] ++ lib.optionals (!static) [

     

       191
       189
        
           "--enable-shared"

     

       192
       190
        
         ] ++ [

     

       193
       191
        
           "--with-threads"

     

       194
       192
        
           "--with-system-ffi"

     

       195
       193
        
           "--with-system-expat"

     

       196
       194
        
           "--enable-unicode=ucs${toString ucsEncoding}"

     

       197
       197
       -
         ] ++ optionals stdenv.hostPlatform.isCygwin [

     

       195
       195
       +
         ] ++ lib.optionals stdenv.hostPlatform.isCygwin [

     

       198
       196
        
           "ac_cv_func_bind_textdomain_codeset=yes"

     

       199
       199
       -
         ] ++ optionals stdenv.isDarwin [

     

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

     

       200
       198
        
           "--disable-toolbox-glue"

     

       201
       201
       -
         ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       202
       202
       -
           "PYTHON_FOR_BUILD=${getBin buildPackages.python}/bin/python"

     

       199
       199
       +
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       200
       200
       +
           "PYTHON_FOR_BUILD=${lib.getBin buildPackages.python}/bin/python"

     

       203
       201
        
           "ac_cv_buggy_getaddrinfo=no"

     

       204
       202
        
           # Assume little-endian IEEE 754 floating point when cross compiling

     

       205
       203
        
           "ac_cv_little_endian_double=yes"

     
···

       223
       221
        
         ]

     

       224
       222
        
           # Never even try to use lchmod on linux,

     

       225
       223
        
           # don't rely on detecting glibc-isms.

     

       226
       226
       -
         ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"

     

       227
       227
       -
         ++ optional static "LDFLAGS=-static";

     

       224
       224
       +
         ++ lib.optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"

     

       225
       225
       +
         ++ lib.optional static "LDFLAGS=-static";

     

       228
       226
        
       

     

       229
       227
        
         strictDeps = true;

     

       230
       228
        
         buildInputs =

     

       231
       231
       -
           optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++

     

       229
       229
       +
           lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++

     

       232
       230
        
           [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ]

     

       233
       233
       -
           ++ optionals x11Support [ tcl tk libX11 ]

     

       234
       234
       -
           ++ optional (stdenv.isDarwin && configd != null) configd;

     

       231
       231
       +
           ++ lib.optionals x11Support [ tcl tk libX11 ]

     

       232
       232
       +
           ++ lib.optional (stdenv.isDarwin && configd != null) configd;

     

       235
       233
        
         nativeBuildInputs =

     

       236
       234
        
           [ autoreconfHook ]

     

       237
       237
       -
           ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)

     

       235
       235
       +
           ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)

     

       238
       236
        
             [ buildPackages.stdenv.cc buildPackages.python ];

     

       239
       237
        
       

     

       240
       238
        
         mkPaths = paths: {

     

       241
       241
       -
           C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;

     

       242
       242
       -
           LIBRARY_PATH = makeLibraryPath paths;

     

       239
       239
       +
           C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" paths;

     

       240
       240
       +
           LIBRARY_PATH = lib.makeLibraryPath paths;

     

       243
       241
        
         };

     

       244
       242
        
       

     

       245
       243
        
         # Python 2.7 needs this

     
···

       258
       256
        
           LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";

     

       259
       257
        
           inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;

     

       260
       258
        
       

     

       261
       261
       -
           NIX_CFLAGS_COMPILE = optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2"

     

       262
       262
       -
             + optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000";

     

       259
       259
       +
           NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2"

     

       260
       260
       +
             + lib.optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000";

     

       263
       261
        
           DETERMINISTIC_BUILD = 1;

     

       264
       262
        
       

     

       265
       263
        
           setupHook = python-setup-hook sitePackages;

     

       266
       264
        
       

     

       267
       267
       -
           postPatch = optionalString (x11Support && (tix != null)) ''

     

       265
       265
       +
           postPatch = lib.optionalString (x11Support && (tix != null)) ''

     

       268
       266
        
                 substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"

     

       269
       267
        
           '';

     

       270
       268
        
       

     
···

       291
       289
        
               # Determinism: Windows installers were not deterministic.

     

       292
       290
        
               # We're also not interested in building Windows installers.

     

       293
       291
        
               find "$out" -name 'wininst*.exe' | xargs -r rm -f

     

       294
       294
       -
             '' + optionalString stripBytecode ''

     

       292
       292
       +
             '' + lib.optionalString stripBytecode ''

     

       295
       293
        
               # Determinism: deterministic bytecode

     

       296
       294
        
               # First we delete all old bytecode.

     

       297
       295
        
               find $out -name "*.pyc" -delete

     

       298
       298
       -
               '' + optionalString rebuildBytecode ''

     

       296
       296
       +
               '' + lib.optionalString rebuildBytecode ''

     

       299
       297
        
               # We build 3 levels of optimized bytecode. Note the default level, without optimizations,

     

       300
       298
        
               # is not reproducible yet. https://bugs.python.org/issue29708

     

       301
       299
        
               # Not creating bytecode will result in a large performance loss however, so we do build it.

     

       302
       300
        
               find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i -

     

       303
       301
        
               find $out -name "*.py" | ${pythonForBuildInterpreter} -O  -m compileall -q -f -x "lib2to3" -i -

     

       304
       302
        
               find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i -

     

       305
       305
       -
             '' + optionalString stdenv.hostPlatform.isCygwin ''

     

       303
       303
       +
             '' + lib.optionalString stdenv.hostPlatform.isCygwin ''

     

       306
       304
        
               cp libpython2.7.dll.a $out/lib

     

       307
       305
        
             '';

     

       308
       306
        
       

     
···

       311
       309
        
           postFixup = ''

     

       312
       310
        
             # Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7.

     

       313
       311
        
             cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py

     

       314
       314
       -
           '' + optionalString strip2to3 ''

     

       312
       312
       +
           '' + lib.optionalString strip2to3 ''

     

       315
       313
        
             rm -R $out/bin/2to3 $out/lib/python*/lib2to3

     

       316
       316
       -
           '' + optionalString stripConfig ''

     

       314
       314
       +
           '' + lib.optionalString stripConfig ''

     

       317
       315
        
             rm -R $out/bin/python*-config $out/lib/python*/config*

     

       318
       318
       -
           '' + optionalString stripIdlelib ''

     

       316
       316
       +
           '' + lib.optionalString stripIdlelib ''

     

       319
       317
        
             # Strip IDLE

     

       320
       318
        
             rm -R $out/bin/idle* $out/lib/python*/idlelib

     

       321
       321
       -
           '' + optionalString stripTests ''

     

       319
       319
       +
           '' + lib.optionalString stripTests ''

     

       322
       320
        
             # Strip tests

     

       323
       321
        
             rm -R $out/lib/python*/test $out/lib/python*/**/test{,s}

     

       324
       322
        
           '';

+3 -5

pkgs/development/interpreters/python/wrap-python.nix

···

       3
       3
        
       , makePythonHook

     

       4
       4
        
       , makeWrapper }:

     

       5
       5
        
       

     

       6
       6
       -
       with lib;

     

       7
       7
       -
       

     

       8
       6
        
       makePythonHook {

     

       9
       7
        
             deps = makeWrapper;

     

       10
       8
        
             substitutions.sitePackages = python.sitePackages;

     
···

       19
       17
        
       

     

       20
       18
        
               mkStringSkipper = labelNum: quote: let

     

       21
       19
        
                 label = "q${toString labelNum}";

     

       22
       22
       -
                 isSingle = elem quote [ "\"" "'\"'\"'" ];

     

       20
       20
       +
                 isSingle = lib.elem quote [ "\"" "'\"'\"'" ];

     

       23
       21
        
                 endQuote = if isSingle then "[^\\\\]${quote}" else quote;

     

       24
       22
        
               in ''

     

       25
       23
        
                 /^[a-z]?${quote}/ {

     
···

       45
       43
        
                 :r

     

       46
       44
        
                 /\\$|,$/{N;br}

     

       47
       45
        
                 /__future__|^ |^ *(#.*)?$/{n;br}

     

       48
       48
       -
                 ${concatImapStrings mkStringSkipper quoteVariants}

     

       49
       49
       -
                 /^[^# ]/i ${replaceStrings ["\n"] [";"] preamble}

     

       46
       46
       +
                 ${lib.concatImapStrings mkStringSkipper quoteVariants}

     

       47
       47
       +
                 /^[^# ]/i ${lib.replaceStrings ["\n"] [";"] preamble}

     

       50
       48
        
               }

     

       51
       49
        
             '';

     

       52
       50
        
       } ./wrap.sh

+8 -8

pkgs/development/interpreters/ruby/ruby-version.nix

···

       1
       1
        
       # Contains the ruby version heuristics

     

       2
       2
        
       { lib }:

     

       3
       3
       -
       with lib;

     

       3
       3
       +
       

     

       4
       4
        
       let

     

       5
       5
        
         # The returned set should be immutable

     

       6
       6
        
         rubyVersion = major: minor: tiny: tail:

     
···

       10
       10
        
             # Contains the patch number "223" if tail is "p223" or null

     

       11
       11
        
             patchLevel =

     

       12
       12
        
               let

     

       13
       13
       -
                 p = removePrefix "p" tail;

     

       13
       13
       +
                 p = lib.removePrefix "p" tail;

     

       14
       14
        
                 isPosInt = num:

     

       15
       15
       -
                   0 == stringLength

     

       16
       16
       -
                     (replaceStrings

     

       15
       15
       +
                   0 == lib.stringLength

     

       16
       16
       +
                     (lib.replaceStrings

     

       17
       17
        
                     ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9"]

     

       18
       18
        
                     [""  ""  ""  ""  ""  ""  ""  ""  ""  "" ]

     

       19
       19
        
                     num);

     

       20
       20
        
               in

     

       21
       21
       -
                 if hasPrefix "p" tail && isPosInt p then p

     

       21
       21
       +
                 if lib.hasPrefix "p" tail && isPosInt p then p

     

       22
       22
        
                 else null;

     

       23
       23
        
       

     

       24
       24
        
             # Shortcuts

     
···

       28
       28
        
             # Ruby separates lib and gem folders by ABI version which isn't very

     

       29
       29
        
             # consistent.

     

       30
       30
        
             libDir =

     

       31
       31
       -
               if versionAtLeast majMinTiny "2.1.0" then

     

       31
       31
       +
               if lib.versionAtLeast majMinTiny "2.1.0" then

     

       32
       32
        
                 "${majMin}.0"

     

       33
       33
       -
               else if versionAtLeast majMinTiny "2.0.0" then

     

       33
       33
       +
               else if lib.versionAtLeast majMinTiny "2.0.0" then

     

       34
       34
        
                 "2.0.0"

     

       35
       35
       -
               else if versionAtLeast majMinTiny "1.9.1" then

     

       35
       35
       +
               else if lib.versionAtLeast majMinTiny "1.9.1" then

     

       36
       36
        
                 "1.9.1"

     

       37
       37
        
               else

     

       38
       38
        
                 throw "version ${majMinTiny} is not supported";

+1 -2

pkgs/development/java-modules/maven-minimal.nix

···

       1
       1
        
       { lib, pkgs }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       3
        
       with pkgs.javaPackages;

     

       5
       4
        
       

     

       6
       5
        
       let

     
···

       10
       9
        
         poms = import ./poms.nix { inherit fetchMaven; };

     

       11
       10
        
       in {

     

       12
       11
        
         # Maven needs all of these to function

     

       13
       13
       -
         mavenMinimal = flatten

     

       12
       12
       +
         mavenMinimal = lib.flatten

     

       14
       13
        
           collections.mavenLibs_2_0_6

     

       15
       14
        
           ++ collections.mavenLibs_2_0_9

     

       16
       15
        
           ++ collections.mavenLibs_2_2_1

+13 -15

pkgs/development/libraries/SDL/default.nix

···

       11
       11
        
       # NOTE: When editing this expression see if the same change applies to

     

       12
       12
        
       # SDL2 expression too

     

       13
       13
        
       

     

       14
       14
       -
       with lib;

     

       15
       15
       -
       

     

       16
       14
        
       let

     

       17
       15
        
         extraPropagatedBuildInputs = [ ]

     

       18
       18
       -
           ++ optionals x11Support [ libXext libICE libXrandr ]

     

       19
       19
       -
           ++ optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ]

     

       20
       20
       -
           ++ optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ]

     

       21
       21
       -
           ++ optional alsaSupport alsa-lib

     

       22
       22
       -
           ++ optional pulseaudioSupport libpulseaudio

     

       23
       23
       -
           ++ optional stdenv.isDarwin Cocoa;

     

       24
       24
       -
         rpath = makeLibraryPath extraPropagatedBuildInputs;

     

       16
       16
       +
           ++ lib.optionals x11Support [ libXext libICE libXrandr ]

     

       17
       17
       +
           ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ]

     

       18
       18
       +
           ++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ]

     

       19
       19
       +
           ++ lib.optional alsaSupport alsa-lib

     

       20
       20
       +
           ++ lib.optional pulseaudioSupport libpulseaudio

     

       21
       21
       +
           ++ lib.optional stdenv.isDarwin Cocoa;

     

       22
       22
       +
         rpath = lib.makeLibraryPath extraPropagatedBuildInputs;

     

       25
       23
        
       in

     

       26
       24
        
       

     

       27
       25
        
       stdenv.mkDerivation rec {

     
···

       40
       38
        
         outputBin = "dev"; # sdl-config

     

       41
       39
        
       

     

       42
       40
        
         nativeBuildInputs = [ pkg-config ]

     

       43
       43
       -
           ++ optional stdenv.isLinux libcap;

     

       41
       41
       +
           ++ lib.optional stdenv.isLinux libcap;

     

       44
       42
        
       

     

       45
       43
        
         propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs;

     

       46
       44
        
       

     

       47
       45
        
         buildInputs = [ ]

     

       48
       48
       -
           ++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile

     

       49
       49
       -
           ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];

     

       46
       46
       +
           ++ lib.optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile

     

       47
       47
       +
           ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];

     

       50
       48
        
       

     

       51
       49
        
         configureFlags = [

     

       52
       50
        
           "--disable-oss"

     
···

       58
       56
        
         #   SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)

     

       59
       57
        
         #

     

       60
       58
        
         # Please try revert the change that introduced this comment when updating SDL.

     

       61
       61
       -
         ] ++ optional stdenv.isDarwin "--disable-x11-shared"

     

       62
       62
       -
           ++ optional (!x11Support) "--without-x"

     

       63
       63
       -
           ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib";

     

       59
       59
       +
         ] ++ lib.optional stdenv.isDarwin "--disable-x11-shared"

     

       60
       60
       +
           ++ lib.optional (!x11Support) "--without-x"

     

       61
       61
       +
           ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib";

     

       64
       62
        
       

     

       65
       63
        
         patches = [

     

       66
       64
        
           ./find-headers.patch

+21 -23

pkgs/development/libraries/SDL2/default.nix

···

       55
       55
        
       # NOTE: When editing this expression see if the same change applies to

     

       56
       56
        
       # SDL expression too

     

       57
       57
        
       

     

       58
       58
       -
       with lib;

     

       59
       59
       -
       

     

       60
       58
        
       stdenv.mkDerivation rec {

     

       61
       59
        
         pname = "SDL2";

     

       62
       60
        
         version = "2.24.2";

     
···

       88
       86
        
       

     

       89
       87
        
         depsBuildBuild = [ pkg-config ];

     

       90
       88
        
       

     

       91
       91
       -
         nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland wayland-scanner ];

     

       89
       89
       +
         nativeBuildInputs = [ pkg-config ] ++ lib.optionals waylandSupport [ wayland wayland-scanner ];

     

       92
       90
        
       

     

       93
       91
        
         propagatedBuildInputs = dlopenPropagatedBuildInputs;

     

       94
       92
        
       

     

       95
       93
        
         dlopenPropagatedBuildInputs = [ ]

     

       96
       94
        
           # Propagated for #include <GLES/gl.h> in SDL_opengles.h.

     

       97
       97
       -
           ++ optional openglSupport libGL

     

       95
       95
       +
           ++ lib.optional openglSupport libGL

     

       98
       96
        
           # Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h.

     

       99
       99
       -
           ++ optionals x11Support [ libX11 xorgproto ];

     

       97
       97
       +
           ++ lib.optionals x11Support [ libX11 xorgproto ];

     

       100
       98
        
       

     

       101
       101
       -
         dlopenBuildInputs = optionals alsaSupport [ alsa-lib audiofile ]

     

       102
       102
       -
           ++ optional dbusSupport dbus

     

       103
       103
       -
           ++ optional libdecorSupport libdecor

     

       104
       104
       -
           ++ optional pipewireSupport pipewire

     

       105
       105
       -
           ++ optional pulseaudioSupport libpulseaudio

     

       106
       106
       -
           ++ optional udevSupport udev

     

       107
       107
       -
           ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]

     

       108
       108
       -
           ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]

     

       109
       109
       -
           ++ optionals drmSupport [ libdrm mesa ];

     

       99
       99
       +
         dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ]

     

       100
       100
       +
           ++ lib.optional dbusSupport dbus

     

       101
       101
       +
           ++ lib.optional libdecorSupport libdecor

     

       102
       102
       +
           ++ lib.optional pipewireSupport pipewire

     

       103
       103
       +
           ++ lib.optional pulseaudioSupport libpulseaudio

     

       104
       104
       +
           ++ lib.optional udevSupport udev

     

       105
       105
       +
           ++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]

     

       106
       106
       +
           ++ lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]

     

       107
       107
       +
           ++ lib.optionals drmSupport [ libdrm mesa ];

     

       110
       108
        
       

     

       111
       109
        
         buildInputs = [ libiconv ]

     

       112
       110
        
           ++ dlopenBuildInputs

     

       113
       113
       -
           ++ optional ibusSupport ibus

     

       114
       114
       -
           ++ optional fcitxSupport fcitx

     

       115
       115
       -
           ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];

     

       111
       111
       +
           ++ lib.optional ibusSupport ibus

     

       112
       112
       +
           ++ lib.optional fcitxSupport fcitx

     

       113
       113
       +
           ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];

     

       116
       114
        
       

     

       117
       115
        
         enableParallelBuilding = true;

     

       118
       116
        
       

     

       119
       117
        
         configureFlags = [

     

       120
       118
        
           "--disable-oss"

     

       121
       121
       -
         ] ++ optional (!x11Support) "--without-x"

     

       122
       122
       -
         ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"

     

       123
       123
       -
         ++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles"

     

       124
       124
       -
         ++ optional stdenv.isDarwin "--disable-sdltest";

     

       119
       119
       +
         ] ++ lib.optional (!x11Support) "--without-x"

     

       120
       120
       +
         ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"

     

       121
       121
       +
         ++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles"

     

       122
       122
       +
         ++ lib.optional stdenv.isDarwin "--disable-sdltest";

     

       125
       123
        
       

     

       126
       124
        
         # We remove libtool .la files when static libs are requested,

     

       127
       125
        
         # because they make the builds of downstream libs like `SDL_tff`

     
···

       156
       154
        
         # list the symbols used in this way.

     

       157
       155
        
         postFixup =

     

       158
       156
        
           let

     

       159
       159
       -
             rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs);

     

       157
       157
       +
             rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs);

     

       160
       158
        
           in

     

       161
       161
       -
           optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") ''

     

       159
       159
       +
           lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") ''

     

       162
       160
        
             for lib in $out/lib/*.so* ; do

     

       163
       161
        
               if ! [[ -L "$lib" ]]; then

     

       164
       162
        
                 patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib"

+11 -13

pkgs/development/libraries/apr-util/default.nix

···

       10
       10
        
       assert bdbSupport -> db != null;

     

       11
       11
        
       assert ldapSupport -> openldap != null;

     

       12
       12
        
       

     

       13
       13
       -
       with lib;

     

       14
       14
       -
       

     

       15
       13
        
       stdenv.mkDerivation rec {

     

       16
       14
        
         pname = "apr-util";

     

       17
       15
        
         version = "1.6.1";

     
···

       22
       20
        
         };

     

       23
       21
        
       

     

       24
       22
        
         patches = [ ./fix-libxcrypt-build.patch ]

     

       25
       25
       -
           ++ optional stdenv.isFreeBSD ./include-static-dependencies.patch;

     

       23
       23
       +
           ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch;

     

       26
       24
        
       

     

       27
       25
        
         NIX_CFLAGS_LINK = [ "-lcrypt" ];

     

       28
       26
        
       

     

       29
       27
        
         outputs = [ "out" "dev" ];

     

       30
       28
        
         outputBin = "dev";

     

       31
       29
        
       

     

       32
       32
       -
         nativeBuildInputs = [ makeWrapper ] ++ optional stdenv.isFreeBSD autoreconfHook;

     

       30
       30
       +
         nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isFreeBSD autoreconfHook;

     

       33
       31
        
       

     

       34
       32
        
         configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ]

     

       35
       35
       -
           ++ optional (!stdenv.isCygwin) "--with-crypto"

     

       36
       36
       -
           ++ optional sslSupport "--with-openssl=${openssl.dev}"

     

       37
       37
       -
           ++ optional bdbSupport "--with-berkeley-db=${db.dev}"

     

       38
       38
       -
           ++ optional ldapSupport "--with-ldap=ldap"

     

       39
       39
       -
           ++ optionals stdenv.isCygwin

     

       33
       33
       +
           ++ lib.optional (!stdenv.isCygwin) "--with-crypto"

     

       34
       34
       +
           ++ lib.optional sslSupport "--with-openssl=${openssl.dev}"

     

       35
       35
       +
           ++ lib.optional bdbSupport "--with-berkeley-db=${db.dev}"

     

       36
       36
       +
           ++ lib.optional ldapSupport "--with-ldap=ldap"

     

       37
       37
       +
           ++ lib.optionals stdenv.isCygwin

     

       40
       38
        
             [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3"

     

       41
       39
        
               "--without-freetds" "--without-berkeley-db" "--without-crypto" ]

     

       42
       40
        
           ;

     
···

       53
       51
        
         '';

     

       54
       52
        
       

     

       55
       53
        
         propagatedBuildInputs = [ apr expat libiconv libxcrypt ]

     

       56
       56
       -
           ++ optional sslSupport openssl

     

       57
       57
       -
           ++ optional bdbSupport db

     

       58
       58
       -
           ++ optional ldapSupport openldap

     

       59
       59
       -
           ++ optional stdenv.isFreeBSD cyrus_sasl;

     

       54
       54
       +
           ++ lib.optional sslSupport openssl

     

       55
       55
       +
           ++ lib.optional bdbSupport db

     

       56
       56
       +
           ++ lib.optional ldapSupport openldap

     

       57
       57
       +
           ++ lib.optional stdenv.isFreeBSD cyrus_sasl;

     

       60
       58
        
       

     

       61
       59
        
         postInstall = ''

     

       62
       60
        
           for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do

+1 -3

pkgs/development/libraries/asio/generic.nix

···

       2
       2
        
       , version, sha256, ...

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       stdenv.mkDerivation {

     

       8
       6
        
         pname = "asio";

     

       9
       7
        
         inherit version;

     
···

       17
       15
        
       

     

       18
       16
        
         buildInputs = [ openssl ];

     

       19
       17
        
       

     

       20
       20
       -
         meta = {

     

       18
       18
       +
         meta = with lib; {

     

       21
       19
        
           homepage = "http://asio.sourceforge.net/";

     

       22
       20
        
           description = "Cross-platform C++ library for network and low-level I/O programming";

     

       23
       21
        
           license = licenses.boost;

+3 -5

pkgs/development/libraries/aspell/dictionaries.nix

···

       1
       1
        
       {lib, stdenv, fetchurl, aspell, which, writeScript}:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       /* HOWTO:

     

       6
       4
        
       

     

       7
       5
        
          * Add some of these to your profile or systemPackages.

     
···

       105
       103
        
               homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html";

     

       106
       104
        
             } // (args.meta or {});

     

       107
       105
        
       

     

       108
       108
       -
           } // lib.optionalAttrs (stdenv.isDarwin && elem language [ "is" "nb" ]) {

     

       106
       106
       +
           } // lib.optionalAttrs (stdenv.isDarwin && lib.elem language [ "is" "nb" ]) {

     

       109
       107
        
             # tar: Cannot open: Illegal byte sequence

     

       110
       108
        
             unpackPhase = ''

     

       111
       109
        
               runHook preUnpack

     
···

       115
       113
        
               runHook postUnpack

     

       116
       114
        
             '';

     

       117
       115
        
       

     

       118
       118
       -
             postPatch = getAttr language {

     

       116
       116
       +
             postPatch = lib.getAttr language {

     

       119
       117
        
               is = ''

     

       120
       118
        
                 cp icelandic.alias íslenska.alias

     

       121
       119
        
                 sed -i 's/ .slenska\.alias/ íslenska.alias/g' Makefile.pre

     
···

       137
       135
        
             preBuild = ''

     

       138
       136
        
               # Aspell can't handle multiple data-dirs

     

       139
       137
        
               # Copy everything we might possibly need

     

       140
       140
       -
               ${concatMapStringsSep "\n" (p: ''

     

       138
       138
       +
               ${lib.concatMapStringsSep "\n" (p: ''

     

       141
       139
        
                 cp -a ${p}/lib/aspell/* .

     

       142
       140
        
               '') ([ aspell ] ++ langInputs)}

     

       143
       141
        
               export ASPELL_CONF="data-dir $(pwd)"

+41 -42

pkgs/development/libraries/boost/generic.nix

···

       34
       34
        
       # Boost <1.69 can't be built on linux with clang >8, because pth was removed

     

       35
       35
        
       assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69";

     

       36
       36
        
       

     

       37
       37
       -
       with lib;

     

       38
       37
        
       let

     

       39
       38
        
       

     

       40
       40
       -
         variant = concatStringsSep ","

     

       41
       41
       -
           (optional enableRelease "release" ++

     

       42
       42
       -
            optional enableDebug "debug");

     

       39
       39
       +
         variant = lib.concatStringsSep ","

     

       40
       40
       +
           (lib.optional enableRelease "release" ++

     

       41
       41
       +
            lib.optional enableDebug "debug");

     

       43
       42
        
       

     

       44
       44
       -
         threading = concatStringsSep ","

     

       45
       45
       -
           (optional enableSingleThreaded "single" ++

     

       46
       46
       -
            optional enableMultiThreaded "multi");

     

       43
       43
       +
         threading = lib.concatStringsSep ","

     

       44
       44
       +
           (lib.optional enableSingleThreaded "single" ++

     

       45
       45
       +
            lib.optional enableMultiThreaded "multi");

     

       47
       46
        
       

     

       48
       48
       -
         link = concatStringsSep ","

     

       49
       49
       -
           (optional enableShared "shared" ++

     

       50
       50
       -
            optional enableStatic "static");

     

       47
       47
       +
         link = lib.concatStringsSep ","

     

       48
       48
       +
           (lib.optional enableShared "shared" ++

     

       49
       49
       +
            lib.optional enableStatic "static");

     

       51
       50
        
       

     

       52
       51
        
         runtime-link = if enableShared then "shared" else "static";

     

       53
       52
        
       

     
···

       61
       60
        
         # [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632

     

       62
       61
        
         # [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8

     

       63
       62
        
         jobs =

     

       64
       64
       -
           if versionOlder version "1.58" then

     

       63
       63
       +
           if lib.versionOlder version "1.58" then

     

       65
       64
        
             "$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))"

     

       66
       66
       -
           else if versionOlder version "1.65" then

     

       65
       65
       +
           else if lib.versionOlder version "1.65" then

     

       67
       66
        
             "$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))"

     

       68
       67
        
           else

     

       69
       68
        
             "$NIX_BUILD_CORES";

     

       70
       69
        
       

     

       71
       70
        
         needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared);

     

       72
       71
        
       

     

       73
       73
       -
         b2Args = concatStringsSep " " ([

     

       72
       72
       +
         b2Args = lib.concatStringsSep " " ([

     

       74
       73
        
           "--includedir=$dev/include"

     

       75
       74
        
           "--libdir=$out/lib"

     

       76
       75
        
           "-j${jobs}"

     
···

       82
       81
        
           "-sEXPAT_LIBPATH=${expat.out}/lib"

     

       83
       82
        
       

     

       84
       83
        
           # TODO: make this unconditional

     

       85
       85
       -
         ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform ||

     

       84
       84
       +
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform ||

     

       86
       85
        
                         # required on mips; see 61d9f201baeef4c4bb91ad8a8f5f89b747e0dfe4

     

       87
       87
       -
                         (stdenv.hostPlatform.isMips && versionAtLeast version "1.79")) [

     

       86
       86
       +
                         (stdenv.hostPlatform.isMips && lib.versionAtLeast version "1.79")) [

     

       88
       87
        
           "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}"

     

       89
       88
        
           "architecture=${if stdenv.hostPlatform.isMips64

     

       90
       90
       -
                           then if versionOlder version "1.78" then "mips1" else "mips"

     

       89
       89
       +
                           then if lib.versionOlder version "1.78" then "mips1" else "mips"

     

       91
       90
        
                           else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x"

     

       92
       91
        
                           else toString stdenv.hostPlatform.parsed.cpu.family}"

     

       93
       92
        
           "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}"

     
···

       100
       99
        
                  else if stdenv.hostPlatform.isMips32 then "o32"

     

       101
       100
        
                  else if stdenv.hostPlatform.isMips64n64 then "n64"

     

       102
       101
        
                  else "sysv"}"

     

       103
       103
       -
         ] ++ optional (link != "static") "runtime-link=${runtime-link}"

     

       104
       104
       -
           ++ optional (variant == "release") "debug-symbols=off"

     

       105
       105
       -
           ++ optional (toolset != null) "toolset=${toolset}"

     

       106
       106
       -
           ++ optional (!enablePython) "--without-python"

     

       107
       107
       -
           ++ optional needUserConfig "--user-config=user-config.jam"

     

       108
       108
       -
           ++ optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off"

     

       109
       109
       -
           ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [

     

       102
       102
       +
         ] ++ lib.optional (link != "static") "runtime-link=${runtime-link}"

     

       103
       103
       +
           ++ lib.optional (variant == "release") "debug-symbols=off"

     

       104
       104
       +
           ++ lib.optional (toolset != null) "toolset=${toolset}"

     

       105
       105
       +
           ++ lib.optional (!enablePython) "--without-python"

     

       106
       106
       +
           ++ lib.optional needUserConfig "--user-config=user-config.jam"

     

       107
       107
       +
           ++ lib.optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off"

     

       108
       108
       +
           ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [

     

       110
       109
        
           "threadapi=win32"

     

       111
       110
        
         ] ++ extraB2Args

     

       112
       111
        
         );

     
···

       121
       120
        
         patchFlags = [];

     

       122
       121
        
       

     

       123
       122
        
         patches = patches

     

       124
       124
       -
         ++ optional stdenv.isDarwin ./darwin-no-system-python.patch

     

       123
       123
       +
         ++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch

     

       125
       124
        
         # Fix boost-context segmentation faults on ppc64 due to ABI violation

     

       126
       126
       -
         ++ optional (versionAtLeast version "1.61" &&

     

       127
       127
       -
                      versionOlder version "1.71") (fetchpatch {

     

       125
       125
       +
         ++ lib.optional (lib.versionAtLeast version "1.61" &&

     

       126
       126
       +
                      lib.versionOlder version "1.71") (fetchpatch {

     

       128
       127
        
           url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch";

     

       129
       128
        
           sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29";

     

       130
       129
        
           stripLen = 1;

     

       131
       130
        
           extraPrefix = "libs/context/";

     

       132
       131
        
         })

     

       133
       132
        
         # Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions

     

       134
       134
       -
         ++ optional (versionAtLeast version "1.65" && versionOlder version "1.67")

     

       133
       133
       +
         ++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.67")

     

       135
       134
        
           (fetchpatch {

     

       136
       135
        
             url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch";

     

       137
       136
        
             sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0";

     

       138
       137
        
             stripLen = 1;

     

       139
       138
        
           })

     

       140
       140
       -
         ++ optional (versionAtLeast version "1.65" && versionOlder version "1.70") (fetchpatch {

     

       139
       139
       +
         ++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.70") (fetchpatch {

     

       141
       140
        
           # support for Mips64n64 appeared in boost-context 1.70; this patch won't apply to pre-1.65 cleanly

     

       142
       141
        
           url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch";

     

       143
       142
        
           sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI=";

     

       144
       143
        
           stripLen = 1;

     

       145
       144
        
           extraPrefix = "libs/context/";

     

       146
       145
        
         })

     

       147
       147
       -
         ++ optional (versionAtLeast version "1.70" && versionOlder version "1.73") ./cmake-paths.patch

     

       148
       148
       -
         ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch

     

       149
       149
       -
         ++ optional (version == "1.77.0") (fetchpatch {

     

       146
       146
       +
         ++ lib.optional (lib.versionAtLeast version "1.70" && lib.versionOlder version "1.73") ./cmake-paths.patch

     

       147
       147
       +
         ++ lib.optional (lib.versionAtLeast version "1.73") ./cmake-paths-173.patch

     

       148
       148
       +
         ++ lib.optional (version == "1.77.0") (fetchpatch {

     

       150
       149
        
           url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch";

     

       151
       150
        
           relative = "include";

     

       152
       151
        
           sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4=";

     

       153
       152
        
         });

     

       154
       153
        
       

     

       155
       155
       -
         meta = {

     

       154
       154
       +
         meta = with lib; {

     

       156
       155
        
           homepage = "http://boost.org/";

     

       157
       156
        
           description = "Collection of C++ libraries";

     

       158
       157
        
           license = licenses.boost;

     
···

       175
       174
        
           inherit boostBuildPatches;

     

       176
       175
        
         };

     

       177
       176
        
       

     

       178
       178
       -
         preConfigure = optionalString useMpi ''

     

       177
       177
       +
         preConfigure = lib.optionalString useMpi ''

     

       179
       178
        
           cat << EOF >> user-config.jam

     

       180
       179
        
           using mpi : ${mpi}/bin/mpiCC ;

     

       181
       180
        
           EOF

     
···

       183
       182
        
         # On darwin we need to add the `$out/lib` to the libraries' rpath explicitly,

     

       184
       183
        
         # otherwise the dynamic linker is unable to resolve the reference to @rpath

     

       185
       184
        
         # when the boost libraries want to load each other at runtime.

     

       186
       186
       -
         + optionalString (stdenv.isDarwin && enableShared) ''

     

       185
       185
       +
         + lib.optionalString (stdenv.isDarwin && enableShared) ''

     

       187
       186
        
           cat << EOF >> user-config.jam

     

       188
       187
        
           using clang-darwin : : ${stdenv.cc.targetPrefix}c++

     

       189
       188
        
             : <linkflags>"-rpath $out/lib/"

     
···

       196
       195
        
         # uniform way for clang and gcc (which works thanks to our cc-wrapper).

     

       197
       196
        
         # We pass toolset later which will make b2 invoke everything in the right

     

       198
       197
        
         # way -- the other toolset in user-config.jam will be ignored.

     

       199
       199
       -
         + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       198
       198
       +
         + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       200
       199
        
           cat << EOF >> user-config.jam

     

       201
       200
        
           using gcc : cross : ${stdenv.cc.targetPrefix}c++

     

       202
       201
        
             : <archiver>$AR

     
···

       210
       209
        
           EOF

     

       211
       210
        
         ''

     

       212
       211
        
         # b2 needs to be explicitly told how to find Python when cross-compiling

     

       213
       213
       -
         + optionalString enablePython ''

     

       212
       212
       +
         + lib.optionalString enablePython ''

     

       214
       213
        
           cat << EOF >> user-config.jam

     

       215
       214
        
           using python : : ${python.interpreter}

     

       216
       215
        
             : ${python}/include/python${python.pythonVersion}

     
···

       225
       224
        
         enableParallelBuilding = true;

     

       226
       225
        
       

     

       227
       226
        
         nativeBuildInputs = [ which boost-build ]

     

       228
       228
       -
           ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

     

       227
       227
       +
           ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

     

       229
       228
        
         buildInputs = [ expat zlib bzip2 libiconv ]

     

       230
       230
       -
           ++ optional enableIcu icu

     

       231
       231
       -
           ++ optionals enablePython [ libxcrypt python ]

     

       232
       232
       -
           ++ optional enableNumpy python.pkgs.numpy;

     

       229
       229
       +
           ++ lib.optional enableIcu icu

     

       230
       230
       +
           ++ lib.optionals enablePython [ libxcrypt python ]

     

       231
       231
       +
           ++ lib.optional enableNumpy python.pkgs.numpy;

     

       233
       232
        
       

     

       234
       233
        
         configureScript = "./bootstrap.sh";

     

       235
       234
        
         configurePlatforms = [];

     
···

       239
       238
        
           "--includedir=$(dev)/include"

     

       240
       239
        
           "--libdir=$(out)/lib"

     

       241
       240
        
           "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase

     

       242
       242
       -
         ] ++ optional (toolset != null) "--with-toolset=${toolset}"

     

       241
       241
       +
         ] ++ lib.optional (toolset != null) "--with-toolset=${toolset}"

     

       243
       242
        
           ++ [ (if enableIcu then "--with-icu=${icu.dev}" else "--without-icu") ];

     

       244
       243
        
       

     

       245
       244
        
         buildPhase = ''

     
···

       265
       264
        
           # Make boost header paths relative so that they are not runtime dependencies

     

       266
       265
        
           cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \

     

       267
       266
        
             -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \;

     

       268
       268
       -
         '' + optionalString (stdenv.hostPlatform.libc == "msvcrt") ''

     

       267
       267
       +
         '' + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") ''

     

       269
       268
        
           $RANLIB "$out/lib/"*.a

     

       270
       269
        
         '';

     

       271
       270

+1 -2

pkgs/development/libraries/cyrus-sasl/default.nix

···

       2
       2
        
       , pam, libxcrypt, fixDarwinDylibNames, autoreconfHook, enableLdap ? false

     

       3
       3
        
       , buildPackages, pruneLibtoolFiles, nixosTests }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       5
        
       stdenv.mkDerivation rec {

     

       7
       6
        
         pname = "cyrus-sasl";

     

       8
       7
        
         version = "2.1.28";

     
···

       50
       49
        
           inherit (nixosTests) parsedmarc postfix;

     

       51
       50
        
         };

     

       52
       51
        
       

     

       53
       53
       -
         meta = {

     

       52
       52
       +
         meta = with lib; {

     

       54
       53
        
           homepage = "https://www.cyrusimap.org/sasl";

     

       55
       54
        
           description = "Library for adding authentication support to connection-based protocols";

     

       56
       55
        
           platforms = platforms.unix;

+4 -5

pkgs/development/libraries/faac/default.nix

···

       5
       5
        
       

     

       6
       6
        
       assert mp4v2Support -> (mp4v2 != null);

     

       7
       7
        
       

     

       8
       8
       -
       with lib;

     

       9
       8
        
       stdenv.mkDerivation rec {

     

       10
       9
        
         pname = "faac";

     

       11
       10
        
         version = "1.30";

     
···

       16
       15
        
         };

     

       17
       16
        
       

     

       18
       17
        
         configureFlags = [ ]

     

       19
       19
       -
           ++ optional mp4v2Support "--with-external-mp4v2"

     

       20
       20
       -
           ++ optional drmSupport "--enable-drm";

     

       18
       18
       +
           ++ lib.optional mp4v2Support "--with-external-mp4v2"

     

       19
       19
       +
           ++ lib.optional drmSupport "--enable-drm";

     

       21
       20
        
       

     

       22
       21
        
         hardeningDisable = [ "format" ];

     

       23
       22
        
       

     

       24
       23
        
         nativeBuildInputs = [ autoreconfHook ];

     

       25
       24
        
       

     

       26
       25
        
         buildInputs = [ ]

     

       27
       27
       -
           ++ optional mp4v2Support mp4v2;

     

       26
       26
       +
           ++ lib.optional mp4v2Support mp4v2;

     

       28
       27
        
       

     

       29
       28
        
         enableParallelBuilding = true;

     

       30
       29
        
       

     

       31
       31
       -
         meta = {

     

       30
       30
       +
         meta = with lib; {

     

       32
       31
        
           description = "Open source MPEG-4 and MPEG-2 AAC encoder";

     

       33
       32
        
           license     = licenses.unfreeRedistributable;

     

       34
       33
        
           maintainers = with maintainers; [ codyopel ];

+2 -3

pkgs/development/libraries/faad2/default.nix

···

       11
       11
        
       , vlc

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
       -
       with lib;

     

       15
       14
        
       stdenv.mkDerivation rec {

     

       16
       15
        
         pname = "faad2";

     

       17
       16
        
         version = "2.10.1";

     
···

       24
       23
        
         };

     

       25
       24
        
       

     

       26
       25
        
         configureFlags = []

     

       27
       27
       -
           ++ optional drmSupport "--with-drm";

     

       26
       26
       +
           ++ lib.optional drmSupport "--with-drm";

     

       28
       27
        
       

     

       29
       28
        
         nativeBuildInputs = [ autoreconfHook ];

     

       30
       29
        
       

     
···

       34
       33
        
           ocaml-faad = ocamlPackages.faad;

     

       35
       34
        
         };

     

       36
       35
        
       

     

       37
       37
       -
         meta = {

     

       36
       36
       +
         meta = with lib; {

     

       38
       37
        
           description = "An open source MPEG-4 and MPEG-2 AAC decoder";

     

       39
       38
        
           homepage = "https://sourceforge.net/projects/faac/";

     

       40
       39
        
           license     = licenses.gpl2Plus;

+12 -14

pkgs/development/libraries/fftw/default.nix

···

       14
       14
        
       , withDoc ? stdenv.cc.isGNU

     

       15
       15
        
       }:

     

       16
       16
        
       

     

       17
       17
       -
       with lib;

     

       18
       18
       -
       

     

       19
       19
       -
       assert elem precision [ "single" "double" "long-double" "quad-precision" ];

     

       17
       17
       +
       assert lib.elem precision [ "single" "double" "long-double" "quad-precision" ];

     

       20
       18
        
       

     

       21
       19
        
       stdenv.mkDerivation rec {

     

       22
       20
        
         pname = "fftw-${precision}";

     
···

       31
       29
        
         };

     

       32
       30
        
       

     

       33
       31
        
         outputs = [ "out" "dev" "man" ]

     

       34
       34
       -
           ++ optional withDoc "info"; # it's dev-doc only

     

       32
       32
       +
           ++ lib.optional withDoc "info"; # it's dev-doc only

     

       35
       33
        
         outputBin = "dev"; # fftw-wisdom

     

       36
       34
        
       

     

       37
       35
        
         nativeBuildInputs = [ gfortran ];

     

       38
       36
        
       

     

       39
       39
       -
         buildInputs = optionals stdenv.cc.isClang [

     

       37
       37
       +
         buildInputs = lib.optionals stdenv.cc.isClang [

     

       40
       38
        
           # TODO: This may mismatch the LLVM version sin the stdenv, see #79818.

     

       41
       39
        
           llvmPackages.openmp

     

       42
       42
       -
         ] ++ optional enableMpi mpi;

     

       40
       40
       +
         ] ++ lib.optional enableMpi mpi;

     

       43
       41
        
       

     

       44
       42
        
         configureFlags =

     

       45
       43
        
           [ "--enable-shared"

     

       46
       44
        
             "--enable-threads"

     

       47
       45
        
           ]

     

       48
       48
       -
           ++ optional (precision != "double") "--enable-${precision}"

     

       46
       46
       +
           ++ lib.optional (precision != "double") "--enable-${precision}"

     

       49
       47
        
           # all x86_64 have sse2

     

       50
       48
        
           # however, not all float sizes fit

     

       51
       51
       -
           ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") )  "--enable-sse2"

     

       52
       52
       -
           ++ optional enableAvx "--enable-avx"

     

       53
       53
       -
           ++ optional enableAvx2 "--enable-avx2"

     

       54
       54
       -
           ++ optional enableAvx512 "--enable-avx512"

     

       55
       55
       -
           ++ optional enableFma "--enable-fma"

     

       49
       49
       +
           ++ lib.optional (stdenv.isx86_64 && (precision == "single" || precision == "double") )  "--enable-sse2"

     

       50
       50
       +
           ++ lib.optional enableAvx "--enable-avx"

     

       51
       51
       +
           ++ lib.optional enableAvx2 "--enable-avx2"

     

       52
       52
       +
           ++ lib.optional enableAvx512 "--enable-avx512"

     

       53
       53
       +
           ++ lib.optional enableFma "--enable-fma"

     

       56
       54
        
           ++ [ "--enable-openmp" ]

     

       57
       57
       -
           ++ optional enableMpi "--enable-mpi"

     

       55
       55
       +
           ++ lib.optional enableMpi "--enable-mpi"

     

       58
       56
        
           # doc generation causes Fortran wrapper generation which hard-codes gcc

     

       59
       59
       -
           ++ optional (!withDoc) "--disable-doc";

     

       57
       57
       +
           ++ lib.optional (!withDoc) "--disable-doc";

     

       60
       58
        
       

     

       61
       59
        
         enableParallelBuilding = true;

     

       62
       60

+1 -2

pkgs/development/libraries/geis/default.nix

···

       15
       15
        
       , xorgserver

     

       16
       16
        
       }:

     

       17
       17
        
       

     

       18
       18
       -
       with lib;

     

       19
       18
        
       

     

       20
       19
        
       stdenv.mkDerivation rec {

     

       21
       20
        
         pname = "geis";

     
···

       48
       47
        
           gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")

     

       49
       48
        
         '';

     

       50
       49
        
       

     

       51
       51
       -
         meta = {

     

       50
       50
       +
         meta = with lib; {

     

       52
       51
        
           description = "A library for input gesture recognition";

     

       53
       52
        
           homepage = "https://launchpad.net/geis";

     

       54
       53
        
           license = licenses.gpl2;

+1 -3

pkgs/development/libraries/glew/1.10.nix

···

       2
       2
        
       , AGL, OpenGL

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       stdenv.mkDerivation rec {

     

       8
       6
        
         pname = "glew";

     

       9
       7
        
         version = "1.10.0";

     
···

       20
       18
        
       

     

       21
       19
        
         patchPhase = ''

     

       22
       20
        
           sed -i 's|lib64|lib|' config/Makefile.linux

     

       23
       23
       -
           ${optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       21
       21
       +
           ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       24
       22
        
           sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile

     

       25
       23
        
           ''}

     

       26
       24
        
         '';

+4 -5

pkgs/development/libraries/gloox/default.nix

···

       4
       4
        
       , idnSupport ? true, libidn

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       with lib;

     

       8
       7
        
       

     

       9
       8
        
       stdenv.mkDerivation rec{

     

       10
       9
        
         pname = "gloox";

     
···

       16
       15
        
         };

     

       17
       16
        
       

     

       18
       17
        
         buildInputs = [ ]

     

       19
       19
       -
           ++ optional zlibSupport zlib

     

       20
       20
       -
           ++ optional sslSupport openssl

     

       21
       21
       -
           ++ optional idnSupport libidn;

     

       18
       18
       +
           ++ lib.optional zlibSupport zlib

     

       19
       19
       +
           ++ lib.optional sslSupport openssl

     

       20
       20
       +
           ++ lib.optional idnSupport libidn;

     

       22
       21
        
       

     

       23
       23
       -
         meta = {

     

       22
       22
       +
         meta = with lib; {

     

       24
       23
        
           description = "A portable high-level Jabber/XMPP library for C++";

     

       25
       24
        
           homepage = "http://camaya.net/gloox";

     

       26
       25
        
           license = licenses.gpl3;

+8 -10

pkgs/development/libraries/gtk/2.x.nix

···

       7
       7
        
       , fetchpatch, buildPackages

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
       -
       with lib;

     

       11
       11
       -
       

     

       12
       10
        
       let

     

       13
       11
        
       

     

       14
       12
        
         gtkCleanImmodulesCache = substituteAll {

     
···

       44
       42
        
         patches = [

     

       45
       43
        
           ./patches/2.0-immodules.cache.patch

     

       46
       44
        
           ./patches/gtk2-theme-paths.patch

     

       47
       47
       -
         ] ++ optionals stdenv.isDarwin [

     

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

     

       48
       46
        
           (fetchpatch {

     

       49
       47
        
             url = "https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776";

     

       50
       48
        
             sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";

     
···

       54
       52
        
       

     

       55
       53
        
         propagatedBuildInputs = with xorg;

     

       56
       54
        
           [ glib cairo pango gdk-pixbuf atk ]

     

       57
       57
       -
           ++ optionals (stdenv.isLinux || stdenv.isDarwin) [

     

       55
       55
       +
           ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [

     

       58
       56
        
                libXrandr libXrender libXcomposite libXi libXcursor

     

       59
       57
        
              ]

     

       60
       60
       -
           ++ optionals stdenv.isDarwin [ libXdamage ]

     

       61
       61
       -
           ++ optional xineramaSupport libXinerama

     

       62
       62
       -
           ++ optionals cupsSupport [ cups ]

     

       63
       63
       -
           ++ optionals stdenv.isDarwin [ AppKit Cocoa ];

     

       58
       58
       +
           ++ lib.optionals stdenv.isDarwin [ libXdamage ]

     

       59
       59
       +
           ++ lib.optional xineramaSupport libXinerama

     

       60
       60
       +
           ++ lib.optionals cupsSupport [ cups ]

     

       61
       61
       +
           ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa ];

     

       64
       62
        
       

     

       65
       63
        
         preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''

     

       66
       64
        
           MACOSX_DEPLOYMENT_TARGET=10.16

     
···

       69
       67
        
         configureFlags = [

     

       70
       68
        
           "--with-gdktarget=${gdktarget}"

     

       71
       69
        
           "--with-xinput=yes"

     

       72
       72
       -
         ] ++ optionals stdenv.isDarwin [

     

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

     

       73
       71
        
           "--disable-glibtest"

     

       74
       72
        
           "--disable-introspection"

     

       75
       73
        
           "--disable-visibility"

     
···

       94
       92
        
           inherit gdktarget;

     

       95
       93
        
         };

     

       96
       94
        
       

     

       97
       97
       -
         meta = {

     

       95
       95
       +
         meta = with lib; {

     

       98
       96
        
           description = "A multi-platform toolkit for creating graphical user interfaces";

     

       99
       97
        
           homepage    = "https://www.gtk.org/";

     

       100
       98
        
           license     = licenses.lgpl2Plus;

+2 -3

pkgs/development/libraries/hunspell/wrapper.nix

···

       1
       1
        
       { stdenv, lib, hunspell, makeWrapper, dicts ? [] }:

     

       2
       2
       -
       with lib;

     

       3
       2
        
       let

     

       4
       4
       -
         searchPath = makeSearchPath "share/hunspell" dicts;

     

       3
       3
       +
         searchPath = lib.makeSearchPath "share/hunspell" dicts;

     

       5
       4
        
       in

     

       6
       5
        
       stdenv.mkDerivation {

     

       7
       7
       -
         name = (appendToName "with-dicts" hunspell).name;

     

       6
       6
       +
         name = (lib.appendToName "with-dicts" hunspell).name;

     

       8
       7
        
         nativeBuildInputs = [ makeWrapper ];

     

       9
       8
        
         buildCommand = ''

     

       10
       9
        
           makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${lib.escapeShellArg searchPath}

+1 -3

pkgs/development/libraries/indicator-application/gtk2.nix

···

       3
       3
        
       , glib, dbus-glib, json-glib

     

       4
       4
        
       , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }:

     

       5
       5
        
       

     

       6
       6
       -
       with lib;

     

       7
       7
       -
       

     

       8
       6
        
       stdenv.mkDerivation rec {

     

       9
       7
        
         pname = "indicator-application-gtk2";

     

       10
       8
        
         version = "12.10.0.1";

     
···

       45
       43
        
           "localstatedir=\${TMPDIR}"

     

       46
       44
        
         ];

     

       47
       45
        
       

     

       48
       48
       -
         meta = {

     

       46
       46
       +
         meta = with lib; {

     

       49
       47
        
           description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)";

     

       50
       48
        
           homepage = "https://launchpad.net/indicators-gtk2";

     

       51
       49
        
           license = licenses.gpl3;

+4 -5

pkgs/development/libraries/kerberos/heimdal.nix

···

       4
       4
        
       , CoreFoundation, Security, SystemConfiguration

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       with lib;

     

       8
       7
        
       stdenv.mkDerivation rec {

     

       9
       8
        
         pname = "heimdal";

     

       10
       9
        
         version = "7.8.0";

     
···

       22
       21
        
       

     

       23
       22
        
         nativeBuildInputs = [ autoreconfHook pkg-config python3 perl bison flex texinfo ]

     

       24
       23
        
           ++ (with perlPackages; [ JSON ]);

     

       25
       25
       -
         buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]

     

       24
       24
       +
         buildInputs = lib.optionals (stdenv.isLinux) [ libcap_ng ]

     

       26
       25
        
           ++ [ db sqlite openssl libedit openldap pam]

     

       27
       27
       -
           ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ];

     

       26
       26
       +
           ++ lib.optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ];

     

       28
       27
        
       

     

       29
       28
        
         ## ugly, X should be made an option

     

       30
       29
        
         configureFlags = [

     
···

       42
       41
        
           "--with-berkeley-db"

     

       43
       42
        
           "--with-berkeley-db-include=${db.dev}/include"

     

       44
       43
        
           "--with-openldap=${openldap.dev}"

     

       45
       45
       -
         ] ++ optionals (stdenv.isLinux) [

     

       44
       44
       +
         ] ++ lib.optionals (stdenv.isLinux) [

     

       46
       45
        
           "--with-capng"

     

       47
       46
        
         ];

     

       48
       47
        
       

     
···

       91
       90
        
         #  hx_locl.h:67:25: fatal error: pkcs10_asn1.h: No such file or directory

     

       92
       91
        
         #enableParallelBuilding = true;

     

       93
       92
        
       

     

       94
       94
       -
         meta = {

     

       93
       93
       +
         meta = with lib; {

     

       95
       94
        
           description = "An implementation of Kerberos 5 (and some more stuff)";

     

       96
       95
        
           license = licenses.bsd3;

     

       97
       96
        
           platforms = platforms.unix;

+10 -11

pkgs/development/libraries/lame/default.nix

···

       11
       11
        
       , debugSupport ? false # Debugging (disables optimizations)

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
       -
       with lib;

     

       15
       14
        
       stdenv.mkDerivation rec {

     

       16
       15
        
         pname = "lame";

     

       17
       16
        
         version = "3.100";

     
···

       25
       24
        
         outputMan = "out";

     

       26
       25
        
       

     

       27
       26
        
         nativeBuildInputs = [ ]

     

       28
       28
       -
           ++ optional nasmSupport nasm;

     

       27
       27
       +
           ++ lib.optional nasmSupport nasm;

     

       29
       28
        
       

     

       30
       29
        
         buildInputs = [ ]

     

       31
       30
        
           #++ optional efenceSupport libefence

     

       32
       31
        
           #++ optional mp3xSupport gtk1

     

       33
       33
       -
           ++ optional sndfileFileIOSupport libsndfile;

     

       32
       32
       +
           ++ lib.optional sndfileFileIOSupport libsndfile;

     

       34
       33
        
       

     

       35
       34
        
         configureFlags = [

     

       36
       36
       -
           (enableFeature nasmSupport "nasm")

     

       37
       37
       -
           (enableFeature cpmlSupport "cpml")

     

       35
       35
       +
           (lib.enableFeature nasmSupport "nasm")

     

       36
       36
       +
           (lib.enableFeature cpmlSupport "cpml")

     

       38
       37
        
           #(enableFeature efenceSupport "efence")

     

       39
       38
        
           (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame")

     

       40
       40
       -
           (enableFeature analyzerHooksSupport "analyzer-hooks")

     

       41
       41
       -
           (enableFeature decoderSupport "decoder")

     

       42
       42
       -
           (enableFeature frontendSupport "frontend")

     

       43
       43
       -
           (enableFeature frontendSupport "dynamic-frontends")

     

       39
       39
       +
           (lib.enableFeature analyzerHooksSupport "analyzer-hooks")

     

       40
       40
       +
           (lib.enableFeature decoderSupport "decoder")

     

       41
       41
       +
           (lib.enableFeature frontendSupport "frontend")

     

       42
       42
       +
           (lib.enableFeature frontendSupport "dynamic-frontends")

     

       44
       43
        
           #(enableFeature mp3xSupport "mp3x")

     

       45
       45
       -
           (enableFeature mp3rtpSupport "mp3rtp")

     

       44
       44
       +
           (lib.enableFeature mp3rtpSupport "mp3rtp")

     

       46
       45
        
           (if debugSupport then "--enable-debug=alot" else "")

     

       47
       46
        
         ];

     

       48
       47
        
       

     
···

       52
       51
        
           sed -i '/lame_init_old/d' include/libmp3lame.sym

     

       53
       52
        
         '';

     

       54
       53
        
       

     

       55
       55
       -
         meta = {

     

       54
       54
       +
         meta = with lib; {

     

       56
       55
        
           description = "A high quality MPEG Audio Layer III (MP3) encoder";

     

       57
       56
        
           homepage    = "http://lame.sourceforge.net";

     

       58
       57
        
           license     = licenses.lgpl2;

+6 -7

pkgs/development/libraries/libass/default.nix

···

       8
       8
        
       

     

       9
       9
        
       assert fontconfigSupport -> fontconfig != null;

     

       10
       10
        
       

     

       11
       11
       -
       with lib;

     

       12
       11
        
       stdenv.mkDerivation rec {

     

       13
       12
        
         pname = "libass";

     

       14
       13
        
         version = "0.16.0";

     
···

       19
       18
        
         };

     

       20
       19
        
       

     

       21
       20
        
         configureFlags = [

     

       22
       22
       -
           (enableFeature fontconfigSupport "fontconfig")

     

       23
       23
       -
           (enableFeature rasterizerSupport "rasterizer")

     

       24
       24
       -
           (enableFeature largeTilesSupport "large-tiles")

     

       21
       21
       +
           (lib.enableFeature fontconfigSupport "fontconfig")

     

       22
       22
       +
           (lib.enableFeature rasterizerSupport "rasterizer")

     

       23
       23
       +
           (lib.enableFeature largeTilesSupport "large-tiles")

     

       25
       24
        
         ];

     

       26
       25
        
       

     

       27
       26
        
         nativeBuildInputs = [ pkg-config yasm ];

     

       28
       27
        
       

     

       29
       28
        
         buildInputs = [ freetype fribidi harfbuzz ]

     

       30
       30
       -
           ++ optional fontconfigSupport fontconfig

     

       31
       31
       -
           ++ optional stdenv.isDarwin libiconv;

     

       29
       29
       +
           ++ lib.optional fontconfigSupport fontconfig

     

       30
       30
       +
           ++ lib.optional stdenv.isDarwin libiconv;

     

       32
       31
        
       

     

       33
       33
       -
         meta = {

     

       32
       32
       +
         meta = with lib; {

     

       34
       33
        
           description = "Portable ASS/SSA subtitle renderer";

     

       35
       34
        
           homepage    = "https://github.com/libass/libass";

     

       36
       35
        
           license     = licenses.isc;

-1

pkgs/development/libraries/libcollectdclient/default.nix

···

       1
       1
        
       { lib, collectd }:

     

       2
       2
       -
       with lib;

     

       3
       2
        
       

     

       4
       3
        
       collectd.overrideAttrs (oldAttrs: {

     

       5
       4
        
         pname = "libcollectdclient";

+3 -5

pkgs/development/libraries/libidn2/default.nix

···

       5
       5
        
       # cgit) that are needed here should be included directly in Nixpkgs as

     

       6
       6
        
       # files.

     

       7
       7
        
       

     

       8
       8
       -
       with lib;

     

       9
       9
       -
       

     

       10
       8
        
       stdenv.mkDerivation rec {

     

       11
       9
        
         pname = "libidn2";

     

       12
       10
        
         version = "2.3.2";

     
···

       20
       18
        
         # Beware: non-bootstrap libidn2 is overridden by ./hack.nix

     

       21
       19
        
         outputs = [ "bin" "dev" "out" "info" "devdoc" ];

     

       22
       20
        
       

     

       23
       23
       -
         patches = optional stdenv.isDarwin ./fix-error-darwin.patch;

     

       21
       21
       +
         patches = lib.optional stdenv.isDarwin ./fix-error-darwin.patch;

     

       24
       22
        
       

     

       25
       23
        
         enableParallelBuilding = true;

     

       26
       24
        
       

     

       27
       25
        
         # The above patch causes the documentation to be regenerated, so the

     

       28
       26
        
         # documentation tools are required.

     

       29
       29
       -
         nativeBuildInputs = optionals stdenv.isDarwin [ help2man texinfo ];

     

       30
       30
       -
         buildInputs = [ libunistring ] ++ optional stdenv.isDarwin libiconv;

     

       27
       27
       +
         nativeBuildInputs = lib.optionals stdenv.isDarwin [ help2man texinfo ];

     

       28
       28
       +
         buildInputs = [ libunistring ] ++ lib.optional stdenv.isDarwin libiconv;

     

       31
       29
        
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       32
       30
        
       

     

       33
       31
        
         meta = {

+3 -5

pkgs/development/libraries/libmcrypt/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         pname = "libmcrypt";

     

       7
       5
        
         version = "2.5.8";

     
···

       11
       9
        
           sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";

     

       12
       10
        
         };

     

       13
       11
        
       

     

       14
       14
       -
         buildInputs = optional stdenv.isDarwin darwin.cctools;

     

       12
       12
       +
         buildInputs = lib.optional stdenv.isDarwin darwin.cctools;

     

       15
       13
        
       

     

       16
       16
       -
         configureFlags = optionals disablePosixThreads

     

       14
       14
       +
         configureFlags = lib.optionals disablePosixThreads

     

       17
       15
        
           [ "--disable-posix-threads" ];

     

       18
       16
        
       

     

       19
       17
        
         meta = {

     

       20
       18
        
           description = "Replacement for the old crypt() package and crypt(1) command, with extensions";

     

       21
       19
        
           homepage = "http://mcrypt.sourceforge.net";

     

       22
       20
        
           license = "GPL";

     

       23
       23
       -
           platforms = platforms.all;

     

       21
       21
       +
           platforms = lib.platforms.all;

     

       24
       22
        
         };

     

       25
       23
        
       }

+1 -3

pkgs/development/libraries/libqtav/default.nix

···

       17
       17
        
       , libva

     

       18
       18
        
       }:

     

       19
       19
        
       

     

       20
       20
       -
       with lib;

     

       21
       21
       -
       

     

       22
       20
        
       mkDerivation rec {

     

       23
       21
        
         pname = "libqtav";

     

       24
       22
        
         version = "unstable-2020-09-10";

     
···

       64
       62
        
       

     

       65
       63
        
         stripDebugList = [ "lib" "libexec" "bin" "qml" ];

     

       66
       64
        
       

     

       67
       67
       -
         meta = {

     

       65
       65
       +
         meta =  with lib; {

     

       68
       66
        
           description = "A multimedia playback framework based on Qt + FFmpeg";

     

       69
       67
        
           #license = licenses.lgpl21; # For the libraries / headers only.

     

       70
       68
        
           license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used.

+1 -3

pkgs/development/libraries/libspf2/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         pname = "libspf2";

     

       7
       5
        
         version = "2.2.12";

     
···

       35
       33
        
       

     

       36
       34
        
         doCheck = true;

     

       37
       35
        
       

     

       38
       38
       -
         meta = {

     

       36
       36
       +
         meta = with lib; {

     

       39
       37
        
           description = "Implementation of the Sender Policy Framework for SMTP " +

     

       40
       38
        
                         "authorization (Helsinki Systems fork)";

     

       41
       39
        
           homepage = "https://github.com/helsinki-systems/libspf2";

-1

pkgs/development/libraries/libtap/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, pkg-config, cmake, perl }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       3
        
       stdenv.mkDerivation rec {

     

       5
       4
        
       

     

       6
       5
        
         pname = "libtap";

+2 -3

pkgs/development/libraries/libunique/3.x.nix

···

       3
       3
        
       , gtk-doc, docbook_xml_dtd_45, docbook_xsl

     

       4
       4
        
       , libxslt, libxml2 }:

     

       5
       5
        
       

     

       6
       6
       -
       with lib;

     

       7
       6
        
       stdenv.mkDerivation rec {

     

       8
       7
        
       

     

       9
       8
        
         majorVer = "3.0";

     
···

       23
       22
        
         meta = {

     

       24
       23
        
           homepage = "https://wiki.gnome.org/Attic/LibUnique";

     

       25
       24
        
           description = "A library for writing single instance applications";

     

       26
       26
       -
           license = licenses.lgpl21;

     

       27
       27
       -
           maintainers = [ maintainers.AndersonTorres ];

     

       25
       25
       +
           license = lib.licenses.lgpl21;

     

       26
       26
       +
           maintainers = [ lib.maintainers.AndersonTorres ];

     

       28
       27
        
           platforms = lib.platforms.linux;

     

       29
       28
        
         };

     

       30
       29
        
       }

+1 -3

pkgs/development/libraries/libutempter/default.nix

···

       1
       1
        
       { stdenv, fetchurl, lib, glib }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         pname = "libutempter";

     

       7
       5
        
         version = "1.2.1";

     
···

       28
       26
        
           "mandir=\${out}/share/man"

     

       29
       27
        
         ];

     

       30
       28
        
       

     

       31
       31
       -
         meta = {

     

       29
       29
       +
         meta = with lib; {

     

       32
       30
        
           homepage = "https://github.com/altlinux/libutempter";

     

       33
       31
        
           description = "Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files";

     

       34
       32
        
           longDescription = ''

+18 -20

pkgs/development/libraries/libvirt/default.nix

···

       77
       77
        
       , zfs

     

       78
       78
        
       }:

     

       79
       79
        
       

     

       80
       80
       -
       with lib;

     

       81
       81
       -
       

     

       82
       80
        
       let

     

       83
       81
        
         inherit (stdenv) isDarwin isLinux isx86_64;

     

       84
       84
       -
         binPath = makeBinPath ([

     

       82
       82
       +
         binPath = lib.makeBinPath ([

     

       85
       83
        
           dnsmasq

     

       86
       86
       -
         ] ++ optionals isLinux [

     

       84
       84
       +
         ] ++ lib.optionals isLinux [

     

       87
       85
        
           bridge-utils

     

       88
       86
        
           dmidecode

     

       89
       87
        
           dnsmasq

     
···

       95
       93
        
           numad

     

       96
       94
        
           pmutils

     

       97
       95
        
           systemd

     

       98
       98
       -
         ] ++ optionals enableIscsi [

     

       96
       96
       +
         ] ++ lib.optionals enableIscsi [

     

       99
       97
        
           libiscsi

     

       100
       98
        
           openiscsi

     

       101
       101
       -
         ] ++ optionals enableZfs [

     

       99
       99
       +
         ] ++ lib.optionals enableZfs [

     

       102
       100
        
           zfs

     

       103
       101
        
         ]);

     

       104
       102
        
       in

     
···

       148
       146
        
       

     

       149
       147
        
           substituteInPlace meson.build \

     

       150
       148
        
             --replace "'dbus-daemon'," "'${lib.getBin dbus}/bin/dbus-daemon',"

     

       151
       151
       -
         '' + optionalString isLinux ''

     

       149
       149
       +
         '' + lib.optionalString isLinux ''

     

       152
       150
        
           sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \

     

       153
       151
        
             src/storage/storage_backend_disk.c \

     

       154
       152
        
             src/storage/storage_util.c

     

       155
       155
       -
         '' + optionalString isDarwin ''

     

       153
       153
       +
         '' + lib.optionalString isDarwin ''

     

       156
       154
        
           sed -i '/qemucapabilitiestest/d' tests/meson.build

     

       157
       155
        
           sed -i '/vircryptotest/d' tests/meson.build

     

       158
       156
        
           sed -i '/domaincapstest/d' tests/meson.build

     

       159
       157
        
           sed -i '/qemufirmwaretest/d' tests/meson.build

     

       160
       158
        
           sed -i '/qemuvhostusertest/d' tests/meson.build

     

       161
       161
       -
         '' + optionalString (isDarwin && isx86_64) ''

     

       159
       159
       +
         '' + lib.optionalString (isDarwin && isx86_64) ''

     

       162
       160
        
           sed -i '/qemucaps2xmltest/d' tests/meson.build

     

       163
       161
        
           sed -i '/qemuhotplugtest/d' tests/meson.build

     

       164
       162
        
           sed -i '/virnetdaemontest/d' tests/meson.build

     
···

       178
       176
        
           perl

     

       179
       177
        
           perlPackages.XMLXPath

     

       180
       178
        
         ]

     

       181
       181
       -
         ++ optional (!isDarwin) rpcsvc-proto

     

       179
       179
       +
         ++ lib.optional (!isDarwin) rpcsvc-proto

     

       182
       180
        
         # NOTE: needed for rpcgen

     

       183
       183
       -
         ++ optional isDarwin darwin.developer_cmds;

     

       181
       181
       +
         ++ lib.optional isDarwin darwin.developer_cmds;

     

       184
       182
        
       

     

       185
       183
        
         buildInputs = [

     

       186
       184
        
           bash

     
···

       197
       195
        
           readline

     

       198
       196
        
           xhtml1

     

       199
       197
        
           yajl

     

       200
       200
       -
         ] ++ optionals isLinux [

     

       198
       198
       +
         ] ++ lib.optionals isLinux [

     

       201
       199
        
           acl

     

       202
       200
        
           attr

     

       203
       201
        
           audit

     
···

       213
       211
        
           parted

     

       214
       212
        
           systemd

     

       215
       213
        
           util-linux

     

       216
       216
       -
         ] ++ optionals isDarwin [

     

       214
       214
       +
         ] ++ lib.optionals isDarwin [

     

       217
       215
        
           AppKit

     

       218
       216
        
           Carbon

     

       219
       217
        
           gmp

     

       220
       218
        
           libiconv

     

       221
       219
        
         ]

     

       222
       222
       -
         ++ optionals enableCeph [ ceph ]

     

       223
       223
       -
         ++ optionals enableGlusterfs [ glusterfs ]

     

       224
       224
       -
         ++ optionals enableIscsi [ libiscsi openiscsi ]

     

       225
       225
       -
         ++ optionals enableXen [ xen ]

     

       226
       226
       -
         ++ optionals enableZfs [ zfs ];

     

       220
       220
       +
         ++ lib.optionals enableCeph [ ceph ]

     

       221
       221
       +
         ++ lib.optionals enableGlusterfs [ glusterfs ]

     

       222
       222
       +
         ++ lib.optionals enableIscsi [ libiscsi openiscsi ]

     

       223
       223
       +
         ++ lib.optionals enableXen [ xen ]

     

       224
       224
       +
         ++ lib.optionals enableZfs [ zfs ];

     

       227
       225
        
       

     

       228
       226
        
         preConfigure =

     

       229
       227
        
           let

     
···

       348
       346
        
           # Added in nixpkgs:

     

       349
       347
        
           gettext() { "${gettext}/bin/gettext" "$@"; }

     

       350
       348
        
           '

     

       351
       351
       -
         '' + optionalString isLinux ''

     

       349
       349
       +
         '' + lib.optionalString isLinux ''

     

       352
       350
        
           for f in $out/lib/systemd/system/*.service ; do

     

       353
       351
        
             substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill

     

       354
       352
        
           done

     
···

       372
       370
        
       

     

       373
       371
        
         passthru.tests.libvirtd = nixosTests.libvirtd;

     

       374
       372
        
       

     

       375
       375
       -
         meta = {

     

       373
       373
       +
         meta = with lib; {

     

       376
       374
        
           description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes";

     

       377
       375
        
           homepage = "https://libvirt.org/";

     

       378
       376
        
           changelog = "https://gitlab.com/libvirt/libvirt/-/raw/v${version}/NEWS.rst";

+4 -6

pkgs/development/libraries/libvmi/default.nix

···

       10
       10
        
         libvirt,

     

       11
       11
        
         xenSupport ? true }:

     

       12
       12
        
       

     

       13
       13
       -
       with lib;

     

       14
       14
       -
       

     

       15
       13
        
       stdenv.mkDerivation rec {

     

       16
       14
        
         pname = "libvmi";

     

       17
       15
        
         version = "0.12.0";

     
···

       24
       22
        
           sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv";

     

       25
       23
        
         };

     

       26
       24
        
       

     

       27
       27
       -
         buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen);

     

       25
       25
       +
         buildInputs = [ glib libvirt json_c ] ++ (lib.optional xenSupport xen);

     

       28
       26
        
         nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];

     

       29
       27
        
       

     

       30
       30
       -
         configureFlags = optional (!xenSupport) "--disable-xen";

     

       28
       28
       +
         configureFlags = lib.optional (!xenSupport) "--disable-xen";

     

       31
       29
        
       

     

       32
       30
        
         # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here

     

       33
       33
       -
         postFixup = optionalString xenSupport ''

     

       31
       31
       +
         postFixup = lib.optionalString xenSupport ''

     

       34
       32
        
           libvmi="$out/lib/libvmi.so.${libVersion}"

     

       35
       33
        
           oldrpath=$(patchelf --print-rpath "$libvmi")

     

       36
       36
       -
           patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi"

     

       34
       34
       +
           patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen ]}" "$libvmi"

     

       37
       35
        
         '';

     

       38
       36
        
       

     

       39
       37
        
         meta = with lib; {

+1 -3

pkgs/development/libraries/libytnef/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, autoreconfHook }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         pname = "libytnef";

     

       7
       5
        
         version = "2.0";

     
···

       15
       13
        
       

     

       16
       14
        
         nativeBuildInputs = [ autoreconfHook ];

     

       17
       15
        
       

     

       18
       18
       -
         meta = {

     

       16
       16
       +
         meta = with lib; {

     

       19
       17
        
           inherit (src.meta) homepage;

     

       20
       18
        
           description = "Yeraze's TNEF Stream Reader - for winmail.dat files";

     

       21
       19
        
           license = licenses.gpl2Plus;

+20 -22

pkgs/development/libraries/mesa/default.nix

···

       36
       36
        
         - libOSMesa is in $osmesa (~4 MB)

     

       37
       37
        
       */

     

       38
       38
        
       

     

       39
       39
       -
       with lib;

     

       40
       40
       -
       

     

       41
       39
        
       let

     

       42
       40
        
         # Release calendar: https://www.mesa3d.org/release-calendar.html

     

       43
       41
        
         # Release frequency: https://www.mesa3d.org/releasing.html#schedule

     

       44
       42
        
         version = "22.3.3";

     

       45
       45
       -
         branch  = versions.major version;

     

       43
       43
       +
         branch  = lib.versions.major version;

     

       46
       44
        
       

     

       47
       45
        
         withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm;

     

       48
       46
        
       

     
···

       115
       113
        
           "-Ddisk-cache-key=${placeholder "drivers"}"

     

       116
       114
        
           "-Ddri-search-path=${libglvnd.driverLink}/lib/dri"

     

       117
       115
        
       

     

       118
       118
       -
           "-Dplatforms=${concatStringsSep "," eglPlatforms}"

     

       119
       119
       -
           "-Dgallium-drivers=${concatStringsSep "," galliumDrivers}"

     

       120
       120
       -
           "-Dvulkan-drivers=${concatStringsSep "," vulkanDrivers}"

     

       116
       116
       +
           "-Dplatforms=${lib.concatStringsSep "," eglPlatforms}"

     

       117
       117
       +
           "-Dgallium-drivers=${lib.concatStringsSep "," galliumDrivers}"

     

       118
       118
       +
           "-Dvulkan-drivers=${lib.concatStringsSep "," vulkanDrivers}"

     

       121
       119
        
       

     

       122
       120
        
           "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri"

     

       123
       121
        
           "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau"

     

       124
       122
        
           "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio"

     

       125
       123
        
           "-Dva-libs-path=${placeholder "drivers"}/lib/dri"

     

       126
       124
        
           "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d"

     

       127
       127
       -
           "-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine

     

       128
       128
       -
           "-Dosmesa=${boolToString enableOSMesa}" # used by wine

     

       125
       125
       +
           "-Dgallium-nine=${lib.boolToString enableGalliumNine}" # Direct3D in Wine

     

       126
       126
       +
           "-Dosmesa=${lib.boolToString enableOSMesa}" # used by wine

     

       129
       127
        
           "-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)

     

       130
       128
        
       

     

       131
       129
        
           # To enable non-mesa gbm backends to be found (e.g. Nvidia)

     

       132
       130
        
           "-Dgbm-backends-path=${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm"

     

       133
       133
       -
         ] ++ optionals stdenv.isLinux [

     

       131
       131
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       134
       132
        
           "-Dglvnd=true"

     

       135
       135
       -
         ] ++ optionals enableOpenCL [

     

       133
       133
       +
         ] ++ lib.optionals enableOpenCL [

     

       136
       134
        
           "-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend

     

       137
       135
        
           "-Dgallium-rusticl=true" "-Drust_std=2021"

     

       138
       136
        
           "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib"

     

       139
       139
       -
         ] ++ optional enablePatentEncumberedCodecs

     

       137
       137
       +
         ] ++ lib.optional enablePatentEncumberedCodecs

     

       140
       138
        
           "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"

     

       141
       141
       -
         ++ optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}";

     

       139
       139
       +
         ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}";

     

       142
       140
        
       

     

       143
       141
        
         buildInputs = with xorg; [

     

       144
       142
        
           expat llvmPackages.libllvm libglvnd xorgproto

     

       145
       143
        
           libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr

     

       146
       144
        
           libffi libvdpau libelf libXvMC

     

       147
       145
        
           libpthreadstubs openssl /*or another sha1 provider*/

     

       148
       148
       -
         ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]

     

       146
       146
       +
         ] ++ lib.optionals (lib.elem "wayland" eglPlatforms) [ wayland wayland-protocols ]

     

       149
       147
        
           ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]

     

       150
       148
        
           ++ lib.optionals stdenv.isDarwin [ libunwind ]

     

       151
       149
        
           ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator_14 ]

     

       152
       150
        
           ++ lib.optional withValgrind valgrind-light

     

       153
       151
        
           # Mesa will not build zink when gallium-drivers=auto

     

       154
       154
       -
           ++ lib.optional (elem "zink" galliumDrivers) vulkan-loader;

     

       152
       152
       +
           ++ lib.optional (lib.elem "zink" galliumDrivers) vulkan-loader;

     

       155
       153
        
       

     

       156
       154
        
         depsBuildBuild = [ pkg-config ];

     

       157
       155
        
       

     
···

       160
       158
        
           intltool bison flex file

     

       161
       159
        
           python3Packages.python python3Packages.Mako

     

       162
       160
        
           jdupes glslang

     

       163
       163
       -
         ] ++ lib.optionals (elem "wayland" eglPlatforms) [

     

       161
       161
       +
         ] ++ lib.optionals (lib.elem "wayland" eglPlatforms) [

     

       164
       162
        
           wayland-scanner

     

       165
       163
        
         ];

     

       166
       164
        
       

     

       167
       165
        
         propagatedBuildInputs = with xorg; [

     

       168
       166
        
           libXdamage libXxf86vm

     

       169
       169
       -
         ] ++ optional withLibdrm libdrm

     

       170
       170
       -
           ++ optionals stdenv.isDarwin [ OpenGL Xplugin ];

     

       167
       167
       +
         ] ++ lib.optional withLibdrm libdrm

     

       168
       168
       +
           ++ lib.optionals stdenv.isDarwin [ OpenGL Xplugin ];

     

       171
       169
        
       

     

       172
       170
        
         doCheck = false;

     

       173
       171
        
       

     

       174
       172
        
         postInstall = ''

     

       175
       173
        
           # Some installs don't have any drivers so this directory is never created.

     

       176
       174
        
           mkdir -p $drivers $osmesa

     

       177
       177
       -
         '' + optionalString stdenv.isLinux ''

     

       175
       175
       +
         '' + lib.optionalString stdenv.isLinux ''

     

       178
       176
        
           mkdir -p $drivers/lib

     

       179
       177
        
       

     

       180
       178
        
           if [ -n "$(shopt -s nullglob; echo "$out/lib/libxatracker"*)" -o -n "$(shopt -s nullglob; echo "$out/lib/libvulkan_"*)" ]; then

     
···

       199
       197
        
           for js in $drivers/share/vulkan/icd.d/*.json; do

     

       200
       198
        
             substituteInPlace "$js" --replace "$out" "$drivers"

     

       201
       199
        
           done

     

       202
       202
       -
         '' + optionalString enableOpenCL ''

     

       200
       200
       +
         '' + lib.optionalString enableOpenCL ''

     

       203
       201
        
           # Move OpenCL stuff

     

       204
       202
        
           mkdir -p $opencl/lib

     

       205
       203
        
           mv -t "$opencl/lib/"     \

     
···

       221
       219
        
           done

     

       222
       220
        
         '';

     

       223
       221
        
       

     

       224
       224
       -
         postFixup = optionalString stdenv.isLinux ''

     

       222
       222
       +
         postFixup = lib.optionalString stdenv.isLinux ''

     

       225
       223
        
           # set the default search path for DRI drivers; used e.g. by X server

     

       226
       224
        
           substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}"

     

       227
       225
        
           [ -f "$dev/lib/pkgconfig/d3d.pc" ] && substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}"

     
···

       252
       250
        
           done

     

       253
       251
        
         '';

     

       254
       252
        
       

     

       255
       255
       -
         NIX_CFLAGS_COMPILE = optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [

     

       253
       253
       +
         NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [

     

       256
       254
        
           "-UPIPE_SEARCH_DIR"

     

       257
       255
        
           "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\""

     

       258
       256
        
         ];

     
···

       274
       272
        
           };

     

       275
       273
        
         };

     

       276
       274
        
       

     

       277
       277
       -
         meta = {

     

       275
       275
       +
         meta = with lib; {

     

       278
       276
        
           description = "An open source 3D graphics library";

     

       279
       277
        
           longDescription = ''

     

       280
       278
        
             The Mesa project began as an open-source implementation of the OpenGL

+3 -3

pkgs/development/libraries/nuspell/wrapper.nix

···

       1
       1
        
       { stdenv, lib, nuspell, makeWrapper, dicts ? [] }:

     

       2
       2
       -
       with lib;

     

       2
       2
       +
       

     

       3
       3
        
       let

     

       4
       4
       -
         searchPath = makeSearchPath "share/hunspell" dicts;

     

       4
       4
       +
         searchPath = lib.makeSearchPath "share/hunspell" dicts;

     

       5
       5
        
       in

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
       -
         name = (appendToName "with-dicts" nuspell).name;

     

       7
       7
       +
         name = (lib.appendToName "with-dicts" nuspell).name;

     

       8
       8
        
         nativeBuildInputs = [ makeWrapper ];

     

       9
       9
        
         buildCommand = ''

     

       10
       10
        
           makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${lib.escapeShellArg searchPath}

+3 -4

pkgs/development/libraries/opencascade/default.nix

···

       3
       3
        
         OpenCL, Cocoa

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       with lib;

     

       7
       6
        
       stdenv.mkDerivation rec {

     

       8
       7
        
         pname = "opencascade-oce";

     

       9
       8
        
         version = "0.18.3";

     
···

       20
       19
        
           libGL libGLU libXmu freetype fontconfig expat freeimage vtk

     

       21
       20
        
           gl2ps tbb

     

       22
       21
        
         ]

     

       23
       23
       -
           ++ optionals stdenv.isDarwin [OpenCL Cocoa]

     

       22
       22
       +
           ++ lib.optionals stdenv.isDarwin [OpenCL Cocoa]

     

       24
       23
        
         ;

     

       25
       24
        
       

     

       26
       25
        
         cmakeFlags = [

     
···

       30
       29
        
           "-DOCE_WITH_GL2PS=ON"

     

       31
       30
        
           "-DOCE_MULTITHREAD_LIBRARY=TBB"

     

       32
       31
        
         ]

     

       33
       33
       -
         ++ optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"];

     

       32
       32
       +
         ++ lib.optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"];

     

       34
       33
        
       

     

       35
       34
        
         patches = [

     

       36
       35
        
           # Use fontconfig instead of hardcoded directory list

     
···

       56
       55
        
             --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES

     

       57
       56
        
         '';

     

       58
       57
        
       

     

       59
       59
       -
         meta = {

     

       58
       58
       +
         meta = with lib; {

     

       60
       59
        
           description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";

     

       61
       60
        
           homepage = "https://github.com/tpaviot/oce";

     

       62
       61
        
           maintainers = [ maintainers.viric ];

+2 -4

pkgs/development/libraries/pcg-c/default.nix

···

       1
       1
        
       { lib, stdenv, fetchzip }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         version = "0.94";

     

       7
       5
        
         pname = "pcg-c";

     
···

       31
       29
        
             algorithms for random number generation. Unlike many general-purpose RNGs,

     

       32
       30
        
             they are also hard to predict.

     

       33
       31
        
           '';

     

       34
       34
       -
           platforms = platforms.unix;

     

       35
       35
       -
           maintainers = [ maintainers.linus ];

     

       32
       32
       +
           platforms = lib.platforms.unix;

     

       33
       33
       +
           maintainers = [ lib.maintainers.linus ];

     

       36
       34
        
           broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11

     

       37
       35
        
         };

     

       38
       36
        
       }

+6 -8

pkgs/development/libraries/pcre/default.nix

···

       3
       3
        
       , variant ? null

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       with lib;

     

       7
       7
       -
       

     

       8
       8
       -
       assert elem variant [ null "cpp" "pcre16" "pcre32" ];

     

       6
       6
       +
       assert lib.elem variant [ null "cpp" "pcre16" "pcre32" ];

     

       9
       7
        
       

     

       10
       8
        
       stdenv.mkDerivation rec {

     

       11
       9
        
         pname = "pcre"

     
···

       21
       19
        
         outputs = [ "bin" "dev" "out" "doc" "man" ];

     

       22
       20
        
       

     

       23
       21
        
         # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51

     

       24
       24
       -
         configureFlags = optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [

     

       22
       22
       +
         configureFlags = lib.optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [

     

       25
       23
        
           "--enable-unicode-properties"

     

       26
       24
        
           "--disable-cpp"

     

       27
       25
        
         ]

     

       28
       28
       -
           ++ optional (variant != null) "--enable-${variant}";

     

       26
       26
       +
           ++ lib.optional (variant != null) "--enable-${variant}";

     

       29
       27
        
       

     

       30
       28
        
         # https://bugs.exim.org/show_bug.cgi?id=2173

     

       31
       29
        
         patches = [ ./stacksize-detection.patch ];

     
···

       40
       38
        
       

     

       41
       39
        
         postFixup = ''

     

       42
       40
        
           moveToOutput bin/pcre-config "$dev"

     

       43
       43
       -
         '' + optionalString (variant != null) ''

     

       41
       41
       +
         '' + lib.optionalString (variant != null) ''

     

       44
       42
        
           ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib,*a}

     

       45
       43
        
         '';

     

       46
       44
        
       

     
···

       57
       55
        
             PCRE library is free, even for building proprietary software.

     

       58
       56
        
           '';

     

       59
       57
        
       

     

       60
       60
       -
           platforms = platforms.all;

     

       61
       61
       -
           maintainers = with maintainers; [ ];

     

       58
       58
       +
           platforms = lib.platforms.all;

     

       59
       59
       +
           maintainers = with lib.maintainers; [ ];

     

       62
       60
        
         };

     

       63
       61
        
       }

-2

pkgs/development/libraries/phonon/backends/gstreamer.nix

···

       3
       3
        
       , debug ? false

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       with lib;

     

       7
       7
       -
       

     

       8
       6
        
       stdenv.mkDerivation rec {

     

       9
       7
        
         pname = "phonon-backend-gstreamer";

     

       10
       8
        
         version = "4.10.0";

-2

pkgs/development/libraries/phonon/default.nix

···

       12
       12
        
       , debug ? false

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
       -
       with lib;

     

       16
       16
       -
       

     

       17
       15
        
       let

     

       18
       16
        
         soname = "phonon4qt5";

     

       19
       17
        
         buildsystemdir = "share/cmake/${soname}";

-2

pkgs/development/libraries/science/math/clmagma/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       4
        
         incfile = builtins.toFile "make.inc.custom" ''

     

       7
       5
        
           CC        = g++

+2 -4

pkgs/development/libraries/science/math/openblas/default.nix

···

       32
       32
        
       , python3

     

       33
       33
        
       }:

     

       34
       34
        
       

     

       35
       35
       -
       with lib;

     

       36
       36
       -
       

     

       37
       35
        
       let blas64_ = blas64; in

     

       38
       36
        
       

     

       39
       37
        
       let

     
···

       121
       119
        
         blas64 =

     

       122
       120
        
           if blas64_ != null

     

       123
       121
        
             then blas64_

     

       124
       124
       -
             else hasPrefix "x86_64" stdenv.hostPlatform.system;

     

       122
       122
       +
             else lib.hasPrefix "x86_64" stdenv.hostPlatform.system;

     

       125
       123
        
         # Convert flag values to format OpenBLAS's build expects.

     

       126
       124
        
         # `toString` is almost what we need other than bools,

     

       127
       125
        
         # which we need to map {true -> 1, false -> 0}

     
···

       129
       127
        
         mkMakeFlagValue = val:

     

       130
       128
        
           if !builtins.isBool val then toString val

     

       131
       129
        
           else if val then "1" else "0";

     

       132
       132
       -
         mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");

     

       130
       130
       +
         mkMakeFlagsFromConfig = lib.mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");

     

       133
       131
        
       

     

       134
       132
        
         shlibExt = stdenv.hostPlatform.extensions.sharedLibrary;

     

       135
       133

+8 -9

pkgs/development/libraries/sope/default.nix

···

       1
       1
        
       { gnustep, lib, fetchFromGitHub , libxml2, openssl

     

       2
       2
        
       , openldap, mariadb, libmysqlclient, postgresql }:

     

       3
       3
       -
       with lib;

     

       4
       3
        
       

     

       5
       4
        
       gnustep.stdenv.mkDerivation rec {

     

       6
       5
        
         pname = "sope";

     
···

       15
       14
        
       

     

       16
       15
        
         hardeningDisable = [ "format" ];

     

       17
       16
        
         nativeBuildInputs = [ gnustep.make ];

     

       18
       18
       -
         buildInputs = flatten ([ gnustep.base libxml2 openssl ]

     

       19
       19
       -
           ++ optional (openldap != null) openldap

     

       20
       20
       -
           ++ optionals (mariadb != null) [ libmysqlclient mariadb ]

     

       21
       21
       -
           ++ optional (postgresql != null) postgresql);

     

       17
       17
       +
         buildInputs = lib.flatten ([ gnustep.base libxml2 openssl ]

     

       18
       18
       +
           ++ lib.optional (openldap != null) openldap

     

       19
       19
       +
           ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ]

     

       20
       20
       +
           ++ lib.optional (postgresql != null) postgresql);

     

       22
       21
        
       

     

       23
       22
        
         postPatch = ''

     

       24
       23
        
           # Exclude NIX_ variables

     
···

       30
       29
        
         '';

     

       31
       30
        
       

     

       32
       31
        
         configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ]

     

       33
       33
       -
           ++ optional (openldap != null) "--enable-openldap"

     

       34
       34
       -
           ++ optional (mariadb != null) "--enable-mysql"

     

       35
       35
       -
           ++ optional (postgresql != null) "--enable-postgresql";

     

       32
       32
       +
           ++ lib.optional (openldap != null) "--enable-openldap"

     

       33
       33
       +
           ++ lib.optional (mariadb != null) "--enable-mysql"

     

       34
       34
       +
           ++ lib.optional (postgresql != null) "--enable-postgresql";

     

       36
       35
        
       

     

       37
       36
        
         # Yes, this is ugly.

     

       38
       37
        
         preFixup = ''

     
···

       40
       39
        
           rm -rf $out/nix/store

     

       41
       40
        
         '';

     

       42
       41
        
       

     

       43
       43
       -
         meta = {

     

       42
       42
       +
         meta = with lib; {

     

       44
       43
        
           description = "An extensive set of frameworks which form a complete Web application server environment";

     

       45
       44
        
           license = licenses.publicDomain;

     

       46
       45
        
           homepage = "https://github.com/inverse-inc/sope";

+3 -5

pkgs/development/libraries/sqlite/archive-version.nix

···

       1
       1
        
       lib: version:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       6
       -
         fragments = splitVersion version;

     

       7
       7
       -
         major = head fragments;

     

       8
       8
       -
         minor = concatMapStrings (fixedWidthNumber 2) (tail fragments);

     

       4
       4
       +
         fragments = lib.splitVersion version;

     

       5
       5
       +
         major = lib.head fragments;

     

       6
       6
       +
         minor = lib.concatMapStrings (lib.fixedWidthNumber 2) (lib.tail fragments);

     

       9
       7
        
       in

     

       10
       8
        
       

     

       11
       9
        
       major + minor + "00"

+4 -6

pkgs/development/libraries/sqlite/default.nix

···

       9
       9
        
       , enableDeserialize ? false

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
       -
       with lib;

     

       13
       13
       -
       

     

       14
       12
        
       let

     

       15
       13
        
         archiveVersion = import ./archive-version.nix lib;

     

       16
       14
        
       in

     

       17
       15
        
       

     

       18
       16
        
       stdenv.mkDerivation rec {

     

       19
       19
       -
         pname = "sqlite${optionalString interactive "-interactive"}";

     

       17
       17
       +
         pname = "sqlite${lib.optionalString interactive "-interactive"}";

     

       20
       18
        
         version = "3.40.1";

     

       21
       19
        
       

     

       22
       20
        
         # nixpkgs-update: no auto update

     
···

       29
       27
        
         outputs = [ "bin" "dev" "out" ];

     

       30
       28
        
         separateDebugInfo = stdenv.isLinux;

     

       31
       29
        
       

     

       32
       32
       -
         buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ];

     

       30
       30
       +
         buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ];

     

       33
       31
        
       

     

       34
       32
        
         # required for aarch64 but applied for all arches for simplicity

     

       35
       33
        
         preConfigure = ''

     

       36
       34
        
           patchShebangs configure

     

       37
       35
        
         '';

     

       38
       36
        
       

     

       39
       39
       -
         configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline";

     

       37
       37
       +
         configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline";

     

       40
       38
        
       

     

       41
       39
        
         NIX_CFLAGS_COMPILE = toString ([

     

       42
       40
        
           "-DSQLITE_ENABLE_COLUMN_METADATA"

     
···

       94
       92
        
           inherit sqldiff sqlite-analyzer tracker;

     

       95
       93
        
         };

     

       96
       94
        
       

     

       97
       97
       -
         meta = {

     

       95
       95
       +
         meta = with lib; {

     

       98
       96
        
           description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";

     

       99
       97
        
           downloadPage = "https://sqlite.org/download.html";

     

       100
       98
        
           homepage = "https://www.sqlite.org/";

+1 -2

pkgs/development/libraries/srt/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, cmake, openssl

     

       2
       2
        
       }:

     

       3
       3
        
       

     

       4
       4
       -
       with lib;

     

       5
       4
        
       stdenv.mkDerivation rec {

     

       6
       5
        
         pname = "srt";

     

       7
       6
        
         version = "1.5.1";

     
···

       28
       27
        
           "-UCMAKE_INSTALL_LIBDIR"

     

       29
       28
        
         ];

     

       30
       29
        
       

     

       31
       31
       -
         meta = {

     

       30
       30
       +
         meta = with lib; {

     

       32
       31
        
           description = "Secure, Reliable, Transport";

     

       33
       32
        
           homepage    = "https://github.com/Haivision/srt";

     

       34
       33
        
           license     = licenses.mpl20;

+1 -3

pkgs/development/libraries/unittest-cpp/default.nix

···

       1
       1
        
       {lib, stdenv, fetchFromGitHub, cmake}:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         pname = "unittest-cpp";

     

       7
       5
        
         version = "2.0.0";

     
···

       20
       18
        
         meta = {

     

       21
       19
        
           homepage = "https://github.com/unittest-cpp/unittest-cpp";

     

       22
       20
        
           description = "Lightweight unit testing framework for C++";

     

       23
       23
       -
           license = licenses.mit;

     

       21
       21
       +
           license = lib.licenses.mit;

     

       24
       22
        
           maintainers = [];

     

       25
       23
        
           platforms = lib.platforms.unix;

     

       26
       24
        
         };

+6 -7

pkgs/development/libraries/xvidcore/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, yasm, autoconf, automake, libtool }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       3
        
       stdenv.mkDerivation rec {

     

       5
       4
        
         pname = "xvidcore";

     

       6
       5
        
         version = "1.3.7";

     
···

       13
       12
        
         preConfigure = ''

     

       14
       13
        
           # Configure script is not in the root of the source directory

     

       15
       14
        
           cd build/generic

     

       16
       16
       -
         '' + optionalString stdenv.isDarwin ''

     

       15
       15
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       17
       16
        
           # Undocumented darwin hack

     

       18
       17
        
           substituteInPlace configure --replace "-no-cpp-precomp" ""

     

       19
       18
        
         '';

     
···

       21
       20
        
         configureFlags = [ ]

     

       22
       21
        
           # Undocumented darwin hack (assembly is probably disabled due to an

     

       23
       22
        
           # issue with nasm, however yasm is now used)

     

       24
       24
       -
           ++ optional stdenv.isDarwin "--enable-macosx_module --disable-assembly";

     

       23
       23
       +
           ++ lib.optional stdenv.isDarwin "--enable-macosx_module --disable-assembly";

     

       25
       24
        
       

     

       26
       25
        
         nativeBuildInputs = [ ]

     

       27
       27
       -
           ++ optional (!stdenv.isDarwin) yasm;

     

       26
       26
       +
           ++ lib.optional (!stdenv.isDarwin) yasm;

     

       28
       27
        
       

     

       29
       28
        
         buildInputs = [ ]

     

       30
       29
        
           # Undocumented darwin hack

     

       31
       31
       -
           ++ optionals stdenv.isDarwin [ autoconf automake libtool ];

     

       30
       30
       +
           ++ lib.optionals stdenv.isDarwin [ autoconf automake libtool ];

     

       32
       31
        
       

     

       33
       32
        
         # Don't remove static libraries (e.g. 'libs/*.a') on darwin.  They're needed to

     

       34
       33
        
         # compile ffmpeg (and perhaps other things).

     

       35
       35
       -
         postInstall = optionalString (!stdenv.isDarwin) ''

     

       34
       34
       +
         postInstall = lib.optionalString (!stdenv.isDarwin) ''

     

       36
       35
        
           rm $out/lib/*.a

     

       37
       36
        
         '';

     

       38
       37
        
       

     

       39
       39
       -
         meta = {

     

       38
       38
       +
         meta = with lib; {

     

       40
       39
        
           description = "MPEG-4 video codec for PC";

     

       41
       40
        
           homepage    = "https://www.xvid.com/";

     

       42
       41
        
           license     = licenses.gpl2;

+2 -4

pkgs/development/misc/msp430/mspds/binary.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, unzip, autoPatchelfHook }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       6
       -
         archPostfix = optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64";

     

       4
       4
       +
         archPostfix = lib.optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64";

     

       7
       5
        
       in stdenv.mkDerivation rec {

     

       8
       6
        
         pname = "msp-debug-stack-bin";

     

       9
       7
        
         version = "3.15.1.1";

     
···

       26
       24
        
           install -Dm0644 -t $out/include Inc/*.h

     

       27
       25
        
         '';

     

       28
       26
        
       

     

       29
       29
       -
         meta = {

     

       27
       27
       +
         meta = with lib; {

     

       30
       28
        
           description = "Unfree binary release of the TI MSP430 FET debug driver";

     

       31
       29
        
           homepage = "https://www.ti.com/tool/MSPDS";

     

       32
       30
        
           sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

+4 -5

pkgs/development/misc/msp430/mspds/default.nix

···

       6
       6
        
       , libusb1 ? null

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
       -
       with lib;

     

       10
       9
        
       assert stdenv.isLinux -> libusb1 != null;

     

       11
       10
        
       

     

       12
       11
        
       let

     

       13
       13
       -
         hidapiDriver = optionalString stdenv.isLinux "-libusb";

     

       12
       12
       +
         hidapiDriver = lib.optionalString stdenv.isLinux "-libusb";

     

       14
       13
        
       

     

       15
       14
        
       in stdenv.mkDerivation {

     

       16
       15
        
         pname = "msp-debug-stack";

     
···

       33
       32
        
         preBuild = ''

     

       34
       33
        
           rm ThirdParty/src/pugixml.cpp

     

       35
       34
        
           rm ThirdParty/include/pugi{config,xml}.hpp

     

       36
       36
       -
         '' + optionalString stdenv.isDarwin ''

     

       35
       35
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       37
       36
        
           makeFlagsArray+=(OUTNAME="-install_name ")

     

       38
       37
        
         '';

     

       39
       38
        
       

     
···

       44
       43
        
       

     

       45
       44
        
         nativeBuildInputs = [ unzip ];

     

       46
       45
        
         buildInputs = [ boost hidapi pugixml ]

     

       47
       47
       -
           ++ optional stdenv.isLinux libusb1;

     

       46
       46
       +
           ++ lib.optional stdenv.isLinux libusb1;

     

       48
       47
        
       

     

       49
       49
       -
         meta = {

     

       48
       48
       +
         meta = with lib; {

     

       50
       49
        
           description = "TI MSP430 FET debug driver";

     

       51
       50
        
           homepage = "https://www.ti.com/tool/MSPDS";

     

       52
       51
        
           license = licenses.bsd3;

+6 -6

pkgs/development/ocaml-modules/elpi/default.nix

···

       11
       11
        
       , version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5"

     

       12
       12
        
           else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1"

     

       13
       13
        
       }:

     

       14
       14
       -
       with lib;

     

       14
       14
       +
       

     

       15
       15
        
       let fetched = coqPackages.metaFetch ({

     

       16
       16
        
           release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A=";

     

       17
       17
        
           release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s=";

     
···

       31
       31
        
         pname = "elpi";

     

       32
       32
        
         inherit (fetched) version src;

     

       33
       33
        
       

     

       34
       34
       -
         patches = lib.optional (versionAtLeast version "1.16" || version == "dev")

     

       34
       34
       +
         patches = lib.optional (lib.versionAtLeast version "1.16" || version == "dev")

     

       35
       35
        
           ./atd_2_10.patch;

     

       36
       36
        
       

     

       37
       37
        
         minimalOCamlVersion = "4.04";

     

       38
       38
        
       

     

       39
       39
        
         buildInputs = [ perl ncurses ]

     

       40
       40
       -
         ++ optional (versionAtLeast version "1.15" || version == "dev") menhir

     

       41
       41
       -
         ++ optional (versionAtLeast version "1.16" || version == "dev") atdgen;

     

       40
       40
       +
         ++ lib.optional (lib.versionAtLeast version "1.15" || version == "dev") menhir

     

       41
       41
       +
         ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;

     

       42
       42
        
       

     

       43
       43
        
         propagatedBuildInputs = [ re stdlib-shims ]

     

       44
       44
       -
         ++ (if versionAtLeast version "1.15" || version == "dev"

     

       44
       44
       +
         ++ (if lib.versionAtLeast version "1.15" || version == "dev"

     

       45
       45
        
            then [ menhirLib ]

     

       46
       46
        
            else [ camlp5 ]

     

       47
       47
        
         )

     
···

       50
       50
        
            else [ ppxlib_0_15 ppx_deriving_0_15 ]

     

       51
       51
        
         );

     

       52
       52
        
       

     

       53
       53
       -
         meta = {

     

       53
       53
       +
         meta = with lib; {

     

       54
       54
        
           description = "Embeddable λProlog Interpreter";

     

       55
       55
        
           license = licenses.lgpl21Plus;

     

       56
       56
        
           maintainers = [ maintainers.vbgl ];

+2 -4

pkgs/development/ocaml-modules/mtime/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       throwIfNot (versionAtLeast ocaml.version "4.08")

     

       3
       3
       +
       lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")

     

       6
       4
        
         "mtime is not available for OCaml ${ocaml.version}"

     

       7
       5
        
       

     

       8
       6
        
       stdenv.mkDerivation rec {

     
···

       21
       19
        
       

     

       22
       20
        
         inherit (topkg) buildPhase installPhase;

     

       23
       21
        
       

     

       24
       24
       -
         meta = {

     

       22
       22
       +
         meta = with lib; {

     

       25
       23
        
           description = "Monotonic wall-clock time for OCaml";

     

       26
       24
        
           homepage = "https://erratique.ch/software/mtime";

     

       27
       25
        
           inherit (ocaml.meta) platforms;

+4 -6

pkgs/development/ocaml-modules/vg/default.nix

···

       5
       5
        
         htmlcBackend ? true # depends on js_of_ocaml

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
       -
       with lib;

     

       9
       9
       -
       

     

       10
       8
        
       let

     

       11
       9
        
         inherit (lib) optionals versionOlder;

     

       12
       10
        
       

     
···

       38
       36
        
         strictDeps = true;

     

       39
       37
        
       

     

       40
       38
        
         buildPhase = topkg.buildPhase

     

       41
       41
       -
           + " --with-uutf ${boolToString pdfBackend}"

     

       42
       42
       -
           + " --with-otfm ${boolToString pdfBackend}"

     

       43
       43
       -
           + " --with-js_of_ocaml ${boolToString htmlcBackend}"

     

       39
       39
       +
           + " --with-uutf ${lib.boolToString pdfBackend}"

     

       40
       40
       +
           + " --with-otfm ${lib.boolToString pdfBackend}"

     

       41
       41
       +
           + " --with-js_of_ocaml ${lib.boolToString htmlcBackend}"

     

       44
       42
        
           + " --with-cairo2 false";

     

       45
       43
        
       

     

       46
       44
        
         inherit (topkg) installPhase;

     

       47
       45
        
       

     

       48
       48
       -
         meta = {

     

       46
       46
       +
         meta = with lib; {

     

       49
       47
        
           description = "Declarative 2D vector graphics for OCaml";

     

       50
       48
        
           longDescription = ''

     

       51
       49
        
           Vg is an OCaml module for declarative 2D vector graphics. In Vg, images

+1 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, mock, nose, pytest, six }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       3
        
       buildPythonPackage rec {

     

       5
       4
        
         pname = "mohawk";

     

       6
       5
        
         version = "1.1.0";

     
···

       21
       20
        
         meta = {

     

       22
       21
        
           description = "Python library for Hawk HTTP authorization.";

     

       23
       22
        
           homepage = "https://github.com/kumar303/mohawk";

     

       24
       24
       -
           license = licenses.mpl20;

     

       23
       23
       +
           license = lib.licenses.mpl20;

     

       25
       24
        
           maintainers = [ ];

     

       26
       25
        
         };

     

       27
       26
        
       }

+2 -4

pkgs/development/tools/ammonite/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts, git, nixfmt

     

       2
       2
        
       , nix, coreutils, gnused, disableRemoteLogging ? true }:

     

       3
       3
        
       

     

       4
       4
       -
       with lib;

     

       5
       5
       -
       

     

       6
       4
        
       let

     

       7
       5
        
         repo = "git@github.com:lihaoyi/Ammonite.git";

     

       8
       6
        
       

     
···

       22
       20
        
             installPhase = ''

     

       23
       21
        
               install -Dm755 $src $out/bin/amm

     

       24
       22
        
               sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm

     

       25
       25
       -
             '' + optionalString (disableRemoteLogging) ''

     

       23
       23
       +
             '' + lib.optionalString (disableRemoteLogging) ''

     

       26
       24
        
               sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm

     

       27
       25
        
               sed -i '1i #!/bin/sh' $out/bin/amm

     

       28
       26
        
             '';

     
···

       66
       64
        
               runHook postInstallCheck

     

       67
       65
        
             '';

     

       68
       66
        
       

     

       69
       69
       -
             meta = {

     

       67
       67
       +
             meta = with lib; {

     

       70
       68
        
               description = "Improved Scala REPL";

     

       71
       69
        
               longDescription = ''

     

       72
       70
        
                 The Ammonite-REPL is an improved Scala REPL, re-implemented from first principles.

+1 -3

pkgs/development/tools/butane/default.nix

···

       1
       1
        
       { lib, fetchFromGitHub, buildGoModule }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       buildGoModule rec {

     

       6
       4
        
         pname = "butane";

     

       7
       5
        
         version = "0.17.0";

     
···

       27
       25
        
           mv $out/bin/{internal,butane}

     

       28
       26
        
         '';

     

       29
       27
        
       

     

       30
       30
       -
         meta = {

     

       28
       28
       +
         meta = with lib; {

     

       31
       29
        
           description = "Translates human-readable Butane configs into machine-readable Ignition configs";

     

       32
       30
        
           license = licenses.asl20;

     

       33
       31
        
           homepage = "https://github.com/coreos/butane";

+4 -5

pkgs/development/tools/eclipse-mat/default.nix

···

       18
       18
        
       , zlib

     

       19
       19
        
       }:

     

       20
       20
        
       

     

       21
       21
       -
       with lib;

     

       22
       21
        
       let

     

       23
       22
        
         pVersion = "1.13.0.20220615";

     

       24
       24
       -
         pVersionTriple = splitVersion pVersion;

     

       25
       25
       -
         majorVersion = elemAt pVersionTriple 0;

     

       26
       26
       -
         minorVersion = elemAt pVersionTriple 1;

     

       27
       27
       -
         patchVersion = elemAt pVersionTriple 2;

     

       23
       23
       +
         pVersionTriple = lib.splitVersion pVersion;

     

       24
       24
       +
         majorVersion = lib.elemAt pVersionTriple 0;

     

       25
       25
       +
         minorVersion = lib.elemAt pVersionTriple 1;

     

       26
       26
       +
         patchVersion = lib.elemAt pVersionTriple 2;

     

       28
       27
        
         baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}";

     

       29
       28
        
         jdk = jdk11;

     

       30
       29
        
       in

+3 -4

pkgs/development/tools/iaca/2.1.nix

···

       1
       1
        
       { lib, stdenv, makeWrapper, requireFile, gcc, unzip }:

     

       2
       2
       -
       with lib;

     

       3
       2
        
       

     

       4
       3
        
       # v2.1: last version with NHM/WSM arch support

     

       5
       4
        
       stdenv.mkDerivation rec {

     
···

       17
       16
        
           cp bin/iaca $out/bin/

     

       18
       17
        
           cp lib/* $out/lib

     

       19
       18
        
         '';

     

       20
       20
       -
         preFixup = let libPath = makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in ''

     

       19
       19
       +
         preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in ''

     

       21
       20
        
           patchelf \

     

       22
       21
        
               --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \

     

       23
       22
        
               --set-rpath $out/lib:"${libPath}" \

     

       24
       23
        
               $out/bin/iaca

     

       25
       24
        
         '';

     

       26
       25
        
         postFixup = "wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib";

     

       27
       27
       -
         meta = {

     

       26
       26
       +
         meta = with lib; {

     

       28
       27
        
           description = "Intel Architecture Code Analyzer";

     

       29
       28
        
           homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/";

     

       30
       30
       -
           sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       29
       29
       +
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       31
       30
        
           license = licenses.unfree;

     

       32
       31
        
           platforms = [ "x86_64-linux" ];

     

       33
       32
        
           maintainers = with maintainers; [ kazcw ];

+2 -3

pkgs/development/tools/iaca/3.0.nix

···

       1
       1
        
       { lib, stdenv, requireFile, unzip }:

     

       2
       2
       -
       with lib;

     

       3
       2
        
       

     

       4
       3
        
       stdenv.mkDerivation rec {

     

       5
       4
        
         pname = "iaca";

     
···

       15
       14
        
           cp iaca $out/bin

     

       16
       15
        
           patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca

     

       17
       16
        
         '';

     

       18
       18
       -
         meta = {

     

       17
       17
       +
         meta = with lib; {

     

       19
       18
        
           description = "Intel Architecture Code Analyzer";

     

       20
       19
        
           homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/";

     

       21
       21
       -
           sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       20
       20
       +
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       22
       21
        
           license = licenses.unfree;

     

       23
       22
        
           platforms = [ "x86_64-linux" ];

     

       24
       23
        
           maintainers = with maintainers; [ kazcw ];

+2 -4

pkgs/development/tools/kind/default.nix

···

       1
       1
        
       { lib, buildGoModule, fetchFromGitHub, installShellFiles }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       buildGoModule rec {

     

       6
       4
        
         pname = "kind";

     

       7
       5
        
         version = "0.17.0";

     
···

       36
       34
        
           done

     

       37
       35
        
         '';

     

       38
       36
        
       

     

       39
       39
       -
         meta = {

     

       37
       37
       +
         meta = with lib; {

     

       40
       38
        
           description = "Kubernetes IN Docker - local clusters for testing Kubernetes";

     

       41
       39
        
           homepage    = "https://github.com/kubernetes-sigs/kind";

     

       42
       40
        
           maintainers = with maintainers; [ offline rawkode ];

     

       43
       43
       -
           license     = lib.licenses.asl20;

     

       41
       41
       +
           license     = licenses.asl20;

     

       44
       42
        
           platforms   = platforms.unix;

     

       45
       43
        
         };

     

       46
       44
        
       }

+2 -3

pkgs/development/tools/misc/kibana/7.x.nix

···

       9
       9
        
       , which

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
       -
       with lib;

     

       13
       12
        
       let

     

       14
       13
        
         nodejs = nodejs-16_x;

     

       15
       14
        
         inherit (builtins) elemAt;

     

       16
       16
       -
         info = splitString "-" stdenv.hostPlatform.system;

     

       15
       15
       +
         info = lib.splitString "-" stdenv.hostPlatform.system;

     

       17
       16
        
         arch = elemAt info 0;

     

       18
       17
        
         plat = elemAt info 1;

     

       19
       18
        
         shas =

     
···

       50
       49
        
           sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana

     

       51
       50
        
         '';

     

       52
       51
        
       

     

       53
       53
       -
         meta = {

     

       52
       52
       +
         meta = with lib; {

     

       54
       53
        
           description = "Visualize logs and time-stamped data";

     

       55
       54
        
           homepage = "http://www.elasticsearch.org/overview/kibana";

     

       56
       55
        
           license = licenses.elastic;

+6 -8

pkgs/development/tools/misc/pkg-config/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, libiconv, vanilla ? false }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         pname = "pkg-config";

     

       7
       5
        
         version = "0.29.2";

     
···

       17
       15
        
         # Process Requires.private properly, see

     

       18
       16
        
         # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to

     

       19
       17
        
         # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28

     

       20
       20
       -
         patches = optional (!vanilla) ./requires-private.patch

     

       21
       21
       -
           ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;

     

       18
       18
       +
         patches = lib.optional (!vanilla) ./requires-private.patch

     

       19
       19
       +
           ++ lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch;

     

       22
       20
        
       

     

       23
       21
        
         # These three tests fail due to a (desired) behavior change from our ./requires-private.patch

     

       24
       22
        
         postPatch = if vanilla then null else ''

     

       25
       23
        
           rm -f check/check-requires-private check/check-gtk check/missing

     

       26
       24
        
         '';

     

       27
       25
        
       

     

       28
       28
       -
         buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;

     

       26
       26
       +
         buildInputs = lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;

     

       29
       27
        
       

     

       30
       28
        
         configureFlags = [ "--with-internal-glib" ]

     

       31
       31
       -
           ++ optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]

     

       29
       29
       +
           ++ lib.optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]

     

       32
       30
        
              # Can't run these tests while cross-compiling

     

       33
       33
       -
           ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)

     

       31
       31
       +
           ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)

     

       34
       32
        
              [ "glib_cv_stack_grows=no"

     

       35
       33
        
                "glib_cv_uscore=no"

     

       36
       34
        
                "ac_cv_func_posix_getpwuid_r=yes"

     
···

       42
       40
        
       

     

       43
       41
        
         postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file

     

       44
       42
        
       

     

       45
       45
       -
         meta = {

     

       43
       43
       +
         meta = with lib; {

     

       46
       44
        
           description = "A tool that allows packages to find out information about other packages";

     

       47
       45
        
           homepage = "http://pkg-config.freedesktop.org/wiki/";

     

       48
       46
        
           platforms = platforms.all;

+3 -5

pkgs/development/tools/misc/premake/5.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, libuuid, cacert, Foundation, readline }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         pname = "premake5";

     

       7
       5
        
         version = "5.0.0-beta2";

     
···

       13
       11
        
           sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY=";

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       16
       -
         buildInputs = [ libuuid ] ++ optionals stdenv.isDarwin [ Foundation readline ];

     

       14
       14
       +
         buildInputs = [ libuuid ] ++ lib.optionals stdenv.isDarwin [ Foundation readline ];

     

       17
       15
        
       

     

       18
       16
        
         patches = [ ./no-curl-ca.patch ];

     

       19
       17
        
         patchPhase = ''

     

       20
       18
        
           substituteInPlace contrib/curl/premake5.lua \

     

       21
       19
        
             --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'"

     

       22
       22
       -
         '' + optionalString stdenv.isDarwin ''

     

       20
       20
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       23
       21
        
           substituteInPlace premake5.lua \

     

       24
       22
        
             --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5

     

       25
       23
        
         '';

     
···

       42
       40
        
           homepage = "https://premake.github.io";

     

       43
       41
        
           description = "A simple build configuration and project generation tool using lua";

     

       44
       42
        
           license = lib.licenses.bsd3;

     

       45
       45
       -
           platforms = platforms.darwin ++ platforms.linux;

     

       43
       43
       +
           platforms = lib.platforms.darwin ++ lib.platforms.linux;

     

       46
       44
        
           broken = stdenv.isDarwin && stdenv.isAarch64;

     

       47
       45
        
         };

     

       48
       46
        
       }

+7 -9

pkgs/development/tools/qtcreator/default.nix

···

       3
       3
        
       , withDocumentation ? false, withClangPlugins ? true

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       with lib;

     

       7
       7
       -
       

     

       8
       6
        
       let

     

       9
       7
        
         # Fetch clang from qt vendor, this contains submodules like this:

     

       10
       8
        
         # clang<-clang-tools-extra<-clazy.

     
···

       31
       29
        
         };

     

       32
       30
        
       

     

       33
       31
        
         buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++

     

       34
       34
       -
           optionals withClangPlugins [ llvmPackages_8.libclang

     

       32
       32
       +
           lib.optionals withClangPlugins [ llvmPackages_8.libclang

     

       35
       33
        
                                        clang_qt_vendor

     

       36
       34
        
                                        llvmPackages_8.llvm ];

     

       37
       35
        
       

     
···

       47
       45
        
       

     

       48
       46
        
         doCheck = true;

     

       49
       47
        
       

     

       50
       50
       -
         buildFlags = optional withDocumentation "docs";

     

       48
       48
       +
         buildFlags = lib.optional withDocumentation "docs";

     

       51
       49
        
       

     

       52
       52
       -
         installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";

     

       50
       50
       +
         installFlags = [ "INSTALL_ROOT=$(out)" ] ++ lib.optional withDocumentation "install_docs";

     

       53
       51
        
       

     

       54
       52
        
         qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ];

     

       55
       53
        
       

     
···

       58
       56
        
             --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'

     

       59
       57
        
           substituteInPlace src/libs/libs.pro \

     

       60
       58
        
             --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'

     

       61
       61
       -
           '' + optionalString withClangPlugins ''

     

       59
       59
       +
           '' + lib.optionalString withClangPlugins ''

     

       62
       60
        
           # Fix paths for llvm/clang includes directories.

     

       63
       61
        
           substituteInPlace src/shared/clang/clang_defines.pri \

     

       64
       62
        
             --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \

     
···

       72
       70
        
             --replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," "    LLVM_CXXFLAGS += -fno-rtti"]}'

     

       73
       71
        
         '';

     

       74
       72
        
       

     

       75
       75
       -
         preBuild = optionalString withDocumentation ''

     

       76
       76
       -
           ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share

     

       73
       73
       +
         preBuild = lib.optionalString withDocumentation ''

     

       74
       74
       +
           ln -s ${lib.getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share

     

       77
       75
        
         '';

     

       78
       76
        
       

     

       79
       77
        
         postInstall = ''

     
···

       92
       90
        
           '';

     

       93
       91
        
           homepage = "https://wiki.qt.io/Category:Tools::QtCreator";

     

       94
       92
        
           license = "LGPL";

     

       95
       95
       -
           maintainers = [ maintainers.akaWolf ];

     

       93
       93
       +
           maintainers = [ lib.maintainers.akaWolf ];

     

       96
       94
        
           platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ];

     

       97
       95
        
         };

     

       98
       96
        
       }

+2 -4

pkgs/development/tools/sauce-connect/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, zlib, unzip }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         pname = "sauce-connect";

     

       7
       5
        
         version = "4.5.4";

     
···

       24
       22
        
         patchPhase = lib.optionalString stdenv.isLinux ''

     

       25
       23
        
           patchelf \

     

       26
       24
        
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       27
       27
       -
             --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \

     

       25
       25
       +
             --set-rpath "$out/lib:${lib.makeLibraryPath [zlib]}" \

     

       28
       26
        
             bin/sc

     

       29
       27
        
         '';

     

       30
       28
        
       

     
···

       35
       33
        
       

     

       36
       34
        
         dontStrip = true;

     

       37
       35
        
       

     

       38
       38
       -
         meta = {

     

       36
       36
       +
         meta = with lib; {

     

       39
       37
        
           description = "A secure tunneling app for executing tests securely when testing behind firewalls";

     

       40
       38
        
           sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       41
       39
        
           license = licenses.unfree;

+1 -3

pkgs/development/tools/selenium/htmlunit-driver/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         pname = "htmlunit-driver-standalone";

     

       7
       5
        
         version = "2.27";

     
···

       15
       13
        
       

     

       16
       14
        
         installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar";

     

       17
       15
        
       

     

       18
       18
       -
         meta = {

     

       16
       16
       +
         meta = with lib; {

     

       19
       17
        
           homepage = "https://github.com/SeleniumHQ/htmlunit-driver";

     

       20
       18
        
           description = "A WebDriver server for running Selenium tests on the HtmlUnit headless browser";

     

       21
       19
        
           maintainers = with maintainers; [ coconnor offline ];

+1 -2

pkgs/development/tools/selenium/selendroid/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       3
        
       let

     

       5
       4
        
           pname = "selendroid-standalone";

     

       6
       5
        
           pluginName = "selendroid-grid-plugin-${version}";

     
···

       39
       38
        
             --add-flags "-capabilityMatcher io.selendroid.grid.SelendroidCapabilityMatcher"

     

       40
       39
        
         '';

     

       41
       40
        
       

     

       42
       42
       -
         meta = {

     

       41
       41
       +
         meta = with lib; {

     

       43
       42
        
           homepage = "http://selendroid.io/";

     

       44
       43
        
           description = "Test automation for native or hybrid Android apps and the mobile web";

     

       45
       44
        
           maintainers = with maintainers; [ offline ];

+2 -4

pkgs/development/tools/selenium/server/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, makeWrapper, jre

     

       2
       2
        
       , htmlunit-driver, chromedriver, chromeSupport ? true }:

     

       3
       3
        
       

     

       4
       4
       -
       with lib;

     

       5
       5
       -
       

     

       6
       4
        
       let

     

       7
       5
        
         minorVersion = "3.141";

     

       8
       6
        
         patchVersion = "59";

     
···

       26
       24
        
           cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar

     

       27
       25
        
           makeWrapper ${jre}/bin/java $out/bin/selenium-server \

     

       28
       26
        
             --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \

     

       29
       29
       -
             ${optionalString chromeSupport "--add-flags -Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \

     

       27
       27
       +
             ${lib.optionalString chromeSupport "--add-flags -Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \

     

       30
       28
        
             --add-flags "org.openqa.grid.selenium.GridLauncherV3"

     

       31
       29
        
         '';

     

       32
       30
        
       

     

       33
       33
       -
         meta = {

     

       31
       31
       +
         meta = with lib; {

     

       34
       32
        
           homepage = "http://www.seleniumhq.org/";

     

       35
       33
        
           description = "Selenium Server for remote WebDriver";

     

       36
       34
        
           sourceProvenance = with sourceTypes; [ binaryBytecode ];

+1 -3

pkgs/development/tools/summon/default.nix

···

       1
       1
        
       { buildGoModule, fetchFromGitHub, lib, patchResolver ? true }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       buildGoModule rec {

     

       6
       4
        
         pname = "summon";

     

       7
       5
        
         version = "0.8.2";

     
···

       19
       17
        
       

     

       20
       18
        
         # Patches provider resolver to support resolving unqualified names

     

       21
       19
        
         # from $PATH, e.g. `summon -p gopass` instead of `summon -p $(which gopass)`

     

       22
       22
       -
         patches = optionals patchResolver [ ./resolve-paths.patch ];

     

       20
       20
       +
         patches = lib.optionals patchResolver [ ./resolve-paths.patch ];

     

       23
       21
        
       

     

       24
       22
        
         postInstall = ''

     

       25
       23
        
           mv $out/bin/cmd $out/bin/summon

+18 -20

pkgs/development/web/nodejs/nodejs.nix

···

       9
       9
        
       , procps, icu

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
       -
       with lib;

     

       13
       13
       -
       

     

       14
       12
        
       { enableNpm ? true, version, sha256, patches ? [] } @args:

     

       15
       13
        
       

     

       16
       14
        
       let

     

       17
       15
        
         inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;

     

       18
       16
        
       

     

       19
       19
       -
         majorVersion = versions.major version;

     

       20
       20
       -
         minorVersion = versions.minor version;

     

       17
       17
       +
         majorVersion = lib.versions.major version;

     

       18
       18
       +
         minorVersion = lib.versions.minor version;

     

       21
       19
        
       

     

       22
       20
        
         pname = if enableNpm then "nodejs" else "nodejs-slim";

     

       23
       21
        
       

     

       24
       24
       -
         useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4";

     

       22
       22
       +
         useSharedHttpParser = !stdenv.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4";

     

       25
       23
        
       

     

       26
       26
       -
         sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs useSharedHttpParser { inherit http-parser; });

     

       24
       24
       +
         sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; });

     

       27
       25
        
       

     

       28
       28
       -
         sharedConfigureFlags = concatMap (name: [

     

       26
       26
       +
         sharedConfigureFlags = lib.concatMap (name: [

     

       29
       27
        
           "--shared-${name}"

     

       30
       30
       -
           "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib"

     

       28
       28
       +
           "--shared-${name}-libpath=${lib.getLib sharedLibDeps.${name}}/lib"

     

       31
       29
        
           /** Closure notes: we explicitly avoid specifying --shared-*-includes,

     

       32
       30
        
            *  as that would put the paths into bin/nodejs.

     

       33
       31
        
            *  Including pkg-config in build inputs would also have the same effect!

     
···

       38
       36
        
       

     

       39
       37
        
         copyLibHeaders =

     

       40
       38
        
           map

     

       41
       41
       -
             (name: "${getDev sharedLibDeps.${name}}/include/*")

     

       39
       39
       +
             (name: "${lib.getDev sharedLibDeps.${name}}/include/*")

     

       42
       40
        
             (builtins.attrNames sharedLibDeps);

     

       43
       41
        
       

     

       44
       44
       -
         extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ];

     

       42
       42
       +
         extraConfigFlags = lib.optionals (!enableNpm) [ "--without-npm" ];

     

       45
       43
        
         self = stdenv.mkDerivation {

     

       46
       44
        
           inherit pname version;

     

       47
       45
        
       

     
···

       54
       52
        
           CXX_host = "c++";

     

       55
       53
        
           depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib ];

     

       56
       54
        
       

     

       57
       57
       -
           buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]

     

       55
       55
       +
           buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]

     

       58
       56
        
             ++ [ zlib libuv openssl http-parser icu ];

     

       59
       57
        
       

     

       60
       58
        
           nativeBuildInputs = [ which pkg-config python ]

     

       61
       61
       -
             ++ optionals stdenv.isDarwin [ xcbuild ];

     

       59
       59
       +
             ++ lib.optionals stdenv.isDarwin [ xcbuild ];

     

       62
       60
        
       

     

       63
       61
        
           outputs = [ "out" "libv8" ];

     

       64
       62
        
           setOutputFlags = false;

     
···

       67
       65
        
           configureFlags = let

     

       68
       66
        
             isCross = stdenv.hostPlatform != stdenv.buildPlatform;

     

       69
       67
        
             inherit (stdenv.hostPlatform) gcc isAarch32;

     

       70
       70
       -
           in sharedConfigureFlags ++ optionals (versionOlder version "19") [

     

       68
       68
       +
           in sharedConfigureFlags ++ lib.optionals (lib.versionOlder version "19") [

     

       71
       69
        
             "--without-dtrace"

     

       72
       72
       -
           ] ++ (optionals isCross [

     

       70
       70
       +
           ] ++ (lib.optionals isCross [

     

       73
       71
        
             "--cross-compiling"

     

       74
       72
        
             "--without-intl"

     

       75
       73
        
             "--without-snapshot"

     
···

       86
       84
        
                           else if platform.isS390 && platform.is64bit then "s390x"

     

       87
       85
        
                           else if platform.isRiscV && platform.is64bit then "riscv64"

     

       88
       86
        
                           else throw "unsupported cpu ${stdenv.hostPlatform.uname.processor}"}"

     

       89
       89
       -
           ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [

     

       87
       87
       +
           ]) ++ (lib.optionals (isCross && isAarch32 && lib.hasAttr "fpu" gcc) [

     

       90
       88
        
             "--with-arm-fpu=${gcc.fpu}"

     

       91
       91
       -
           ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [

     

       89
       89
       +
           ]) ++ (lib.optionals (isCross && isAarch32 && lib.hasAttr "float-abi" gcc) [

     

       92
       90
        
             "--with-arm-float-abi=${gcc.float-abi}"

     

       93
       91
        
           ]) ++ extraConfigFlags;

     

       94
       92
        
       

     
···

       122
       120
        
               substituteInPlace $a \

     

       123
       121
        
                 --replace "/usr/bin/env" "${coreutils}/bin/env"

     

       124
       122
        
             done

     

       125
       125
       -
           '' + optionalString stdenv.isDarwin ''

     

       123
       123
       +
           '' + lib.optionalString stdenv.isDarwin ''

     

       126
       124
        
             sed -i -e "s|tr1/type_traits|type_traits|g" \

     

       127
       125
        
                    -e "s|std::tr1|std|" src/util.h

     

       128
       126
        
           '';

     
···

       133
       131
        
           postInstall = ''

     

       134
       132
        
             PATH=$out/bin:$PATH patchShebangs $out

     

       135
       133
        
       

     

       136
       136
       -
             ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''

     

       134
       134
       +
             ${lib.optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''

     

       137
       135
        
               mkdir -p $out/share/bash-completion/completions/

     

       138
       136
        
               HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm

     

       139
       137
        
               for dir in "$out/lib/node_modules/npm/man/"*; do

     
···

       145
       143
        
             ''}

     

       146
       144
        
       

     

       147
       145
        
             # install the missing headers for node-gyp

     

       148
       148
       -
             cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node

     

       146
       146
       +
             cp -r ${lib.concatStringsSep " " copyLibHeaders} $out/include/node

     

       149
       147
        
       

     

       150
       148
        
             # assemble a static v8 library and put it in the 'libv8' output

     

       151
       149
        
             mkdir -p $libv8/lib

     
···

       183
       181
        
             inherit majorVersion;

     

       184
       182
        
           };

     

       185
       183
        
       

     

       186
       186
       -
           meta = {

     

       184
       184
       +
           meta = with lib; {

     

       187
       185
        
             description = "Event-driven I/O framework for the V8 JavaScript engine";

     

       188
       186
        
             homepage = "https://nodejs.org";

     

       189
       187
        
             changelog = "https://github.com/nodejs/node/releases/tag/v${version}";