commit 2497553b233694b20b07f2fc85b3b3f7bed53a39 · pyrox.dev/nixpkgs

+1 -1

pkgs/development/interpreters/python/default.nix

··· 24 24 pythonPackages = callPackage 25 25 ({ pkgs, stdenv, python, overrides }: let 26 26 pythonPackagesFun = import ../../../top-level/python-packages.nix { 27 - inherit stdenv pkgs; 27 + inherit stdenv pkgs lib; 28 28 python = self; 29 29 }; 30 30 otherSplices = {

+1 -1

pkgs/top-level/aliases.nix

··· 284 284 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 285 285 libgumbo = gumbo; # added 2018-01-21 286 286 libGL_driver = mesa.drivers; # added 2019-05-28 287 - libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 287 + libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 288 288 libjpeg_drop = libjpeg_original; # added 2020-06-05 289 289 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 290 290 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05

+26 -26

pkgs/top-level/all-packages.nix

··· 6721 6721 libcap = if stdenv.isDarwin then null else libcap; 6722 6722 }; 6723 6723 6724 - pinentry-curses = (stdenv.lib.getOutput "curses" pinentry); 6725 - pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry); 6726 - pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); 6727 - pinentry-qt = (stdenv.lib.getOutput "qt" pinentry); 6728 - pinentry-gnome = (stdenv.lib.getOutput "gnome3" pinentry); 6724 + pinentry-curses = (lib.getOutput "curses" pinentry); 6725 + pinentry-emacs = (lib.getOutput "emacs" pinentry); 6726 + pinentry-gtk2 = (lib.getOutput "gtk2" pinentry); 6727 + pinentry-qt = (lib.getOutput "qt" pinentry); 6728 + pinentry-gnome = (lib.getOutput "gnome3" pinentry); 6729 6729 6730 6730 pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { 6731 6731 inherit (darwin.apple_sdk.frameworks) Cocoa; ··· 9185 9185 mkdir -p "$rsrc/lib" 9186 9186 ln -s "${cc}/lib" "$rsrc/include" 9187 9187 echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags 9188 - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' 9188 + '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' 9189 9189 echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags 9190 9190 ''; 9191 9191 }; ··· 10070 10070 inherit (stdenvAdapters) overrideCC; 10071 10071 buildLlvmTools = buildPackages.llvmPackages_11.tools; 10072 10072 targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; 10073 - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { 10073 + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { 10074 10074 stdenv = gcc7Stdenv; 10075 10075 }); 10076 10076 ··· 10535 10535 # want the C++ library to be explicitly chosen by the caller, and null by 10536 10536 # default. 10537 10537 libcxx ? null 10538 - , extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross 10538 + , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross 10539 10539 , ... 10540 10540 } @ extraArgs: 10541 10541 callPackage ../build-support/cc-wrapper (let self = { ··· 11031 11031 spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; 11032 11032 spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ 11033 11033 inherit (darwin) libobjc; 11034 - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 11034 + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 11035 11035 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' 11036 11036 })); 11037 11037 spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; ··· 12618 12618 arrayfire = callPackage ../development/libraries/arrayfire {}; 12619 12619 12620 12620 arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ 12621 - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 12621 + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 12622 12622 stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' 12623 12623 }); 12624 12624 ··· 13757 13757 icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ 13758 13758 nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; 13759 13759 } // 13760 - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13760 + (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13761 13761 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' 13762 13762 })); 13763 13763 icu59 = callPackage ../development/libraries/icu/59.nix ({ 13764 13764 nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; 13765 - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13765 + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13766 13766 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' 13767 13767 })); 13768 13768 icu60 = callPackage ../development/libraries/icu/60.nix ({ 13769 13769 nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; 13770 - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13770 + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13771 13771 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' 13772 13772 })); 13773 13773 icu63 = callPackage ../development/libraries/icu/63.nix ({ 13774 13774 nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; 13775 - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13775 + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13776 13776 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' 13777 13777 })); 13778 13778 icu64 = callPackage ../development/libraries/icu/64.nix ({ 13779 13779 nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; 13780 - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13780 + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13781 13781 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' 13782 13782 })); 13783 13783 icu65 = callPackage ../development/libraries/icu/65.nix ({ 13784 13784 nativeBuildRoot = buildPackages.icu65.override { buildRootOnly = true; }; 13785 - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13785 + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13786 13786 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' 13787 13787 })); 13788 13788 icu66 = callPackage ../development/libraries/icu/66.nix ({ 13789 13789 nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; 13790 - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13790 + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13791 13791 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' 13792 13792 })); 13793 13793 icu67 = callPackage ../development/libraries/icu/67.nix ({ 13794 13794 nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; 13795 - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13795 + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { 13796 13796 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' 13797 13797 })); 13798 13798 ··· 17654 17654 17655 17655 pulseaudio = callPackage ../servers/pulseaudio ({ 17656 17656 inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; 17657 - } // stdenv.lib.optionalAttrs stdenv.isDarwin { 17657 + } // lib.optionalAttrs stdenv.isDarwin { 17658 17658 # Default autoreconfHook (2.70) fails on darwin, 17659 17659 # with "configure: error: *** Compiler does not support -std=gnu11" 17660 17660 autoreconfHook = buildPackages.autoreconfHook269; ··· 18840 18840 18841 18841 hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; 18842 18842 18843 - e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; 18843 + e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; 18844 18844 18845 - intel-speed-select = if stdenv.lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; 18845 + intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; 18846 18846 18847 18847 ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; 18848 18848 ··· 18923 18923 18924 18924 netatop = callPackage ../os-specific/linux/netatop { }; 18925 18925 18926 - oci-seccomp-bpf-hook = if stdenv.lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; 18926 + oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; 18927 18927 18928 18928 perf = callPackage ../os-specific/linux/kernel/perf.nix { }; 18929 18929 18930 - phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; 18930 + phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; 18931 18931 18932 18932 # Disable for kernels 4.15 and above due to compatibility issues 18933 - prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; 18933 + prl-tools = if lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; 18934 18934 18935 18935 sch_cake = callPackage ../os-specific/linux/sch_cake { }; 18936 18936 ··· 21158 21158 dablin = callPackage ../applications/radio/dablin { }; 21159 21159 21160 21160 darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { 21161 - configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; 21161 + configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; 21162 21162 }); 21163 21163 21164 21164 darktable = callPackage ../applications/graphics/darktable { ··· 27536 27536 ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; 27537 27537 27538 27538 isabelle = callPackage ../applications/science/logic/isabelle { 27539 - polyml = stdenv.lib.overrideDerivation polyml (attrs: { 27539 + polyml = lib.overrideDerivation polyml (attrs: { 27540 27540 configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; 27541 27541 }); 27542 27542

+41 -40

pkgs/top-level/dotnet-packages.nix

··· 1 1 { stdenv 2 + , lib 2 3 , pkgs 3 4 , buildDotnetPackage 4 5 , fetchurl ··· 363 364 echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim 364 365 ''; 365 366 366 - meta = with stdenv.lib; { 367 + meta = with lib; { 367 368 description = "An intermediate verification language"; 368 369 homepage = "https://github.com/boogie-org/boogie"; 369 370 longDescription = '' ··· 437 438 rm -f $out/lib/dotnet/${baseName}/dafny{,-server} 438 439 ''; 439 440 440 - meta = with stdenv.lib; { 441 + meta = with lib; { 441 442 description = "A programming language with built-in specification constructs"; 442 443 homepage = "https://research.microsoft.com/dafny"; 443 444 maintainers = with maintainers; [ layus ]; ··· 477 478 meta = { 478 479 description = "Excel-DNA is an independent project to integrate .NET into Excel"; 479 480 homepage = "https://excel-dna.net/"; 480 - license = stdenv.lib.licenses.mit; 481 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 482 - platforms = with stdenv.lib.platforms; linux; 481 + license = lib.licenses.mit; 482 + maintainers = with lib.maintainers; [ obadz ]; 483 + platforms = with lib.platforms; linux; 483 484 }; 484 485 }; 485 486 ··· 506 507 meta = { 507 508 description = "This library implements helper functions to assist and modify the Excel-DNA function registration"; 508 509 homepage = "https://github.com/Excel-DNA/Registration"; 509 - license = stdenv.lib.licenses.mit; 510 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 511 - platforms = with stdenv.lib.platforms; linux; 510 + license = lib.licenses.mit; 511 + maintainers = with lib.maintainers; [ obadz ]; 512 + platforms = with lib.platforms; linux; 512 513 }; 513 514 }; 514 515 ··· 540 541 meta = { 541 542 description = "ExtCore is an extended core library for F#"; 542 543 homepage = "https://github.com/jack-pappas/ExtCore"; 543 - license = stdenv.lib.licenses.asl20; 544 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 545 - platforms = with stdenv.lib.platforms; linux; 544 + license = lib.licenses.asl20; 545 + maintainers = with lib.maintainers; [ obadz ]; 546 + platforms = with lib.platforms; linux; 546 547 broken = true; 547 548 }; 548 549 }; ··· 576 577 service for rich editing or 'intellisense' features for editors. 577 578 ''; 578 579 homepage = "https://github.com/fsharp/FSharp.AutoComplete"; 579 - license = stdenv.lib.licenses.asl20; 580 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 581 - platforms = with stdenv.lib.platforms; linux; 580 + license = lib.licenses.asl20; 581 + maintainers = with lib.maintainers; [ obadz ]; 582 + platforms = with lib.platforms; linux; 582 583 }; 583 584 }; 584 585 ··· 603 604 meta = { 604 605 description = "The F# compiler services package is a component derived from the F# compiler source code that exposes additional functionality for implementing F# language bindings"; 605 606 homepage = "https://fsharp.github.io/FSharp.Compiler.Service/"; 606 - license = stdenv.lib.licenses.asl20; 607 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 608 - platforms = with stdenv.lib.platforms; linux; 607 + license = lib.licenses.asl20; 608 + maintainers = with lib.maintainers; [ obadz ]; 609 + platforms = with lib.platforms; linux; 609 610 }; 610 611 }; 611 612 ··· 647 648 meta = { 648 649 description = "F# Data: Library for Data Access"; 649 650 homepage = "https://fsharp.github.io/FSharp.Data/"; 650 - license = stdenv.lib.licenses.asl20; 651 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 652 - platforms = with stdenv.lib.platforms; linux; 651 + license = lib.licenses.asl20; 652 + maintainers = with lib.maintainers; [ obadz ]; 653 + platforms = with lib.platforms; linux; 653 654 }; 654 655 }; 655 656 ··· 679 680 # meta = { 680 681 # description = "FSharpx.Extras is a collection of libraries and tools for use with F#"; 681 682 # homepage = "https://fsprojects.github.io/FSharpx.Extras/"; 682 - # license = stdenv.lib.licenses.asl20; 683 - # maintainers = with stdenv.lib.maintainers; [ obadz ]; 684 - # platforms = with stdenv.lib.platforms; linux; 683 + # license = lib.licenses.asl20; 684 + # maintainers = with lib.maintainers; [ obadz ]; 685 + # platforms = with lib.platforms; linux; 685 686 # }; 686 687 # }; 687 688 ··· 724 725 outputFiles = [ "GitVersionTree/bin/Release/*" ]; 725 726 exeFiles = [ "GitVersionTree.exe" ]; 726 727 727 - meta = with stdenv.lib; { 728 + meta = with lib; { 728 729 description = "A tool to help visualize git revisions and branches"; 729 730 homepage = "https://github.com/crc8/GitVersionTree"; 730 731 license = licenses.gpl2; ··· 751 752 meta = { 752 753 description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; 753 754 homepage = "https://numerics.mathdotnet.com/"; 754 - license = stdenv.lib.licenses.mit; 755 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 756 - platforms = with stdenv.lib.platforms; linux; 755 + license = lib.licenses.mit; 756 + maintainers = with lib.maintainers; [ obadz ]; 757 + platforms = with lib.platforms; linux; 757 758 }; 758 759 }; 759 760 ··· 785 786 A generic framework for creating extensible applications, 786 787 and for creating libraries which extend those applications. 787 788 ''; 788 - license = stdenv.lib.licenses.mit; 789 + license = lib.licenses.mit; 789 790 }; 790 791 }; 791 792 ··· 840 841 # meta = { 841 842 # description = "F# addin for MonoDevelop 5.9"; 842 843 # homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9"; 843 - # license = stdenv.lib.licenses.asl20; 844 - # maintainers = with stdenv.lib.maintainers; [ obadz ]; 845 - # platforms = with stdenv.lib.platforms; linux; 844 + # license = lib.licenses.asl20; 845 + # maintainers = with lib.maintainers; [ obadz ]; 846 + # platforms = with lib.platforms; linux; 846 847 # }; 847 848 # }; 848 849 ··· 872 873 meta = { 873 874 description = "A callback-based program option parser for C#"; 874 875 homepage = "http://www.ndesk.org/Options"; 875 - license = stdenv.lib.licenses.mit; 876 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 877 - platforms = with stdenv.lib.platforms; linux; 876 + license = lib.licenses.mit; 877 + maintainers = with lib.maintainers; [ obadz ]; 878 + platforms = with lib.platforms; linux; 878 879 }; 879 880 }; 880 881 ··· 939 940 meta = { 940 941 description = "A command-line tool for manipulating F# project files"; 941 942 homepage = "https://github.com/kjnilsson/projekt"; 942 - license = stdenv.lib.licenses.mit; 943 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 944 - platforms = with stdenv.lib.platforms; linux; 943 + license = lib.licenses.mit; 944 + maintainers = with lib.maintainers; [ obadz ]; 945 + platforms = with lib.platforms; linux; 945 946 }; 946 947 }; 947 948 ··· 967 968 meta = { 968 969 description = "A declarative CLI argument/XML configuration parser for F# applications"; 969 970 homepage = "https://nessos.github.io/UnionArgParser/"; 970 - license = stdenv.lib.licenses.mit; 971 - maintainers = with stdenv.lib.maintainers; [ obadz ]; 972 - platforms = with stdenv.lib.platforms; linux; 971 + license = lib.licenses.mit; 972 + maintainers = with lib.maintainers; [ obadz ]; 973 + platforms = with lib.platforms; linux; 973 974 }; 974 975 }; 975 976

+1 -1

pkgs/top-level/emscripten-packages.nix

··· 178 178 echo "================= /testing zlib using node =================" 179 179 ''; 180 180 181 - postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' 181 + postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' 182 182 substituteInPlace configure \ 183 183 --replace '/usr/bin/libtool' 'ar' \ 184 184 --replace 'AR="libtool"' 'AR="ar"' \

+7 -7

pkgs/top-level/haxe-packages.nix

··· 1 - { stdenv, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: 1 + { stdenv, lib, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: 2 2 3 3 let 4 4 self = haxePackages; 5 5 haxePackages = with self; { 6 6 7 - withCommas = stdenv.lib.replaceChars ["."] [","]; 7 + withCommas = lib.replaceChars ["."] [","]; 8 8 9 9 # simulate "haxelib dev $libname ." 10 10 simulateHaxelibDev = libname: '' ··· 53 53 54 54 meta = { 55 55 homepage = "http://lib.haxe.org/p/${libname}"; 56 - license = stdenv.lib.licenses.bsd2; 57 - platforms = stdenv.lib.platforms.all; 56 + license = lib.licenses.bsd2; 57 + platforms = lib.platforms.all; 58 58 description = throw "please write meta.description"; 59 59 } // attrs.meta; 60 60 }); ··· 67 67 for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do 68 68 chmod +w "$f" 69 69 patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true 70 - patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true 70 + patchelf --set-rpath ${ lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true 71 71 done 72 72 ''; 73 73 meta.description = "Runtime support library for the Haxe C++ backend"; ··· 110 110 installPhase = installLibHaxe { inherit libname version; }; 111 111 meta = { 112 112 homepage = "http://lib.haxe.org/p/${libname}"; 113 - license = stdenv.lib.licenses.bsd2; 114 - platforms = stdenv.lib.platforms.all; 113 + license = lib.licenses.bsd2; 114 + platforms = lib.platforms.all; 115 115 description = "Extern definitions for node.js 6.9"; 116 116 }; 117 117 };

+3 -3

pkgs/top-level/lua-packages.nix

··· 32 32 33 33 callPackage = pkgs.newScope self; 34 34 35 - requiredLuaModules = drvs: with stdenv.lib; let 35 + requiredLuaModules = drvs: with lib; let 36 36 modules = filter hasLuaModule drvs; 37 37 in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); 38 38 ··· 123 123 ); 124 124 ''; 125 125 126 - meta = with stdenv.lib; { 126 + meta = with lib; { 127 127 description = "Lightweight UNIX I/O and POSIX binding for Lua"; 128 128 homepage = "https://www.gitano.org.uk/luxio/"; 129 129 license = licenses.mit; ··· 151 151 printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua 152 152 ''; 153 153 154 - meta = with stdenv.lib; { 154 + meta = with lib; { 155 155 description = "A modular widget library for the awesome window manager"; 156 156 homepage = "https://github.com/Mic92/vicious"; 157 157 license = licenses.gpl2;

+3 -2

pkgs/top-level/python-packages.nix

··· 8 8 9 9 { pkgs 10 10 , stdenv 11 + , lib 11 12 , python 12 13 }: 13 14 14 - with pkgs.lib; 15 + with lib; 15 16 16 17 self: 17 18 ··· 64 65 65 66 # Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations 66 67 # providing Python modules. 67 - makePythonPath = drvs: stdenv.lib.makeSearchPath python.sitePackages (requiredPythonModules drvs); 68 + makePythonPath = drvs: lib.makeSearchPath python.sitePackages (requiredPythonModules drvs); 68 69 69 70 removePythonPrefix = name: 70 71 removePrefix namePrefix name;