commit 2ee93d61ad2220199e8116526d485a8e23e9aee5 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/vault-postgresql.nix

···

       8
        
       import ./make-test-python.nix ({ pkgs, ... }:

     

       9
        
       {

     

       10
        
         name = "vault-postgresql";

     

       11
       -
         meta = with pkgs.stdenv.lib.maintainers; {

     

       12
        
           maintainers = [ lnl7 roberth ];

     

       13
        
         };

     

       14
        
         machine = { lib, pkgs, ... }: {

···

       8
        
       import ./make-test-python.nix ({ pkgs, ... }:

     

       9
        
       {

     

       10
        
         name = "vault-postgresql";

     

       11
       +
         meta = with pkgs.lib.maintainers; {

     

       12
        
           maintainers = [ lnl7 roberth ];

     

       13
        
         };

     

       14
        
         machine = { lib, pkgs, ... }: {

+4 -4

pkgs/build-support/fetchgit/default.nix

···

       1
       -
       {stdenvNoCC, git, git-lfs, cacert}: let

     

       2
        
         urlToName = url: rev: let

     

       3
       -
           inherit (stdenvNoCC.lib) removeSuffix splitString last;

     

       4
        
           base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));

     

       5
        
       

     

       6
        
           matched = builtins.match "(.*).git" base;

     
···

       56
        
         fetcher = ./nix-prefetch-git;  # This must be a string to ensure it's called with bash.

     

       57
        
       

     

       58
        
         nativeBuildInputs = [ git ]

     

       59
       -
           ++ stdenvNoCC.lib.optionals fetchLFS [ git-lfs ];

     

       60
        
       

     

       61
        
         outputHashAlgo = "sha256";

     

       62
        
         outputHashMode = "recursive";

     
···

       66
        
       

     

       67
        
         GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";

     

       68
        
       

     

       69
       -
         impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [

     

       70
        
           "GIT_PROXY_COMMAND" "SOCKS_SERVER"

     

       71
        
         ];

     

       72

···

       1
       +
       {lib, stdenvNoCC, git, git-lfs, cacert}: let

     

       2
        
         urlToName = url: rev: let

     

       3
       +
           inherit (lib) removeSuffix splitString last;

     

       4
        
           base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));

     

       5
        
       

     

       6
        
           matched = builtins.match "(.*).git" base;

     
···

       56
        
         fetcher = ./nix-prefetch-git;  # This must be a string to ensure it's called with bash.

     

       57
        
       

     

       58
        
         nativeBuildInputs = [ git ]

     

       59
       +
           ++ lib.optionals fetchLFS [ git-lfs ];

     

       60
        
       

     

       61
        
         outputHashAlgo = "sha256";

     

       62
        
         outputHashMode = "recursive";

     
···

       66
        
       

     

       67
        
         GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";

     

       68
        
       

     

       69
       +
         impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [

     

       70
        
           "GIT_PROXY_COMMAND" "SOCKS_SERVER"

     

       71
        
         ];

     

       72

+2 -2

pkgs/build-support/fetchhg/default.nix

···

       1
       -
       { stdenvNoCC, mercurial }:

     

       2
        
       { name ? null

     

       3
        
       , url

     

       4
        
       , rev ? null

     
···

       16
        
         builder = ./builder.sh;

     

       17
        
         nativeBuildInputs = [mercurial];

     

       18
        
       

     

       19
       -
         impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;

     

       20
        
       

     

       21
        
         subrepoClause = if fetchSubrepos then "S" else "";

     

       22

···

       1
       +
       { lib, stdenvNoCC, mercurial }:

     

       2
        
       { name ? null

     

       3
        
       , url

     

       4
        
       , rev ? null

     
···

       16
        
         builder = ./builder.sh;

     

       17
        
         nativeBuildInputs = [mercurial];

     

       18
        
       

     

       19
       +
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;

     

       20
        
       

     

       21
        
         subrepoClause = if fetchSubrepos then "S" else "";

     

       22

+2 -2

pkgs/build-support/fetchmtn/default.nix

···

       1
        
       # You can specify some extra mirrors and a cache DB via options

     

       2
       -
       {stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}:

     

       3
        
       # dbs is a list of strings

     

       4
        
       # each is an url for sync

     

       5
        
       

     
···

       19
        
         dbs = defaultDBMirrors ++ dbs;

     

       20
        
         inherit branch cacheDB name selector;

     

       21
        
       

     

       22
       -
         impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;

     

       23
        
       

     

       24
        
       }

     

       25

···

       1
        
       # You can specify some extra mirrors and a cache DB via options

     

       2
       +
       {lib, stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}:

     

       3
        
       # dbs is a list of strings

     

       4
        
       # each is an url for sync

     

       5
        
       

     
···

       19
        
         dbs = defaultDBMirrors ++ dbs;

     

       20
        
         inherit branch cacheDB name selector;

     

       21
        
       

     

       22
       +
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;

     

       23
        
       

     

       24
        
       }

     

       25

+2 -2

pkgs/build-support/fetchrepoproject/default.nix

···

       1
       -
       { stdenvNoCC, gitRepo, cacert, copyPathsToStore }:

     

       2
        
       

     

       3
        
       { name, manifest, rev ? "HEAD", sha256

     

       4
        
       # Optional parameters:

     
···

       9
        
       assert repoRepoRev != "" -> repoRepoURL != "";

     

       10
        
       assert createMirror -> !useArchive;

     

       11
        
       

     

       12
       -
       with stdenvNoCC.lib;

     

       13
        
       

     

       14
        
       let

     

       15
        
         extraRepoInitFlags = [

···

       1
       +
       { lib, stdenvNoCC, gitRepo, cacert, copyPathsToStore }:

     

       2
        
       

     

       3
        
       { name, manifest, rev ? "HEAD", sha256

     

       4
        
       # Optional parameters:

     
···

       9
        
       assert repoRepoRev != "" -> repoRepoURL != "";

     

       10
        
       assert createMirror -> !useArchive;

     

       11
        
       

     

       12
       +
       with lib;

     

       13
        
       

     

       14
        
       let

     

       15
        
         extraRepoInitFlags = [

+2 -2

pkgs/build-support/fetchs3/default.nix

···

       1
       -
       { stdenvNoCC, runCommand, awscli }:

     

       2
        
       

     

       3
        
       { s3url

     

       4
        
       , name ? builtins.baseNameOf s3url

     
···

       16
        
           AWS_SESSION_TOKEN = session_token;

     

       17
        
         };

     

       18
        
       

     

       19
       -
         credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials);

     

       20
        
       in runCommand name ({

     

       21
        
         nativeBuildInputs = [ awscli ];

     

       22

···

       1
       +
       { lib, stdenvNoCC, runCommand, awscli }:

     

       2
        
       

     

       3
        
       { s3url

     

       4
        
       , name ? builtins.baseNameOf s3url

     
···

       16
        
           AWS_SESSION_TOKEN = session_token;

     

       17
        
         };

     

       18
        
       

     

       19
       +
         credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials);

     

       20
        
       in runCommand name ({

     

       21
        
         nativeBuildInputs = [ awscli ];

     

       22

+4 -4

pkgs/build-support/fetchsvn/default.nix

···

       1
       -
       { stdenvNoCC, buildPackages

     

       2
        
       , subversion, glibcLocales, sshSupport ? true, openssh ? null

     

       3
        
       }:

     

       4
        
       

     
···

       10
        
       assert sshSupport -> openssh != null;

     

       11
        
       

     

       12
        
       let

     

       13
       -
         repoName = with stdenvNoCC.lib;

     

       14
        
           let

     

       15
        
             fst = head;

     

       16
        
             snd = l: head (tail l);

     
···

       39
        
         name = name_;

     

       40
        
         builder = ./builder.sh;

     

       41
        
         nativeBuildInputs = [ subversion glibcLocales ]

     

       42
       -
           ++ stdenvNoCC.lib.optional sshSupport openssh;

     

       43
        
       

     

       44
        
         SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;

     

       45
        
       

     
···

       49
        
       

     

       50
        
         inherit url rev ignoreExternals ignoreKeywords;

     

       51
        
       

     

       52
       -
         impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;

     

       53
        
         inherit preferLocalBuild;

     

       54
        
       }

···

       1
       +
       { lib, stdenvNoCC, buildPackages

     

       2
        
       , subversion, glibcLocales, sshSupport ? true, openssh ? null

     

       3
        
       }:

     

       4
        
       

     
···

       10
        
       assert sshSupport -> openssh != null;

     

       11
        
       

     

       12
        
       let

     

       13
       +
         repoName = with lib;

     

       14
        
           let

     

       15
        
             fst = head;

     

       16
        
             snd = l: head (tail l);

     
···

       39
        
         name = name_;

     

       40
        
         builder = ./builder.sh;

     

       41
        
         nativeBuildInputs = [ subversion glibcLocales ]

     

       42
       +
           ++ lib.optional sshSupport openssh;

     

       43
        
       

     

       44
        
         SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;

     

       45
        
       

     
···

       49
        
       

     

       50
        
         inherit url rev ignoreExternals ignoreKeywords;

     

       51
        
       

     

       52
       +
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;

     

       53
        
         inherit preferLocalBuild;

     

       54
        
       }

+1 -1

pkgs/build-support/kernel/make-initrd.nix

···

       83
        
         builder = ./make-initrd.sh;

     

       84
        
       

     

       85
        
         nativeBuildInputs = [ perl cpio ]

     

       86
       -
           ++ stdenvNoCC.lib.optional makeUInitrd ubootTools;

     

       87
        
       

     

       88
        
         compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";

     

       89

···

       83
        
         builder = ./make-initrd.sh;

     

       84
        
       

     

       85
        
         nativeBuildInputs = [ perl cpio ]

     

       86
       +
           ++ lib.optional makeUInitrd ubootTools;

     

       87
        
       

     

       88
        
         compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";

     

       89

+5 -5

pkgs/build-support/templaterpm/nix-template-rpm.py

···

       229
        
       

     

       230
        
         @property

     

       231
        
         def meta(self):

     

       232
       -
           out = '  meta = {\n'

     

       233
        
           out += '    homepage = ' + self.spec.sourceHeader['url'] + ';\n'

     

       234
        
           out += '    description = "' + self.spec.sourceHeader['summary'] + '";\n'

     

       235
       -
           out += '    license = stdenv.lib.licenses.' + self.spec.sourceHeader['license'] + ';\n'

     

       236
        
           out += '    platforms = [ "i686-linux" "x86_64-linux" ];\n'

     

       237
       -
           out += '    maintainers = with stdenv.lib.maintainers; [ ' + self.maintainer + ' ];\n'

     

       238
        
           out += '  };\n'

     

       239
        
           out += '}\n'

     

       240
        
           return out

     

       241
        
       

     

       242
        
       

     

       243
        
         def __str__(self):

     

       244
       -
           head = '{stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'

     

       245
        
           head += 'stdenv.mkDerivation {\n'

     

       246
        
           body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ]

     

       247
        
           return head + '\n'.join(body)

     

       248
        
       

     

       249
        
       

     

       250
        
         def getTemplate(self):

     

       251
       -
           head = '{stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'

     

       252
        
           head += 'let\n'

     

       253
        
           head += '  buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n'

     

       254
        
           head += 'in\n\n'

···

       229
        
       

     

       230
        
         @property

     

       231
        
         def meta(self):

     

       232
       +
           out = '  meta = with lib; {\n'

     

       233
        
           out += '    homepage = ' + self.spec.sourceHeader['url'] + ';\n'

     

       234
        
           out += '    description = "' + self.spec.sourceHeader['summary'] + '";\n'

     

       235
       +
           out += '    license = lib.licenses.' + self.spec.sourceHeader['license'] + ';\n'

     

       236
        
           out += '    platforms = [ "i686-linux" "x86_64-linux" ];\n'

     

       237
       +
           out += '    maintainers = with lib.maintainers; [ ' + self.maintainer + ' ];\n'

     

       238
        
           out += '  };\n'

     

       239
        
           out += '}\n'

     

       240
        
           return out

     

       241
        
       

     

       242
        
       

     

       243
        
         def __str__(self):

     

       244
       +
           head = '{lib, stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'

     

       245
        
           head += 'stdenv.mkDerivation {\n'

     

       246
        
           body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ]

     

       247
        
           return head + '\n'.join(body)

     

       248
        
       

     

       249
        
       

     

       250
        
         def getTemplate(self):

     

       251
       +
           head = '{lib, stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'

     

       252
        
           head += 'let\n'

     

       253
        
           head += '  buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n'

     

       254
        
           head += 'in\n\n'

+2 -2

pkgs/development/compilers/chicken/4/fetchegg/default.nix

···

       1
        
       # Fetches a chicken egg from henrietta using `chicken-install -r'

     

       2
        
       # See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html

     

       3
        
       

     

       4
       -
       { stdenvNoCC, chicken }:

     

       5
        
       { name, version, md5 ? "", sha256 ? "" }:

     

       6
        
       

     

       7
        
       if md5 != "" then

     
···

       20
        
       

     

       21
        
         eggName = name;

     

       22
        
       

     

       23
       -
         impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;

     

       24
        
       }

     

       25

···

       1
        
       # Fetches a chicken egg from henrietta using `chicken-install -r'

     

       2
        
       # See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html

     

       3
        
       

     

       4
       +
       { lib, stdenvNoCC, chicken }:

     

       5
        
       { name, version, md5 ? "", sha256 ? "" }:

     

       6
        
       

     

       7
        
       if md5 != "" then

     
···

       20
        
       

     

       21
        
         eggName = name;

     

       22
        
       

     

       23
       +
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;

     

       24
        
       }

     

       25

+2 -2

pkgs/development/compilers/chicken/5/fetchegg/default.nix

···

       1
        
       # Fetches a chicken egg from henrietta using `chicken-install -r'

     

       2
        
       # See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html

     

       3
        
       

     

       4
       -
       { stdenvNoCC, chicken }:

     

       5
        
       { name, version, md5 ? "", sha256 ? "" }:

     

       6
        
       

     

       7
        
       if md5 != "" then

     
···

       20
        
       

     

       21
        
         eggName = name;

     

       22
        
       

     

       23
       -
         impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;

     

       24
        
       }

     

       25

···

       1
        
       # Fetches a chicken egg from henrietta using `chicken-install -r'

     

       2
        
       # See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html

     

       3
        
       

     

       4
       +
       { lib, stdenvNoCC, chicken }:

     

       5
        
       { name, version, md5 ? "", sha256 ? "" }:

     

       6
        
       

     

       7
        
       if md5 != "" then

     
···

       20
        
       

     

       21
        
         eggName = name;

     

       22
        
       

     

       23
       +
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;

     

       24
        
       }

     

       25

+2 -2

pkgs/development/compilers/open-watcom-bin/default.nix

···

       1
       -
       { stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:

     

       2
        
       

     

       3
        
       let

     

       4
        
       

     
···

       112
        
           done

     

       113
        
         '';

     

       114
        
       

     

       115
       -
         meta = with stdenvNoCC.lib; {

     

       116
        
           description = "A C/C++ Compiler (binary distribution)";

     

       117
        
           homepage = "http://www.openwatcom.org/";

     

       118
        
           license = licenses.watcom;

···

       1
       +
       { lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:

     

       2
        
       

     

       3
        
       let

     

       4
        
       

     
···

       112
        
           done

     

       113
        
         '';

     

       114
        
       

     

       115
       +
         meta = with lib; {

     

       116
        
           description = "A C/C++ Compiler (binary distribution)";

     

       117
        
           homepage = "http://www.openwatcom.org/";

     

       118
        
           license = licenses.watcom;

+2 -2

pkgs/development/libraries/gcc/libgcc/default.nix

···

       1
       -
       { stdenvNoLibs, buildPackages

     

       2
        
       , gcc, glibc

     

       3
        
       , libiberty

     

       4
        
       }:

     
···

       128
        
           "--disable-vtable-verify"

     

       129
        
       

     

       130
        
           "--with-system-zlib"

     

       131
       -
         ] ++ stdenvNoLibs.lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")

     

       132
        
              "--with-glibc-version=${glibc.version}";

     

       133
        
       

     

       134
        
         configurePlatforms = [ "build" "host" ];

···

       1
       +
       { lib, stdenvNoLibs, buildPackages

     

       2
        
       , gcc, glibc

     

       3
        
       , libiberty

     

       4
        
       }:

     
···

       128
        
           "--disable-vtable-verify"

     

       129
        
       

     

       130
        
           "--with-system-zlib"

     

       131
       +
         ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")

     

       132
        
              "--with-glibc-version=${glibc.version}";

     

       133
        
       

     

       134
        
         configurePlatforms = [ "build" "host" ];

+4 -4

pkgs/development/libraries/relibc/default.nix

···

       1
       -
       { stdenvNoCC, buildPackages, makeRustPlatform }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         rpath = stdenvNoCC.lib.makeLibraryPath [

     

       5
        
           buildPackages.stdenv.cc.libc

     

       6
        
           "$out"

     

       7
        
         ];

     
···

       30
        
                 "{}" \;

     

       31
        
           '';

     

       32
        
       

     

       33
       -
           meta.platforms = with stdenvNoCC.lib; platforms.redox ++ platforms.linux;

     

       34
        
         };

     

       35
        
       

     

       36
        
         redoxRustPlatform = buildPackages.makeRustPlatform {

     
···

       68
        
       

     

       69
        
         cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz";

     

       70
        
       

     

       71
       -
         meta = with stdenvNoCC.lib; {

     

       72
        
           homepage = "https://gitlab.redox-os.org/redox-os/relibc";

     

       73
        
           description = "C Library in Rust for Redox and Linux";

     

       74
        
           license = licenses.mit;

···

       1
       +
       { lib, stdenvNoCC, buildPackages, makeRustPlatform }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         rpath = lib.makeLibraryPath [

     

       5
        
           buildPackages.stdenv.cc.libc

     

       6
        
           "$out"

     

       7
        
         ];

     
···

       30
        
                 "{}" \;

     

       31
        
           '';

     

       32
        
       

     

       33
       +
           meta.platforms = with lib; platforms.redox ++ platforms.linux;

     

       34
        
         };

     

       35
        
       

     

       36
        
         redoxRustPlatform = buildPackages.makeRustPlatform {

     
···

       68
        
       

     

       69
        
         cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz";

     

       70
        
       

     

       71
       +
         meta = with lib; {

     

       72
        
           homepage = "https://gitlab.redox-os.org/redox-os/relibc";

     

       73
        
           description = "C Library in Rust for Redox and Linux";

     

       74
        
           license = licenses.mit;

+5 -4

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

···

       1
       -
       { stdenv

     

       0
        
       
     

       2
        
       , callPackage

     

       3
        
       , stdenvNoCC

     

       4
        
       , fetchurl

     
···

       135
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}

     

       136
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}

     

       137
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}

     

       138
       -
         '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ''

     

       139
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3"

     

       140
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3"

     

       141
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3"

     
···

       145
        
         # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the

     

       146
        
         # larger updated load commands do not fit. Use install_name_tool

     

       147
        
         # explicitly and ignore the error.

     

       148
       -
         postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin ''

     

       149
        
           for f in $out/lib/*.dylib; do

     

       150
        
             install_name_tool -id $out/lib/$(basename $f) $f || true

     

       151
        
           done

     
···

       160
        
       

     

       161
        
         passthru.tests.pkg-config = callPackage ./test { };

     

       162
        
       

     

       163
       -
         meta = with stdenvNoCC.lib; {

     

       164
        
           description = "Intel Math Kernel Library";

     

       165
        
           longDescription = ''

     

       166
        
             Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
        
       , callPackage

     

       4
        
       , stdenvNoCC

     

       5
        
       , fetchurl

     
···

       136
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}

     

       137
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}

     

       138
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}

     

       139
       +
         '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''

     

       140
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3"

     

       141
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3"

     

       142
        
           ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3"

     
···

       146
        
         # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the

     

       147
        
         # larger updated load commands do not fit. Use install_name_tool

     

       148
        
         # explicitly and ignore the error.

     

       149
       +
         postFixup = lib.optionalString stdenvNoCC.isDarwin ''

     

       150
        
           for f in $out/lib/*.dylib; do

     

       151
        
             install_name_tool -id $out/lib/$(basename $f) $f || true

     

       152
        
           done

     
···

       161
        
       

     

       162
        
         passthru.tests.pkg-config = callPackage ./test { };

     

       163
        
       

     

       164
       +
         meta = with lib; {

     

       165
        
           description = "Intel Math Kernel Library";

     

       166
        
           longDescription = ''

     

       167
        
             Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort

+5 -5

pkgs/development/lisp-modules/asdf/2.26.nix

···

       1
       -
       {stdenv, fetchurl, texinfo, texLive, perl}:

     

       2
        
       let

     

       3
        
         s = # Generated upstream information

     

       4
        
         rec {

     
···

       31
        
           cp -r doc/* "$out"/share/doc/asdf/

     

       32
        
           ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}

     

       33
        
         '';

     

       34
       -
         meta = {

     

       35
        
           inherit (s) version;

     

       36
        
           description = "Standard software-system definition library for Common Lisp";

     

       37
       -
           license = stdenv.lib.licenses.mit ;

     

       38
       -
           maintainers = [stdenv.lib.maintainers.raskin];

     

       39
       -
           platforms = stdenv.lib.platforms.linux;

     

       40
        
         };

     

       41
        
       }

···

       1
       +
       {lib, stdenv, fetchurl, texinfo, texLive, perl}:

     

       2
        
       let

     

       3
        
         s = # Generated upstream information

     

       4
        
         rec {

     
···

       31
        
           cp -r doc/* "$out"/share/doc/asdf/

     

       32
        
           ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}

     

       33
        
         '';

     

       34
       +
         meta = with lib; {

     

       35
        
           inherit (s) version;

     

       36
        
           description = "Standard software-system definition library for Common Lisp";

     

       37
       +
           license = licenses.mit;

     

       38
       +
           maintainers = [maintainers.raskin];

     

       39
       +
           platforms = platforms.linux;

     

       40
        
         };

     

       41
        
       }

+5 -5

pkgs/development/lisp-modules/asdf/3.1.nix

···

       1
       -
       {stdenv, fetchurl, texinfo, texLive, perl}:

     

       2
        
       let

     

       3
        
         s = # Generated upstream information

     

       4
        
         rec {

     
···

       30
        
           cp -r doc/* "$out"/share/doc/asdf/

     

       31
        
           ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}

     

       32
        
         '';

     

       33
       -
         meta = {

     

       34
        
           inherit (s) version;

     

       35
        
           description = "Standard software-system definition library for Common Lisp";

     

       36
       -
           license = stdenv.lib.licenses.mit ;

     

       37
       -
           maintainers = [stdenv.lib.maintainers.raskin];

     

       38
       -
           platforms = stdenv.lib.platforms.unix;

     

       39
        
         };

     

       40
        
       }

···

       1
       +
       {lib, stdenv, fetchurl, texinfo, texLive, perl}:

     

       2
        
       let

     

       3
        
         s = # Generated upstream information

     

       4
        
         rec {

     
···

       30
        
           cp -r doc/* "$out"/share/doc/asdf/

     

       31
        
           ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}

     

       32
        
         '';

     

       33
       +
         meta = with lib; {

     

       34
        
           inherit (s) version;

     

       35
        
           description = "Standard software-system definition library for Common Lisp";

     

       36
       +
           license = licenses.mit ;

     

       37
       +
           maintainers = [maintainers.raskin];

     

       38
       +
           platforms = platforms.unix;

     

       39
        
         };

     

       40
        
       }

+5 -5

pkgs/development/lisp-modules/asdf/default.nix

···

       1
       -
       {stdenv, fetchurl, texinfo, texLive, perl}:

     

       2
        
       let

     

       3
        
         s = # Generated upstream information

     

       4
        
         rec {

     
···

       31
        
           cp -r doc/* "$out"/share/doc/asdf/

     

       32
        
           ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}

     

       33
        
         '';

     

       34
       -
         meta = {

     

       35
        
           inherit (s) version;

     

       36
        
           description = "Standard software-system definition library for Common Lisp";

     

       37
       -
           license = stdenv.lib.licenses.mit ;

     

       38
       -
           maintainers = [stdenv.lib.maintainers.raskin];

     

       39
       -
           platforms = stdenv.lib.platforms.unix;

     

       40
        
         };

     

       41
        
       }

···

       1
       +
       {lib, stdenv, fetchurl, texinfo, texLive, perl}:

     

       2
        
       let

     

       3
        
         s = # Generated upstream information

     

       4
        
         rec {

     
···

       31
        
           cp -r doc/* "$out"/share/doc/asdf/

     

       32
        
           ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}

     

       33
        
         '';

     

       34
       +
         meta = with lib; {

     

       35
        
           inherit (s) version;

     

       36
        
           description = "Standard software-system definition library for Common Lisp";

     

       37
       +
           license = licenses.mit ;

     

       38
       +
           maintainers = [maintainers.raskin];

     

       39
       +
           platforms = platforms.unix;

     

       40
        
         };

     

       41
        
       }

+2 -2

pkgs/development/lisp-modules/clwrapper/default.nix

···

       1
       -
       {stdenv, asdf, which, bash, lisp ? null}:

     

       2
        
       stdenv.mkDerivation {

     

       3
        
         name = "cl-wrapper-script";

     

       4
        
       

     
···

       52
        
       

     

       53
        
         meta = {

     

       54
        
           description = "Script used to wrap Common Lisp implementations";

     

       55
       -
           maintainers = [stdenv.lib.maintainers.raskin];

     

       56
        
         };

     

       57
        
       }

···

       1
       +
       {lib, stdenv, asdf, which, bash, lisp ? null}:

     

       2
        
       stdenv.mkDerivation {

     

       3
        
         name = "cl-wrapper-script";

     

       4
        
       

     
···

       52
        
       

     

       53
        
         meta = {

     

       54
        
           description = "Script used to wrap Common Lisp implementations";

     

       55
       +
           maintainers = [lib.maintainers.raskin];

     

       56
        
         };

     

       57
        
       }

+2 -2

pkgs/development/lisp-modules/define-package.nix

···

       1
       -
       args @ {stdenv, clwrapper, baseName, packageName ? baseName

     

       2
        
         , parasites ? []

     

       3
        
         , buildSystems ? ([packageName] ++ parasites)

     

       4
        
         , version ? "latest"

     
···

       89
        
           env -i \

     

       90
        
           NIX_LISP="$NIX_LISP" \

     

       91
        
           NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn

     

       92
       -
                 ${stdenv.lib.concatMapStrings (system: ''

     

       93
        
                   (asdf:compile-system :${system})

     

       94
        
                   (asdf:load-system :${system})

     

       95
        
                   (asdf:operate (quote asdf::compile-bundle-op) :${system})

···

       1
       +
       args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName

     

       2
        
         , parasites ? []

     

       3
        
         , buildSystems ? ([packageName] ++ parasites)

     

       4
        
         , version ? "latest"

     
···

       89
        
           env -i \

     

       90
        
           NIX_LISP="$NIX_LISP" \

     

       91
        
           NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn

     

       92
       +
                 ${lib.concatMapStrings (system: ''

     

       93
        
                   (asdf:compile-system :${system})

     

       94
        
                   (asdf:load-system :${system})

     

       95
        
                   (asdf:operate (quote asdf::compile-bundle-op) :${system})

+2 -2

pkgs/development/lisp-modules/lisp-packages.nix

···

       1
       -
       {stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:

     

       2
        
       let lispPackages = rec {

     

       3
       -
         inherit pkgs clwrapper stdenv;

     

       4
        
         nixLib = pkgs.lib;

     

       5
        
         callPackage = nixLib.callPackageWith lispPackages;

     

       6

···

       1
       +
       {lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:

     

       2
        
       let lispPackages = rec {

     

       3
       +
         inherit lib pkgs clwrapper stdenv;

     

       4
        
         nixLib = pkgs.lib;

     

       5
        
         callPackage = nixLib.callPackageWith lispPackages;

     

       6

+2 -2

pkgs/development/lisp-modules/quicklisp-to-nix.nix

···

       1
       -
       {stdenv, fetchurl, pkgs, clwrapper}:

     

       2
        
       let quicklisp-to-nix-packages = rec {

     

       3
       -
         inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;

     

       4
        
       

     

       5
        
         callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;

     

       6
        
         buildLispPackage = callPackage ./define-package.nix;

···

       1
       +
       {lib, stdenv, fetchurl, pkgs, clwrapper}:

     

       2
        
       let quicklisp-to-nix-packages = rec {

     

       3
       +
         inherit lib stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;

     

       4
        
       

     

       5
        
         callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;

     

       6
        
         buildLispPackage = callPackage ./define-package.nix;

+2 -2

pkgs/development/misc/msp430/gcc-support.nix

···

       1
       -
       { stdenvNoCC, fetchzip }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         mspgccVersion = "6_1_1_0";

     
···

       19
        
           touch $out/lib/lib

     

       20
        
         '';

     

       21
        
       

     

       22
       -
         meta = with stdenvNoCC.lib; {

     

       23
        
           description = ''

     

       24
        
             Development headers and linker scripts for TI MSP430 microcontrollers

     

       25
        
           '';

···

       1
       +
       { lib, stdenvNoCC, fetchzip }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         mspgccVersion = "6_1_1_0";

     
···

       19
        
           touch $out/lib/lib

     

       20
        
         '';

     

       21
        
       

     

       22
       +
         meta = with lib; {

     

       23
        
           description = ''

     

       24
        
             Development headers and linker scripts for TI MSP430 microcontrollers

     

       25
        
           '';

+1 -1

pkgs/stdenv/adapters.nix

···

       110
        
         */

     

       111
        
         replaceMaintainersField = stdenv: pkgs: maintainers: stdenv //

     

       112
        
           { mkDerivation = args:

     

       113
       -
               stdenv.lib.recursiveUpdate

     

       114
        
                 (stdenv.mkDerivation args)

     

       115
        
                 { meta.maintainers = maintainers; };

     

       116
        
           };

···

       110
        
         */

     

       111
        
         replaceMaintainersField = stdenv: pkgs: maintainers: stdenv //

     

       112
        
           { mkDerivation = args:

     

       113
       +
               pkgs.lib.recursiveUpdate

     

       114
        
                 (stdenv.mkDerivation args)

     

       115
        
                 { meta.maintainers = maintainers; };

     

       116
        
           };

+2 -2

pkgs/tools/security/proxmark3/proxmark3-rrg.nix

···

       1
       -
       { stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5

     

       2
        
       , readline

     

       3
        
       

     

       4
        
       , hardwarePlatform ? "PM3RDV4"

     
···

       29
        
           install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf

     

       30
        
         '';

     

       31
        
       

     

       32
       -
         meta = with stdenv.lib; {

     

       33
        
           description = "Client for proxmark3, powerful general purpose RFID tool";

     

       34
        
           homepage = "https://rfidresearchgroup.com/";

     

       35
        
           license = licenses.gpl2Plus;

···

       1
       +
       { lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5

     

       2
        
       , readline

     

       3
        
       

     

       4
        
       , hardwarePlatform ? "PM3RDV4"

     
···

       29
        
           install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf

     

       30
        
         '';

     

       31
        
       

     

       32
       +
         meta = with lib; {

     

       33
        
           description = "Client for proxmark3, powerful general purpose RFID tool";

     

       34
        
           homepage = "https://rfidresearchgroup.com/";

     

       35
        
           license = licenses.gpl2Plus;

+1 -1

pkgs/top-level/all-packages.nix

···

       25269
        
         }).overrideAttrs (oldAttrs: rec {

     

       25270
        
           pname = "vim-darwin";

     

       25271
        
           meta = {

     

       25272
       -
             platforms = stdenv.lib.platforms.darwin;

     

       25273
        
           };

     

       25274
        
         });

     

       25275

···

       25269
        
         }).overrideAttrs (oldAttrs: rec {

     

       25270
        
           pname = "vim-darwin";

     

       25271
        
           meta = {

     

       25272
       +
             platforms = lib.platforms.darwin;

     

       25273
        
           };

     

       25274
        
         });

     

       25275