commit 6d2857a311a6586860cb0c70778b035c92d9c88c · pyrox.dev/nixpkgs

+2 -2

lib/attrsets.nix

···

       3
        
       

     

       4
        
       let

     

       5
        
         inherit (builtins) head tail length;

     

       6
       -
         inherit (lib.trivial) and or;

     

       7
        
         inherit (lib.strings) concatStringsSep;

     

       8
       -
         inherit (lib.lists) fold concatMap concatLists all deepSeqList;

     

       9
        
       in

     

       10
        
       

     

       11
        
       rec {

···

       3
        
       

     

       4
        
       let

     

       5
        
         inherit (builtins) head tail length;

     

       6
       +
         inherit (lib.trivial) and;

     

       7
        
         inherit (lib.strings) concatStringsSep;

     

       8
       +
         inherit (lib.lists) fold concatMap concatLists;

     

       9
        
       in

     

       10
        
       

     

       11
        
       rec {

+1 -1

lib/composable-derivation.nix

···

       1
        
       {lib, pkgs}:

     

       2
       -
       let inherit (lib) nv nvs; in

     

       3
        
       {

     

       4
        
       

     

       5
        
         # composableDerivation basically mixes these features:

···

       1
        
       {lib, pkgs}:

     

       2
       +
       let inherit (lib) nvs; in

     

       3
        
       {

     

       4
        
       

     

       5
        
         # composableDerivation basically mixes these features:

-5

lib/customisation.nix

···

       1
        
       { lib }:

     

       2
       -
       let

     

       3
       -
       

     

       4
       -
         inherit (builtins) attrNames;

     

       5
       -
       

     

       6
       -
       in

     

       7
        
       

     

       8
        
       rec {

     

       9

+1 -1

lib/types.nix

···

       8
        
       with lib.strings;

     

       9
        
       let

     

       10
        
       

     

       11
       -
         inherit (lib.modules) mergeDefinitions filterOverrides;

     

       12
        
         outer_types =

     

       13
        
       rec {

     

       14
        
         isType = type: x: (x._type or "") == type;

···

       8
        
       with lib.strings;

     

       9
        
       let

     

       10
        
       

     

       11
       +
         inherit (lib.modules) mergeDefinitions;

     

       12
        
         outer_types =

     

       13
        
       rec {

     

       14
        
         isType = type: x: (x._type or "") == type;

+1 -1

nixos/modules/programs/tmux.nix

···

       1
        
       { config, pkgs, lib, ... }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         inherit (lib) mkOption mkEnableOption mkIf mkMerge types;

     

       5
        
       

     

       6
        
         cfg = config.programs.tmux;

     

       7

···

       1
        
       { config, pkgs, lib, ... }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         inherit (lib) mkOption mkIf types;

     

       5
        
       

     

       6
        
         cfg = config.programs.tmux;

     

       7

-2

nixos/modules/security/pam_usb.nix

···

       4
        
       

     

       5
        
       let

     

       6
        
       

     

       7
       -
         inherit (pkgs) pam_usb;

     

       8
       -
       

     

       9
        
         cfg = config.security.pam.usb;

     

       10
        
       

     

       11
        
         anyUsbAuth = any (attrByPath ["usbAuth"] false) (attrValues config.security.pam.services);

···

       4
        
       

     

       5
        
       let

     

       6
        
       

     

       0
        
       
     

       0
        
       
     

       7
        
         cfg = config.security.pam.usb;

     

       8
        
       

     

       9
        
         anyUsbAuth = any (attrByPath ["usbAuth"] false) (attrValues config.security.pam.services);

-2

nixos/modules/services/hardware/udev.nix

···

       4
        
       

     

       5
        
       let

     

       6
        
       

     

       7
       -
         inherit (pkgs) stdenv writeText procps;

     

       8
       -
       

     

       9
        
         udev = config.systemd.package;

     

       10
        
       

     

       11
        
         cfg = config.services.udev;

···

       4
        
       

     

       5
        
       let

     

       6
        
       

     

       0
        
       
     

       0
        
       
     

       7
        
         udev = config.systemd.package;

     

       8
        
       

     

       9
        
         cfg = config.services.udev;

+1 -1

nixos/modules/services/monitoring/uptime.nix

···

       1
        
       { config, pkgs, lib, ... }:

     

       2
        
       let

     

       3
       -
         inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional;

     

       4
        
       

     

       5
        
         cfg = config.services.uptime;

     

       6

···

       1
        
       { config, pkgs, lib, ... }:

     

       2
        
       let

     

       3
       +
         inherit (lib) mkOption mkEnableOption mkIf mkMerge types optional;

     

       4
        
       

     

       5
        
         cfg = config.services.uptime;

     

       6

+1 -1

nixos/modules/services/network-filesystems/openafs/lib.nix

···

       1
        
       { config, lib, pkgs, ...}:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         inherit (lib) concatStringsSep getBin mkOption types;

     

       5
        
       

     

       6
        
       in rec {

     

       7

···

       1
        
       { config, lib, pkgs, ...}:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         inherit (lib) concatStringsSep mkOption types;

     

       5
        
       

     

       6
        
       in rec {

     

       7

+1 -1

nixos/modules/services/network-filesystems/openafs/server.nix

···

       4
        
       with import ./lib.nix { inherit config lib pkgs; };

     

       5
        
       

     

       6
        
       let

     

       7
       -
         inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types;

     

       8
        
       

     

       9
        
         bosConfig = pkgs.writeText "BosConfig" (''

     

       10
        
           restrictmode 1

···

       4
        
       with import ./lib.nix { inherit config lib pkgs; };

     

       5
        
       

     

       6
        
       let

     

       7
       +
         inherit (lib) concatStringsSep mkIf mkOption optionalString types;

     

       8
        
       

     

       9
        
         bosConfig = pkgs.writeText "BosConfig" (''

     

       10
        
           restrictmode 1

-2

nixos/modules/services/networking/chrony.nix

···

       4
        
       

     

       5
        
       let

     

       6
        
       

     

       7
       -
         inherit (pkgs) chrony;

     

       8
       -
       

     

       9
        
         stateDir = "/var/lib/chrony";

     

       10
        
       

     

       11
        
         keyFile = "/etc/chrony.keys";

···

       4
        
       

     

       5
        
       let

     

       6
        
       

     

       0
        
       
     

       0
        
       
     

       7
        
         stateDir = "/var/lib/chrony";

     

       8
        
       

     

       9
        
         keyFile = "/etc/chrony.keys";

+1 -1

nixos/modules/services/system/kerberos.nix

···

       2
        
       

     

       3
        
       let

     

       4
        
       

     

       5
       -
         inherit (lib) mkOption mkIf singleton;

     

       6
        
       

     

       7
        
         inherit (pkgs) heimdalFull;

     

       8

···

       2
        
       

     

       3
        
       let

     

       4
        
       

     

       5
       +
         inherit (lib) mkOption mkIf;

     

       6
        
       

     

       7
        
         inherit (pkgs) heimdalFull;

     

       8

-2

nixos/modules/services/system/nscd.nix

···

       7
        
         nssModulesPath = config.system.nssModules.path;

     

       8
        
         cfg = config.services.nscd;

     

       9
        
       

     

       10
       -
         inherit (lib) singleton;

     

       11
       -
       

     

       12
        
       in

     

       13
        
       

     

       14
        
       {

···

       7
        
         nssModulesPath = config.system.nssModules.path;

     

       8
        
         cfg = config.services.nscd;

     

       9
        
       

     

       0
        
       
     

       0
        
       
     

       10
        
       in

     

       11
        
       

     

       12
        
       {

+1 -1

nixos/modules/services/ttys/kmscon.nix

···

       1
        
       { config, pkgs, lib, ... }:

     

       2
        
       let

     

       3
       -
         inherit (lib) mkOption types mkIf optionalString;

     

       4
        
       

     

       5
        
         cfg = config.services.kmscon;

     

       6

···

       1
        
       { config, pkgs, lib, ... }:

     

       2
        
       let

     

       3
       +
         inherit (lib) mkOption types mkIf;

     

       4
        
       

     

       5
        
         cfg = config.services.kmscon;

     

       6

+1 -1

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

       7
        
         xcfg = config.services.xserver;

     

       8
        
         cfg = xcfg.desktopManager.plasma5;

     

       9
        
       

     

       10
       -
         inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;

     

       11
        
       

     

       12
        
       in

     

       13

···

       7
        
         xcfg = config.services.xserver;

     

       8
        
         cfg = xcfg.desktopManager.plasma5;

     

       9
        
       

     

       10
       +
         inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5;

     

       11
        
       

     

       12
        
       in

     

       13

+1 -1

nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix

···

       8
        
         ldmcfg = dmcfg.lightdm;

     

       9
        
         cfg = ldmcfg.greeters.gtk;

     

       10
        
       

     

       11
       -
         inherit (pkgs) stdenv lightdm writeScript writeText;

     

       12
        
       

     

       13
        
         theme = cfg.theme.package;

     

       14
        
         icons = cfg.iconTheme.package;

···

       8
        
         ldmcfg = dmcfg.lightdm;

     

       9
        
         cfg = ldmcfg.greeters.gtk;

     

       10
        
       

     

       11
       +
         inherit (pkgs) writeText;

     

       12
        
       

     

       13
        
         theme = cfg.theme.package;

     

       14
        
         icons = cfg.iconTheme.package;

+1 -1

nixos/modules/services/x11/display-managers/lightdm.nix

···

       13
        
         wmDefault = xcfg.windowManager.default;

     

       14
        
         hasDefaultUserSession = dmDefault != "none" || wmDefault != "none";

     

       15
        
       

     

       16
       -
         inherit (pkgs) stdenv lightdm writeScript writeText;

     

       17
        
       

     

       18
        
         # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup

     

       19
        
         xserverWrapper = writeScript "xserver-wrapper"

···

       13
        
         wmDefault = xcfg.windowManager.default;

     

       14
        
         hasDefaultUserSession = dmDefault != "none" || wmDefault != "none";

     

       15
        
       

     

       16
       +
         inherit (pkgs) lightdm writeScript writeText;

     

       17
        
       

     

       18
        
         # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup

     

       19
        
         xserverWrapper = writeScript "xserver-wrapper"

-1

nixos/modules/services/x11/window-managers/openbox.nix

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       5
       -
         inherit (lib) mkOption mkIf;

     

       6
        
         cfg = config.services.xserver.windowManager.openbox;

     

       7
        
       in

     

       8

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       0
        
       
     

       5
        
         cfg = config.services.xserver.windowManager.openbox;

     

       6
        
       in

     

       7

-1

nixos/modules/services/x11/window-managers/wmii.nix

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       5
       -
         inherit (lib) mkOption mkIf singleton;

     

       6
        
         cfg = config.services.xserver.windowManager.wmii;

     

       7
        
         wmii = pkgs.wmii_hg;

     

       8
        
       in

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       0
        
       
     

       5
        
         cfg = config.services.xserver.windowManager.wmii;

     

       6
        
         wmii = pkgs.wmii_hg;

     

       7
        
       in

+1 -1

pkgs/applications/audio/sonata/default.nix

···

       2
        
       , python3Packages, gnome3, gtk3, gobjectIntrospection}:

     

       3
        
       

     

       4
        
       let

     

       5
       -
         inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2;

     

       6
        
       in buildPythonApplication rec {

     

       7
        
         pname = "sonata";

     

       8
        
         version = "1.7b1";

···

       2
        
       , python3Packages, gnome3, gtk3, gobjectIntrospection}:

     

       3
        
       

     

       4
        
       let

     

       5
       +
         inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;

     

       6
        
       in buildPythonApplication rec {

     

       7
        
         pname = "sonata";

     

       8
        
         version = "1.7b1";

-2

pkgs/applications/networking/browsers/chromium/default.nix

···

       64
        
       

     

       65
        
         version = chromium.browser.version;

     

       66
        
       

     

       67
       -
         inherit (stdenv.lib) versionAtLeast;

     

       68
       -
       

     

       69
        
       in stdenv.mkDerivation {

     

       70
        
         name = "chromium${suffix}-${version}";

     

       71
        
         inherit version;

···

       64
        
       

     

       65
        
         version = chromium.browser.version;

     

       66
        
       

     

       0
        
       
     

       0
        
       
     

       67
        
       in stdenv.mkDerivation {

     

       68
        
         name = "chromium${suffix}-${version}";

     

       69
        
         inherit version;

+1 -2

pkgs/applications/networking/instant-messengers/zoom-us/default.nix

···

       11
        
       assert pulseaudioSupport -> libpulseaudio != null;

     

       12
        
       

     

       13
        
       let

     

       14
       -
         inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath

     

       15
       -
           makeSearchPath optional optionalString;

     

       16
        
       

     

       17
        
         version = "2.2.128200.0702";

     

       18
        
         srcs = {

···

       11
        
       assert pulseaudioSupport -> libpulseaudio != null;

     

       12
        
       

     

       13
        
       let

     

       14
       +
         inherit (stdenv.lib) concatStringsSep makeBinPath optional;

     

       0
        
       
     

       15
        
       

     

       16
        
         version = "2.2.128200.0702";

     

       17
        
         srcs = {

+1 -1

pkgs/applications/networking/irc/weechat/default.nix

···

       15
        
       , runCommand }:

     

       16
        
       

     

       17
        
       let

     

       18
       -
         inherit (pythonPackages) python pycrypto pync;

     

       19
        
         plugins = [

     

       20
        
           { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }

     

       21
        
           { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }

···

       15
        
       , runCommand }:

     

       16
        
       

     

       17
        
       let

     

       18
       +
         inherit (pythonPackages) python;

     

       19
        
         plugins = [

     

       20
        
           { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }

     

       21
        
           { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }

+1 -2

pkgs/applications/science/logic/acgtk/default.nix

···

       4
        
         installExamples ? true,

     

       5
        
         installEmacsMode ? true }:

     

       6
        
       

     

       7
       -
       let inherit (stdenv.lib) versionAtLeast

     

       8
       -
                                optionals optionalString; in

     

       9
        
       

     

       10
        
       let inherit (ocamlPackages) ocaml camlp4; in

     

       11

···

       4
        
         installExamples ? true,

     

       5
        
         installEmacsMode ? true }:

     

       6
        
       

     

       7
       +
       let inherit (stdenv.lib) versionAtLeast optionalString; in

     

       0
        
       
     

       8
        
       

     

       9
        
       let inherit (ocamlPackages) ocaml camlp4; in

     

       10

+1 -1

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

···

       3
        
       }:

     

       4
        
       

     

       5
        
       let

     

       6
       -
         inherit (nixpkgs) fetchpatch fetchurl symlinkJoin fetchFromGitHub callPackage nodePackages_8_x;

     

       7
        
       

     

       8
        
         # https://trac.sagemath.org/ticket/15980 for tracking of python3 support

     

       9
        
         python = nixpkgs.python2.override {

···

       3
        
       }:

     

       4
        
       

     

       5
        
       let

     

       6
       +
         inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x;

     

       7
        
       

     

       8
        
         # https://trac.sagemath.org/ticket/15980 for tracking of python3 support

     

       9
        
         python = nixpkgs.python2.override {

+1 -1

pkgs/applications/version-management/git-and-tools/git-cola/default.nix

···

       1
        
       { stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;

     

       5
        
       in buildPythonApplication rec {

     

       6
        
         name = "git-cola-${version}";

     

       7
        
         version = "3.1";

···

       1
        
       { stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;

     

       5
        
       in buildPythonApplication rec {

     

       6
        
         name = "git-cola-${version}";

     

       7
        
         version = "3.1";

+1 -1

pkgs/build-support/build-maven.nix

···

       17
        
           ${lib.concatStrings (map (dep: let

     

       18
        
             inherit (dep)

     

       19
        
               url sha1 groupId artifactId version

     

       20
       -
               authenticated metadata extension repository-id;

     

       21
        
       

     

       22
        
             versionDir = dep.unresolved-version or version;

     

       23

···

       17
        
           ${lib.concatStrings (map (dep: let

     

       18
        
             inherit (dep)

     

       19
        
               url sha1 groupId artifactId version

     

       20
       +
               authenticated metadata repository-id;

     

       21
        
       

     

       22
        
             versionDir = dep.unresolved-version or version;

     

       23

+1 -1

pkgs/development/beam-modules/default.nix

···

       1
        
       { stdenv, pkgs, erlang }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         inherit (stdenv.lib) getVersion versionAtLeast makeExtensible;

     

       5
        
       

     

       6
        
         lib = pkgs.callPackage ./lib.nix {};

     

       7

···

       1
        
       { stdenv, pkgs, erlang }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         inherit (stdenv.lib) makeExtensible;

     

       5
        
       

     

       6
        
         lib = pkgs.callPackage ./lib.nix {};

     

       7

-2

pkgs/development/beam-modules/lib.nix

···

       49
        
         */

     

       50
        
         callElixir = drv: args:

     

       51
        
           let

     

       52
       -
             inherit (stdenv.lib) versionAtLeast;

     

       53
        
             builder = callPackage ../interpreters/elixir/generic-builder.nix args;

     

       54
        
           in

     

       55
        
             callPackage drv {

     
···

       71
        
         */

     

       72
        
         callLFE = drv: args:

     

       73
        
           let

     

       74
       -
             inherit (stdenv.lib) versionAtLeast;

     

       75
        
             builder = callPackage ../interpreters/lfe/generic-builder.nix args;

     

       76
        
           in

     

       77
        
             callPackage drv {

···

       49
        
         */

     

       50
        
         callElixir = drv: args:

     

       51
        
           let

     

       0
        
       
     

       52
        
             builder = callPackage ../interpreters/elixir/generic-builder.nix args;

     

       53
        
           in

     

       54
        
             callPackage drv {

     
···

       70
        
         */

     

       71
        
         callLFE = drv: args:

     

       72
        
           let

     

       0
        
       
     

       73
        
             builder = callPackage ../interpreters/lfe/generic-builder.nix args;

     

       74
        
           in

     

       75
        
             callPackage drv {

+1 -1

pkgs/development/compilers/go/1.10.nix

···

       6
        
       

     

       7
        
       let

     

       8
        
       

     

       9
       -
         inherit (stdenv.lib) optional optionals optionalString;

     

       10
        
       

     

       11
        
         clangHack = writeScriptBin "clang" ''

     

       12
        
           #!${stdenv.shell}

···

       6
        
       

     

       7
        
       let

     

       8
        
       

     

       9
       +
         inherit (stdenv.lib) optionals optionalString;

     

       10
        
       

     

       11
        
         clangHack = writeScriptBin "clang" ''

     

       12
        
           #!${stdenv.shell}

+1 -1

pkgs/development/compilers/go/1.9.nix

···

       6
        
       

     

       7
        
       let

     

       8
        
       

     

       9
       -
         inherit (stdenv.lib) optional optionals optionalString;

     

       10
        
       

     

       11
        
         clangHack = writeScriptBin "clang" ''

     

       12
        
           #!${stdenv.shell}

···

       6
        
       

     

       7
        
       let

     

       8
        
       

     

       9
       +
         inherit (stdenv.lib) optionals optionalString;

     

       10
        
       

     

       11
        
         clangHack = writeScriptBin "clang" ''

     

       12
        
           #!${stdenv.shell}

+1 -1

pkgs/development/compilers/ocaml/ber-metaocaml-104.nix

···

       2
        
       

     

       3
        
       let

     

       4
        
          useX11 = stdenv.isi686 || stdenv.isx86_64;

     

       5
       -
          inherit (stdenv.lib) optionals optionalString;

     

       6
        
       in

     

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

···

       2
        
       

     

       3
        
       let

     

       4
        
          useX11 = stdenv.isi686 || stdenv.isx86_64;

     

       5
       +
          inherit (stdenv.lib) optionals;

     

       6
        
       in

     

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

+1 -2

pkgs/development/compilers/rust/binaryBuild.nix

···

       6
        
       }:

     

       7
        
       

     

       8
        
       let

     

       9
       -
         inherit (stdenv.lib) getLib optionalString;

     

       10
       -
         inherit (darwin) libiconv;

     

       11
        
         inherit (darwin.apple_sdk.frameworks) Security;

     

       12
        
       

     

       13
        
         bootstrapping = versionType == "bootstrap";

···

       6
        
       }:

     

       7
        
       

     

       8
        
       let

     

       9
       +
         inherit (stdenv.lib) optionalString;

     

       0
        
       
     

       10
        
         inherit (darwin.apple_sdk.frameworks) Security;

     

       11
        
       

     

       12
        
         bootstrapping = versionType == "bootstrap";

+1 -1

pkgs/development/haskell-modules/default.nix

···

       11
        
       let

     

       12
        
       

     

       13
        
         inherit (lib) extends makeExtensible;

     

       14
       -
         inherit (haskellLib) overrideCabal makePackageSet;

     

       15
        
       

     

       16
        
         haskellPackages = pkgs.callPackage makePackageSet {

     

       17
        
           package-set = initialPackages;

···

       11
        
       let

     

       12
        
       

     

       13
        
         inherit (lib) extends makeExtensible;

     

       14
       +
         inherit (haskellLib) makePackageSet;

     

       15
        
       

     

       16
        
         haskellPackages = pkgs.callPackage makePackageSet {

     

       17
        
           package-set = initialPackages;

-1

pkgs/development/haskell-modules/hoogle.nix

···

       28
        
       }:

     

       29
        
       

     

       30
        
       let

     

       31
       -
         inherit (stdenv.lib) optional;

     

       32
        
         wrapper = ./hoogle-local-wrapper.sh;

     

       33
        
         isGhcjs = ghc.isGhcjs or false;

     

       34
        
         opts = lib.optionalString;

···

       28
        
       }:

     

       29
        
       

     

       30
        
       let

     

       0
        
       
     

       31
        
         wrapper = ./hoogle-local-wrapper.sh;

     

       32
        
         isGhcjs = ghc.isGhcjs or false;

     

       33
        
         opts = lib.optionalString;

+1 -1

pkgs/development/libraries/blitz/default.nix

···

       19
        
       assert enableSerialization -> boost != null;

     

       20
        
       

     

       21
        
       let

     

       22
       -
         inherit (stdenv.lib) optional optionals optionalString;

     

       23
        
       in

     

       24
        
       

     

       25
        
       stdenv.mkDerivation rec {

···

       19
        
       assert enableSerialization -> boost != null;

     

       20
        
       

     

       21
        
       let

     

       22
       +
         inherit (stdenv.lib) optional optionals;

     

       23
        
       in

     

       24
        
       

     

       25
        
       stdenv.mkDerivation rec {

+1 -1

pkgs/development/libraries/ffmpeg/generic.nix

···

       42
        
        */

     

       43
        
       

     

       44
        
       let

     

       45
       -
         inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32;

     

       46
        
         inherit (stdenv.lib) optional optionals enableFeature;

     

       47
        
       

     

       48
        
         cmpVer = builtins.compareVersions;

···

       42
        
        */

     

       43
        
       

     

       44
        
       let

     

       45
       +
         inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32;

     

       46
        
         inherit (stdenv.lib) optional optionals enableFeature;

     

       47
        
       

     

       48
        
         cmpVer = builtins.compareVersions;

+1 -1

pkgs/development/libraries/freetype/default.nix

···

       10
        
       }:

     

       11
        
       

     

       12
        
       let

     

       13
       -
         inherit (stdenv.lib) optional optionals optionalString;

     

       14
        
       

     

       15
        
       in stdenv.mkDerivation rec {

     

       16
        
         name = "freetype-${version}";

···

       10
        
       }:

     

       11
        
       

     

       12
        
       let

     

       13
       +
         inherit (stdenv.lib) optional optionalString;

     

       14
        
       

     

       15
        
       in stdenv.mkDerivation rec {

     

       16
        
         name = "freetype-${version}";

+1 -1

pkgs/development/libraries/gstreamer/good/default.nix

···

       12
        
       assert gtkSupport -> gtk3 != null;

     

       13
        
       

     

       14
        
       let

     

       15
       -
         inherit (stdenv.lib) optional optionals optionalString;

     

       16
        
       in

     

       17
        
       stdenv.mkDerivation rec {

     

       18
        
         name = "gst-plugins-good-1.14.0";

···

       12
        
       assert gtkSupport -> gtk3 != null;

     

       13
        
       

     

       14
        
       let

     

       15
       +
         inherit (stdenv.lib) optional optionals;

     

       16
        
       in

     

       17
        
       stdenv.mkDerivation rec {

     

       18
        
         name = "gst-plugins-good-1.14.0";

+1 -1

pkgs/development/libraries/libav/default.nix

···

       18
        
       

     

       19
        
       assert faacSupport -> enableUnfree;

     

       20
        
       

     

       21
       -
       let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in

     

       22
        
       

     

       23
        
       /* ToDo:

     

       24
        
           - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools

···

       18
        
       

     

       19
        
       assert faacSupport -> enableUnfree;

     

       20
        
       

     

       21
       +
       let inherit (stdenv.lib) optional hasPrefix enableFeature; in

     

       22
        
       

     

       23
        
       /* ToDo:

     

       24
        
           - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools

-2

pkgs/development/libraries/libgsf/default.nix

···

       1
        
       { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2

     

       2
        
       , python, perl, gdk_pixbuf, libiconv, libintl }:

     

       3
        
       

     

       4
       -
       let inherit (stdenv.lib) optionals; in

     

       5
       -
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "libgsf-1.14.42";

     

       8

···

       1
        
       { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2

     

       2
        
       , python, perl, gdk_pixbuf, libiconv, libintl }:

     

       3
        
       

     

       0
        
       
     

       0
        
       
     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         name = "libgsf-1.14.42";

     

       6

+1 -1

pkgs/development/libraries/libvpx/default.nix

···

       41
        
       }:

     

       42
        
       

     

       43
        
       let

     

       44
       -
         inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;

     

       45
        
         inherit (stdenv.lib) enableFeature optional optionals;

     

       46
        
       in

     

       47

···

       41
        
       }:

     

       42
        
       

     

       43
        
       let

     

       44
       +
         inherit (stdenv) is64bit isMips isDarwin isCygwin;

     

       45
        
         inherit (stdenv.lib) enableFeature optional optionals;

     

       46
        
       in

     

       47

-3

pkgs/development/libraries/opendbx/default.nix

···

       1
        
       { stdenv, fetchurl, readline, mysql, postgresql, sqlite }:

     

       2
        
       

     

       3
       -
       let

     

       4
       -
         inherit (stdenv.lib) getDev getLib;

     

       5
       -
       in

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "opendbx-1.4.6";

     

       8

···

       1
        
       { stdenv, fetchurl, readline, mysql, postgresql, sqlite }:

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "opendbx-1.4.6";

     

       5

+1 -2

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

···

       11
        
         atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }

     

       12
        
                            else null;

     

       13
        
         usedLibExtension = if shared then ".so" else ".a";

     

       14
       -
         inherit (stdenv.lib) optional optionals concatStringsSep;

     

       15
       -
         inherit (builtins) hasAttr attrNames;

     

       16
        
         version = "3.8.0";

     

       17
        
       in

     

       18

···

       11
        
         atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }

     

       12
        
                            else null;

     

       13
        
         usedLibExtension = if shared then ".so" else ".a";

     

       14
       +
         inherit (stdenv.lib) optional optionals;

     

       0
        
       
     

       15
        
         version = "3.8.0";

     

       16
        
       in

     

       17

+1 -1

pkgs/development/python-modules/pandas/0.17.1.nix

···

       23
        
       }:

     

       24
        
       

     

       25
        
       let

     

       26
       -
         inherit (stdenv.lib) optional optionalString concatStringsSep;

     

       27
        
         inherit (stdenv) isDarwin;

     

       28
        
       in buildPythonPackage rec {

     

       29
        
         pname = "pandas";

···

       23
        
       }:

     

       24
        
       

     

       25
        
       let

     

       26
       +
         inherit (stdenv.lib) optional optionalString;

     

       27
        
         inherit (stdenv) isDarwin;

     

       28
        
       in buildPythonPackage rec {

     

       29
        
         pname = "pandas";

+1 -1

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

···

       24
        
       }:

     

       25
        
       

     

       26
        
       let

     

       27
       -
         inherit (stdenv.lib) optional optionals optionalString concatStringsSep;

     

       28
        
         inherit (stdenv) isDarwin;

     

       29
        
       

     

       30
        
       in buildPythonPackage rec {

···

       24
        
       }:

     

       25
        
       

     

       26
        
       let

     

       27
       +
         inherit (stdenv.lib) optional optionals optionalString;

     

       28
        
         inherit (stdenv) isDarwin;

     

       29
        
       

     

       30
        
       in buildPythonPackage rec {

+1 -1

pkgs/development/tools/misc/binutils/default.nix

···

       10
        
         # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3

     

       11
        
         version = "2.30";

     

       12
        
         basename = "binutils-${version}";

     

       13
       -
         inherit (stdenv.lib) optional optionals optionalString;

     

       14
        
         # The targetPrefix prepended to binary names to allow multiple binuntils on the

     

       15
        
         # PATH to both be usable.

     

       16
        
         targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";

···

       10
        
         # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3

     

       11
        
         version = "2.30";

     

       12
        
         basename = "binutils-${version}";

     

       13
       +
         inherit (stdenv.lib) optionals optionalString;

     

       14
        
         # The targetPrefix prepended to binary names to allow multiple binuntils on the

     

       15
        
         # PATH to both be usable.

     

       16
        
         targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";

+1 -1

pkgs/development/tools/misc/gdbgui/requirements.nix

···

       11
        
       let

     

       12
        
       

     

       13
        
         inherit (pkgs) makeWrapper;

     

       14
       -
         inherit (pkgs.stdenv.lib) fix' extends inNixShell;

     

       15
        
       

     

       16
        
         pythonPackages =

     

       17
        
         import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" {

···

       11
        
       let

     

       12
        
       

     

       13
        
         inherit (pkgs) makeWrapper;

     

       14
       +
         inherit (pkgs.stdenv.lib) fix' extends;

     

       15
        
       

     

       16
        
         pythonPackages =

     

       17
        
         import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" {

-2

pkgs/development/tools/xcbuild/wrapper.nix

···

       7
        
       

     

       8
        
       let

     

       9
        
       

     

       10
       -
         inherit (lib) toLower;

     

       11
       -
       

     

       12
        
         toolchainName = "com.apple.dt.toolchain.XcodeDefault";

     

       13
        
         sdkName = "${xcodePlatform}${sdkVer}";

     

       14

···

       7
        
       

     

       8
        
       let

     

       9
        
       

     

       0
        
       
     

       0
        
       
     

       10
        
         toolchainName = "com.apple.dt.toolchain.XcodeDefault";

     

       11
        
         sdkName = "${xcodePlatform}${sdkVer}";

     

       12

+1 -2

pkgs/misc/vim-plugins/default.nix

···

       14
        
       

     

       15
        
         _skim = skim;

     

       16
        
       

     

       17
       -
         inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin

     

       18
       -
           buildVimPluginFrom2Nix vimHelpTags;

     

       19
        
       

     

       20
        
       

     

       21
        
       # TL;DR

···

       14
        
       

     

       15
        
         _skim = skim;

     

       16
        
       

     

       17
       +
         inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;

     

       0
        
       
     

       18
        
       

     

       19
        
       

     

       20
        
       # TL;DR

+1 -2

pkgs/misc/vscode-extensions/default.nix

···

       1
        
       { stdenv, lib, fetchurl, callPackage, vscode-utils }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension

     

       5
       -
             extensionFromVscodeMarketplace;

     

       6
        
       in

     

       7
        
       #

     

       8
        
       # Unless there is a good reason not to, we attemp to use the same name as the

···

       1
        
       { stdenv, lib, fetchurl, callPackage, vscode-utils }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         inherit (vscode-utils) buildVscodeMarketplaceExtension;

     

       0
        
       
     

       5
        
       in

     

       6
        
       #

     

       7
        
       # Unless there is a good reason not to, we attemp to use the same name as the

-2

pkgs/servers/coturn/default.nix

···

       1
        
       { stdenv, fetchFromGitHub, openssl, libevent }:

     

       2
        
       

     

       3
       -
       let inherit (stdenv.lib) optional; in

     

       4
       -
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         name = "coturn-${version}";

     

       7
        
         version = "4.5.0.7";

···

       1
        
       { stdenv, fetchFromGitHub, openssl, libevent }:

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "coturn-${version}";

     

       5
        
         version = "4.5.0.7";

+1 -1

pkgs/servers/dns/knot-resolver/default.nix

···

       8
        
       

     

       9
        
       result = if extraFeatures then wrapped-full else unwrapped;

     

       10
        
       

     

       11
       -
       inherit (stdenv.lib) optional optionals optionalString concatStringsSep;

     

       12
        
       

     

       13
        
       unwrapped = stdenv.mkDerivation rec {

     

       14
        
         name = "knot-resolver-${version}";

···

       8
        
       

     

       9
        
       result = if extraFeatures then wrapped-full else unwrapped;

     

       10
        
       

     

       11
       +
       inherit (stdenv.lib) optional concatStringsSep;

     

       12
        
       

     

       13
        
       unwrapped = stdenv.mkDerivation rec {

     

       14
        
         name = "knot-resolver-${version}";

+1 -1

pkgs/stdenv/native/default.nix

···

       5
        
       assert crossSystem == null;

     

       6
        
       

     

       7
        
       let

     

       8
       -
         inherit (localSystem) system platform;

     

       9
        
       

     

       10
        
         shell =

     

       11
        
           if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"

···

       5
        
       assert crossSystem == null;

     

       6
        
       

     

       7
        
       let

     

       8
       +
         inherit (localSystem) system;

     

       9
        
       

     

       10
        
         shell =

     

       11
        
           if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"

+1 -1

pkgs/tools/X11/xpra/default.nix

···

       9
        
       with lib;

     

       10
        
       

     

       11
        
       let

     

       12
       -
         inherit (python2Packages) python cython buildPythonApplication;

     

       13
        
       in buildPythonApplication rec {

     

       14
        
         name = "xpra-${version}";

     

       15
        
         version = "2.3.2";

···

       9
        
       with lib;

     

       10
        
       

     

       11
        
       let

     

       12
       +
         inherit (python2Packages) cython buildPythonApplication;

     

       13
        
       in buildPythonApplication rec {

     

       14
        
         name = "xpra-${version}";

     

       15
        
         version = "2.3.2";

+1 -3

pkgs/tools/filesystems/sshfs-fuse/default.nix

···

       2
        
       , docutils

     

       3
        
       }:

     

       4
        
       

     

       5
       -
       let

     

       6
       -
         inherit (stdenv.lib) optional;

     

       7
       -
       in stdenv.mkDerivation rec {

     

       8
        
         version = "3.4.0";

     

       9
        
         name = "sshfs-fuse-${version}";

     

       10

···

       2
        
       , docutils

     

       3
        
       }:

     

       4
        
       

     

       5
       +
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

       6
        
         version = "3.4.0";

     

       7
        
         name = "sshfs-fuse-${version}";

     

       8

+1 -1

pkgs/tools/graphics/graphviz/base.nix

···

       7
        
       assert stdenv.isDarwin -> ApplicationServices != null;

     

       8
        
       

     

       9
        
       let

     

       10
       -
         inherit (stdenv.lib) optional optionals optionalString;

     

       11
        
       in

     

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

···

       7
        
       assert stdenv.isDarwin -> ApplicationServices != null;

     

       8
        
       

     

       9
        
       let

     

       10
       +
         inherit (stdenv.lib) optionals optionalString;

     

       11
        
       in

     

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

-2

pkgs/tools/misc/findutils/default.nix

···

       3
        
       , buildPlatform, hostPlatform

     

       4
        
       }:

     

       5
        
       

     

       6
       -
       let inherit (stdenv.lib) optionals; in

     

       7
       -
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         name = "findutils-4.6.0";

     

       10

···

       3
        
       , buildPlatform, hostPlatform

     

       4
        
       }:

     

       5
        
       

     

       0
        
       
     

       0
        
       
     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "findutils-4.6.0";

     

       8

+1 -1

pkgs/tools/networking/spoofer/default.nix

···

       1
        
       { stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute

     

       2
        
       , withGUI ? false, qt5 }:

     

       3
        
       

     

       4
       -
       let inherit (stdenv.lib) optional optionalString;

     

       5
        
       in

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

···

       1
        
       { stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute

     

       2
        
       , withGUI ? false, qt5 }:

     

       3
        
       

     

       4
       +
       let inherit (stdenv.lib) optional;

     

       5
        
       in

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

-2

pkgs/tools/system/ddrescue/default.nix

···

       3
        
       , hostPlatform, buildPlatform

     

       4
        
       }:

     

       5
        
       

     

       6
       -
       let inherit (stdenv.lib) optionals; in

     

       7
       -
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         name = "ddrescue-1.23";

     

       10

···

       3
        
       , hostPlatform, buildPlatform

     

       4
        
       }:

     

       5
        
       

     

       0
        
       
     

       0
        
       
     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "ddrescue-1.23";

     

       8