commit ef64208eba1a2b9052ce6d96b4539163d1aeda9f · pyrox.dev/nixpkgs

+14

doc/languages-frameworks/perl.xml

···

       177
       177
        
       

     

       178
       178
        
       </section>

     

       179
       179
        
       

     

       180
       180
       +
       <section xml:id="ssec-perl-cross-compilation"><title>Cross-compiling modules</title>

     

       181
       181
       +
       

     

       182
       182
       +
       <para>Nixpkgs has experimental support for cross-compiling Perl

     

       183
       183
       +
       modules. In many cases, it will just work out of the box, even for

     

       184
       184
       +
       modules with native extensions. Sometimes, however, the Makefile.PL

     

       185
       185
       +
       for a module may (indirectly) import a native module. In that case,

     

       186
       186
       +
       you will need to make a stub for that module that will satisfy the

     

       187
       187
       +
       Makefile.PL and install it into

     

       188
       188
       +
       <filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>.

     

       189
       189
       +
       See the <varname>postInstall</varname> for <varname>DBI</varname> for

     

       190
       190
       +
       an example.</para>

     

       191
       191
       +
       

     

       192
       192
       +
       </section>

     

       193
       193
       +
       

     

       180
       194
        
       </section>

     

       181
       195

+5 -5

nixos/doc/manual/default.nix

···

       87
       87
        
             echo "for hints about the offending path)."

     

       88
       88
        
             exit 1

     

       89
       89
        
           fi

     

       90
       90
       -
           ${libxslt.bin}/bin/xsltproc \

     

       90
       90
       +
           ${buildPackages.libxslt.bin}/bin/xsltproc \

     

       91
       91
        
             --stringparam revision '${revision}' \

     

       92
       92
        
             -o $out ${./options-to-docbook.xsl} $optionsXML

     

       93
       93
        
         '';

     
···

       139
       139
        
       

     

       140
       140
        
         manual-combined = runCommand "nixos-manual-combined"

     

       141
       141
        
           { inherit sources;

     

       142
       142
       -
             buildInputs = [ libxml2 libxslt ];

     

       142
       142
       +
             nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];

     

       143
       143
        
             meta.description = "The NixOS manual as plain docbook XML";

     

       144
       144
        
           }

     

       145
       145
        
           ''

     
···

       194
       194
        
       

     

       195
       195
        
         olinkDB = runCommand "manual-olinkdb"

     

       196
       196
        
           { inherit sources;

     

       197
       197
       -
             buildInputs = [ libxml2 libxslt ];

     

       197
       197
       +
             nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];

     

       198
       198
        
           }

     

       199
       199
        
           ''

     

       200
       200
        
             xsltproc \

     
···

       244
       244
        
         # Generate the NixOS manual.

     

       245
       245
        
         manual = runCommand "nixos-manual"

     

       246
       246
        
           { inherit sources;

     

       247
       247
       -
             buildInputs = [ libxml2 libxslt ];

     

       247
       247
       +
             nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];

     

       248
       248
        
             meta.description = "The NixOS manual in HTML format";

     

       249
       249
        
             allowedReferences = ["out"];

     

       250
       250
        
           }

     
···

       302
       302
        
         # Generate the NixOS manpages.

     

       303
       303
        
         manpages = runCommand "nixos-manpages"

     

       304
       304
        
           { inherit sources;

     

       305
       305
       -
             buildInputs = [ libxml2 libxslt ];

     

       305
       305
       +
             nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];

     

       306
       306
        
             allowedReferences = ["out"];

     

       307
       307
        
           }

     

       308
       308
        
           ''

+1 -1

nixos/modules/config/i18n.nix

···

       10
       10
        
           i18n = {

     

       11
       11
        
             glibcLocales = mkOption {

     

       12
       12
        
               type = types.path;

     

       13
       13
       -
               default = pkgs.glibcLocales.override {

     

       13
       13
       +
               default = pkgs.buildPackages.glibcLocales.override {

     

       14
       14
        
                 allLocales = any (x: x == "all") config.i18n.supportedLocales;

     

       15
       15
        
                 locales = config.i18n.supportedLocales;

     

       16
       16
        
               };

+1

nixos/modules/config/no-x-libs.nix

···

       36
       36
        
             networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };

     

       37
       37
        
             networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };

     

       38
       38
        
             pinentry = pkgs.pinentry_ncurses;

     

       39
       39
       +
             gobjectIntrospection = pkgs.gobjectIntrospection.override { x11Support = false; };

     

       39
       40
        
           };

     

       40
       41
        
         };

     

       41
       42
        
       }

+1 -1

nixos/modules/config/zram.nix

···

       93
       93
        
                   serviceConfig = {

     

       94
       94
        
                     Type = "oneshot";

     

       95
       95
        
                     RemainAfterExit = true;

     

       96
       96
       -
                     ExecStop = "${pkgs.stdenv.shell} -c 'echo 1 > /sys/class/block/${dev}/reset'";

     

       96
       96
       +
                     ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'";

     

       97
       97
        
                   };

     

       98
       98
        
                   script = ''

     

       99
       99
        
                     set -u

+4 -4

nixos/modules/hardware/video/nvidia.nix

···

       75
       75
        
           # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.

     

       76
       76
        
           services.udev.extraRules =

     

       77
       77
        
             ''

     

       78
       78
       -
               KERNEL=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidiactl c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 255'"

     

       79
       79
       -
               KERNEL=="nvidia_modeset", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-modeset c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 254'"

     

       80
       80
       -
               KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia%n c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) %n'"

     

       81
       81
       -
               KERNEL=="nvidia_uvm", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0'"

     

       78
       78
       +
               KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 255'"

     

       79
       79
       +
               KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 254'"

     

       80
       80
       +
               KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) %n'"

     

       81
       81
       +
               KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0'"

     

       82
       82
        
             '';

     

       83
       83
        
       

     

       84
       84
        
           boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ];

+13 -1

nixos/modules/misc/nixpkgs.nix

···

       61
       61
        
                   inherit (config.nixpkgs) config overlays system;

     

       62
       62
        
                 }

     

       63
       63
        
               '';

     

       64
       64
       -
             default = import ../../.. { inherit (cfg) config overlays system; };

     

       64
       64
       +
             default = import ../../.. { inherit (cfg) config overlays system crossSystem; };

     

       65
       65
        
             type = pkgsType;

     

       66
       66
        
             example = literalExample ''import <nixpkgs> {}'';

     

       67
       67
        
             description = ''

     
···

       125
       125
        
               takes as an argument the <emphasis>original</emphasis> Nixpkgs.

     

       126
       126
        
               The first argument should be used for finding dependencies, and

     

       127
       127
        
               the second should be used for overriding recipes.

     

       128
       128
       +
       

     

       129
       129
       +
               Ignored when <code>nixpkgs.pkgs</code> is set.

     

       130
       130
       +
             '';

     

       131
       131
       +
           };

     

       132
       132
       +
       

     

       133
       133
       +
           crossSystem = mkOption {

     

       134
       134
       +
             type = types.nullOr types.attrs;

     

       135
       135
       +
             default = null;

     

       136
       136
       +
             description = ''

     

       137
       137
       +
               The description of the system we're cross-compiling to, or null

     

       138
       138
       +
               if this isn't a cross-compile. See the description of the

     

       139
       139
       +
               crossSystem argument in the nixpkgs manual.

     

       128
       140
        
       

     

       129
       141
        
               Ignored when <code>nixpkgs.pkgs</code> is set.

     

       130
       142
        
             '';

+1 -1

nixos/modules/programs/rootston.nix

···

       6
       6
        
         cfg = config.programs.rootston;

     

       7
       7
        
       

     

       8
       8
        
         rootstonWrapped = pkgs.writeScriptBin "rootston" ''

     

       9
       9
       -
           #! ${pkgs.stdenv.shell}

     

       9
       9
       +
           #! ${pkgs.runtimeShell}

     

       10
       10
        
           if [[ "$#" -ge 1 ]]; then

     

       11
       11
        
             exec ${pkgs.rootston}/bin/rootston "$@"

     

       12
       12
        
           else

+1 -1

nixos/modules/programs/ssh.nix

···

       13
       13
        
       

     

       14
       14
        
         askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper"

     

       15
       15
        
           ''

     

       16
       16
       -
             #! ${pkgs.stdenv.shell} -e

     

       16
       16
       +
             #! ${pkgs.runtimeShell} -e

     

       17
       17
        
             export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"

     

       18
       18
        
             exec ${askPassword}

     

       19
       19
        
           '';

+3 -3

nixos/modules/security/audit.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         disableScript = pkgs.writeScript "audit-disable" ''

     

       16
       16
       -
           #!${pkgs.stdenv.shell} -eu

     

       16
       16
       +
           #!${pkgs.runtimeShell} -eu

     

       17
       17
        
           # Explicitly disable everything, as otherwise journald might start it.

     

       18
       18
        
           auditctl -D

     

       19
       19
        
           auditctl -e 0 -a task,never

     
···

       23
       23
        
         # put in the store like this. At the same time, it doesn't feel like a huge deal and working

     

       24
       24
        
         # around that is a pain so I'm leaving it like this for now.

     

       25
       25
        
         startScript = pkgs.writeScript "audit-start" ''

     

       26
       26
       -
           #!${pkgs.stdenv.shell} -eu

     

       26
       26
       +
           #!${pkgs.runtimeShell} -eu

     

       27
       27
        
           # Clear out any rules we may start with

     

       28
       28
        
           auditctl -D

     

       29
       29
        
       

     
···

       43
       43
        
         '';

     

       44
       44
        
       

     

       45
       45
        
         stopScript = pkgs.writeScript "audit-stop" ''

     

       46
       46
       -
           #!${pkgs.stdenv.shell} -eu

     

       46
       46
       +
           #!${pkgs.runtimeShell} -eu

     

       47
       47
        
           # Clear the rules

     

       48
       48
        
           auditctl -D

     

       49
       49

+1 -1

nixos/modules/security/sudo.nix

···

       215
       215
        
                 { src = pkgs.writeText "sudoers-in" cfg.configFile; }

     

       216
       216
        
                 # Make sure that the sudoers file is syntactically valid.

     

       217
       217
        
                 # (currently disabled - NIXOS-66)

     

       218
       218
       -
                 "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";

     

       218
       218
       +
                 "${pkgs.buildPackages.sudo}/sbin/visudo -f $src -c && cp $src $out";

     

       219
       219
        
               target = "sudoers";

     

       220
       220
        
               mode = "0440";

     

       221
       221
        
             };

+1 -1

nixos/modules/services/continuous-integration/buildkite-agent.nix

···

       18
       18
        
         hooksDir = let

     

       19
       19
        
           mkHookEntry = name: value: ''

     

       20
       20
        
             cat > $out/${name} <<EOF

     

       21
       21
       -
             #! ${pkgs.stdenv.shell}

     

       21
       21
       +
             #! ${pkgs.runtimeShell}

     

       22
       22
        
             set -e

     

       23
       23
        
             ${value}

     

       24
       24
        
             EOF

+1 -1

nixos/modules/services/databases/4store-endpoint.nix

···

       2
       2
        
       let

     

       3
       3
        
         cfg = config.services.fourStoreEndpoint;

     

       4
       4
        
         endpointUser = "fourstorehttp";

     

       5
       5
       -
         run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${endpointUser} -c";

     

       5
       5
       +
         run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${endpointUser} -c";

     

       6
       6
        
       in

     

       7
       7
        
       with lib;

     

       8
       8
        
       {

+1 -1

nixos/modules/services/databases/4store.nix

···

       3
       3
        
         cfg = config.services.fourStore;

     

       4
       4
        
         stateDir = "/var/lib/4store";

     

       5
       5
        
         fourStoreUser = "fourstore";

     

       6
       6
       -
         run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fourStoreUser}";

     

       6
       6
       +
         run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fourStoreUser}";

     

       7
       7
        
       in

     

       8
       8
        
       with lib;

     

       9
       9
        
       {

+1 -1

nixos/modules/services/editors/emacs.nix

···

       7
       7
        
         cfg = config.services.emacs;

     

       8
       8
        
       

     

       9
       9
        
         editorScript = pkgs.writeScriptBin "emacseditor" ''

     

       10
       10
       -
           #!${pkgs.stdenv.shell}

     

       10
       10
       +
           #!${pkgs.runtimeShell}

     

       11
       11
        
           if [ -z "$1" ]; then

     

       12
       12
        
             exec ${cfg.package}/bin/emacsclient --create-frame --alternate-editor ${cfg.package}/bin/emacs

     

       13
       13
        
           else

+1 -1

nixos/modules/services/hardware/udev.nix

···

       146
       146
        
       

     

       147
       147
        
             echo "Generating hwdb database..."

     

       148
       148
        
             # hwdb --update doesn't return error code even on errors!

     

       149
       149
       -
             res="$(${udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)"

     

       149
       149
       +
             res="$(${pkgs.buildPackages.udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)"

     

       150
       150
        
             echo "$res"

     

       151
       151
        
             [ -z "$(echo "$res" | egrep '^Error')" ]

     

       152
       152
        
             mv etc/udev/hwdb.bin $out

+1 -1

nixos/modules/services/misc/folding-at-home.nix

···

       57
       57
        
               chown ${fahUser} ${stateDir}

     

       58
       58
        
               cp -f ${pkgs.writeText "client.cfg" cfg.config} ${stateDir}/client.cfg

     

       59
       59
        
             '';

     

       60
       60
       -
             script = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";

     

       60
       60
       +
             script = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";

     

       61
       61
        
           };

     

       62
       62
        
       

     

       63
       63
        
           services.foldingAtHome.config = ''

+1 -1

nixos/modules/services/misc/geoip-updater.nix

···

       14
       14
        
         # ExecStart= command with '@' doesn't work because we start a shell (new

     

       15
       15
        
         # process) that creates a new argv[0].)

     

       16
       16
        
         geoip-updater = pkgs.writeScriptBin "geoip-updater" ''

     

       17
       17
       -
           #!${pkgs.stdenv.shell}

     

       17
       17
       +
           #!${pkgs.runtimeShell}

     

       18
       18
        
           skipExisting=0

     

       19
       19
        
           debug()

     

       20
       20
        
           {

+1 -1

nixos/modules/services/misc/gitit.nix

···

       17
       17
        
         gititSh = hsPkgs: extras: with pkgs; let

     

       18
       18
        
           env = gititWithPkgs hsPkgs extras;

     

       19
       19
        
         in writeScript "gitit" ''

     

       20
       20
       -
           #!${stdenv.shell}

     

       20
       20
       +
           #!${runtimeShell}

     

       21
       21
        
           cd $HOME

     

       22
       22
        
           export NIX_GHC="${env}/bin/ghc"

     

       23
       23
        
           export NIX_GHCPKG="${env}/bin/ghc-pkg"

+1 -1

nixos/modules/services/misc/ihaskell.nix

···

       55
       55
        
             serviceConfig = {

     

       56
       56
        
               User = config.users.extraUsers.ihaskell.name;

     

       57
       57
        
               Group = config.users.extraGroups.ihaskell.name;

     

       58
       58
       -
               ExecStart = "${pkgs.stdenv.shell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";

     

       58
       58
       +
               ExecStart = "${pkgs.runtimeShell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";

     

       59
       59
        
             };

     

       60
       60
        
           };

     

       61
       61
        
         };

+1 -1

nixos/modules/services/misc/mesos-slave.nix

···

       188
       188
        
             description = "Mesos Slave";

     

       189
       189
        
             wantedBy = [ "multi-user.target" ];

     

       190
       190
        
             after = [ "network.target" ];

     

       191
       191
       -
             path = [ pkgs.stdenv.shellPackage ];

     

       191
       191
       +
             path = [ pkgs.runtimeShellPackage ];

     

       192
       192
        
             serviceConfig = {

     

       193
       193
        
               ExecStart = ''

     

       194
       194
        
                 ${pkgs.mesos}/bin/mesos-slave \

+1 -1

nixos/modules/services/misc/nix-daemon.nix

···

       30
       30
        
             # /bin/sh in the sandbox as a bind-mount to bash. This means we

     

       31
       31
        
             # also need to include the entire closure of bash. Nix >= 2.0

     

       32
       32
        
             # provides a /bin/sh by default.

     

       33
       33
       -
             sh = pkgs.stdenv.shell;

     

       33
       33
       +
             sh = pkgs.runtimeShell;

     

       34
       34
        
             binshDeps = pkgs.writeReferencesToFile sh;

     

       35
       35
        
           in

     

       36
       36
        
             pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } ''

+1 -1

nixos/modules/services/misc/nixos-manual.nix

···

       43
       43
        
       

     

       44
       44
        
         helpScript = pkgs.writeScriptBin "nixos-help"

     

       45
       45
        
           ''

     

       46
       46
       -
             #! ${pkgs.stdenv.shell} -e

     

       46
       46
       +
             #! ${pkgs.runtimeShell} -e

     

       47
       47
        
             browser="$BROWSER"

     

       48
       48
        
             if [ -z "$browser" ]; then

     

       49
       49
        
               browser="$(type -P xdg-open || true)"

+1 -1

nixos/modules/services/misc/ssm-agent.nix

···

       8
       8
        
         # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM

     

       9
       9
        
         # looks for. See https://github.com/aws/amazon-ssm-agent/issues/38 for upstream fix.

     

       10
       10
        
         fake-lsb-release = pkgs.writeScriptBin "lsb_release" ''

     

       11
       11
       -
           #!${pkgs.stdenv.shell}

     

       11
       11
       +
           #!${pkgs.runtimeShell}

     

       12
       12
        
       

     

       13
       13
        
           case "$1" in

     

       14
       14
        
             -i) echo "nixos";;

+1 -1

nixos/modules/services/monitoring/apcupsd.nix

···

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
        
         shellCmdsForEventScript = eventname: commands: ''

     

       41
       41
       -
           echo "#!${pkgs.stdenv.shell}" > "$out/${eventname}"

     

       41
       41
       +
           echo "#!${pkgs.runtimeShell}" > "$out/${eventname}"

     

       42
       42
        
           echo '${commands}' >> "$out/${eventname}"

     

       43
       43
        
           chmod a+x "$out/${eventname}"

     

       44
       44
        
         '';

+1 -1

nixos/modules/services/monitoring/smartd.nix

···

       14
       14
        
         nx = cfg.notifications.x11;

     

       15
       15
        
       

     

       16
       16
        
         smartdNotify = pkgs.writeScript "smartd-notify.sh" ''

     

       17
       17
       -
           #! ${pkgs.stdenv.shell}

     

       17
       17
       +
           #! ${pkgs.runtimeShell}

     

       18
       18
        
           ${optionalString nm.enable ''

     

       19
       19
        
             {

     

       20
       20
        
             ${pkgs.coreutils}/bin/cat << EOF

+1 -1

nixos/modules/services/network-filesystems/xtreemfs.nix

···

       11
       11
        
         home = cfg.homeDir;

     

       12
       12
        
       

     

       13
       13
        
         startupScript = class: configPath: pkgs.writeScript "xtreemfs-osd.sh" ''

     

       14
       14
       -
           #! ${pkgs.stdenv.shell}

     

       14
       14
       +
           #! ${pkgs.runtimeShell}

     

       15
       15
        
           JAVA_HOME="${pkgs.jdk}"

     

       16
       16
        
           JAVADIR="${xtreemfs}/share/java"

     

       17
       17
        
           JAVA_CALL="$JAVA_HOME/bin/java -ea -cp $JAVADIR/XtreemFS.jar:$JAVADIR/BabuDB.jar:$JAVADIR/Flease.jar:$JAVADIR/protobuf-java-2.5.0.jar:$JAVADIR/Foundation.jar:$JAVADIR/jdmkrt.jar:$JAVADIR/jdmktk.jar:$JAVADIR/commons-codec-1.3.jar"

+2 -2

nixos/modules/services/network-filesystems/yandex-disk.nix

···

       99
       99
        
                   exit 1

     

       100
       100
        
               fi

     

       101
       101
        
       

     

       102
       102
       -
               ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \

     

       102
       102
       +
               ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \

     

       103
       103
        
                 -c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token'

     

       104
       104
        
       

     

       105
       105
       -
               ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \

     

       105
       105
       +
               ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \

     

       106
       106
        
                 -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory} --exclude-dirs=${cfg.excludes}'

     

       107
       107
        
             '';

     

       108
       108

+1 -1

nixos/modules/services/networking/amuled.nix

···

       68
       68
        
             '';

     

       69
       69
        
       

     

       70
       70
        
             script = ''

     

       71
       71
       -
               ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \

     

       71
       71
       +
               ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \

     

       72
       72
        
                   -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'

     

       73
       73
        
             '';

     

       74
       74
        
           };

+1 -1

nixos/modules/services/networking/firewall.nix

···

       54
       54
        
           '';

     

       55
       55
        
       

     

       56
       56
        
         writeShScript = name: text: let dir = pkgs.writeScriptBin name ''

     

       57
       57
       -
           #! ${pkgs.stdenv.shell} -e

     

       57
       57
       +
           #! ${pkgs.runtimeShell} -e

     

       58
       58
        
           ${text}

     

       59
       59
        
         ''; in "${dir}/bin/${name}";

     

       60
       60

+1 -1

nixos/modules/services/networking/flashpolicyd.nix

···

       22
       22
        
       

     

       23
       23
        
         flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd"

     

       24
       24
        
           ''

     

       25
       25
       -
             #! ${pkgs.stdenv.shell}

     

       25
       25
       +
             #! ${pkgs.runtimeShell}

     

       26
       26
        
             exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \

     

       27
       27
        
               --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \

     

       28
       28
        
               2> /dev/null

+1 -1

nixos/modules/services/networking/nftables.nix

···

       116
       116
        
                 include "${cfg.rulesetFile}"

     

       117
       117
        
               '';

     

       118
       118
        
               checkScript = pkgs.writeScript "nftables-check" ''

     

       119
       119
       -
                 #! ${pkgs.stdenv.shell} -e

     

       119
       119
       +
                 #! ${pkgs.runtimeShell} -e

     

       120
       120
        
                 if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then

     

       121
       121
        
                   echo "Unload ip_tables before using nftables!" 1>&2

     

       122
       122
        
                   exit 1

+1 -1

nixos/modules/services/networking/rdnssd.nix

···

       6
       6
        
       with lib;

     

       7
       7
        
       let

     

       8
       8
        
         mergeHook = pkgs.writeScript "rdnssd-merge-hook" ''

     

       9
       9
       -
           #! ${pkgs.stdenv.shell} -e

     

       9
       9
       +
           #! ${pkgs.runtimeShell} -e

     

       10
       10
        
           ${pkgs.openresolv}/bin/resolvconf -u

     

       11
       11
        
         '';

     

       12
       12
        
       in

+5 -2

nixos/modules/services/printing/cupsd.nix

···

       124
       124
        
       

     

       125
       125
        
             listenAddresses = mkOption {

     

       126
       126
        
               type = types.listOf types.str;

     

       127
       127
       -
               default = [ "127.0.0.1:631" ];

     

       127
       127
       +
               default = [ "localhost:631" ];

     

       128
       128
        
               example = [ "*:631" ];

     

       129
       129
        
               description = ''

     

       130
       130
        
                 A list of addresses and ports on which to listen.

     
···

       321
       321
        
                   ''}

     

       322
       322
        
                 '';

     

       323
       323
        
       

     

       324
       324
       -
                 serviceConfig.PrivateTmp = true;

     

       324
       324
       +
                 serviceConfig = {

     

       325
       325
       +
                   PrivateTmp = true;

     

       326
       326
       +
                   RuntimeDirectory = [ "cups" ];

     

       327
       327
       +
                 };

     

       325
       328
        
             };

     

       326
       329
        
       

     

       327
       330
        
           systemd.services.cups-browsed = mkIf avahiEnabled

+1 -1

nixos/modules/services/security/torify.nix

···

       7
       7
        
         torify = pkgs.writeTextFile {

     

       8
       8
        
           name = "tsocks";

     

       9
       9
        
           text = ''

     

       10
       10
       -
               #!${pkgs.stdenv.shell}

     

       10
       10
       +
               #!${pkgs.runtimeShell}

     

       11
       11
        
               TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.tsocks.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@"

     

       12
       12
        
           '';

     

       13
       13
        
           executable = true;

+1 -1

nixos/modules/services/security/torsocks.nix

···

       23
       23
        
         wrapTorsocks = name: server: pkgs.writeTextFile {

     

       24
       24
        
           name = name;

     

       25
       25
        
           text = ''

     

       26
       26
       -
               #!${pkgs.stdenv.shell}

     

       26
       26
       +
               #!${pkgs.runtimeShell}

     

       27
       27
        
               TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (configFile server)} ${pkgs.torsocks}/bin/torsocks "$@"

     

       28
       28
        
           '';

     

       29
       29
        
           executable = true;

+1 -1

nixos/modules/services/torrent/transmission.nix

···

       90
       90
        
             # 1) Only the "transmission" user and group have access to torrents.

     

       91
       91
        
             # 2) Optionally update/force specific fields into the configuration file.

     

       92
       92
        
             serviceConfig.ExecStartPre = ''

     

       93
       93
       -
                 ${pkgs.stdenv.shell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json"

     

       93
       93
       +
                 ${pkgs.runtimeShell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json"

     

       94
       94
        
             '';

     

       95
       95
        
             serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}";

     

       96
       96
        
             serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

+1 -1

nixos/modules/services/web-servers/apache-httpd/owncloud.nix

···

       346
       346
        
         postgresql = serverInfo.fullConfig.services.postgresql.package;

     

       347
       347
        
       

     

       348
       348
        
         setupDb = pkgs.writeScript "setup-owncloud-db" ''

     

       349
       349
       -
           #!${pkgs.stdenv.shell}

     

       349
       349
       +
           #!${pkgs.runtimeShell}

     

       350
       350
        
           PATH="${postgresql}/bin"

     

       351
       351
        
           createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true

     

       352
       352
        
           createdb "${config.dbName}" -O "${config.dbUser}" || true

+1 -1

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

···

       128
       128
        
               # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.

     

       129
       129
        
               export GTK_DATA_PREFIX=${config.system.path}

     

       130
       130
        
       

     

       131
       131
       -
               ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} &

     

       131
       131
       +
               ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} &

     

       132
       132
        
               waitPID=$!

     

       133
       133
        
             '';

     

       134
       134
        
           }];

+1 -1

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

···

       14
       14
        
             default_xserver ${dmcfg.xserverBin}

     

       15
       15
        
             xserver_arguments ${toString dmcfg.xserverArgs}

     

       16
       16
        
             sessiondir ${dmcfg.session.desktops}

     

       17
       17
       -
             login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session"

     

       17
       17
       +
             login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.script} "%session"

     

       18
       18
        
             halt_cmd ${config.systemd.package}/sbin/shutdown -h now

     

       19
       19
        
             reboot_cmd ${config.systemd.package}/sbin/shutdown -r now

     

       20
       20
        
             logfile /dev/stderr

+1 -1

nixos/modules/system/activation/activation-script.nix

···

       61
       61
        
             apply = set: {

     

       62
       62
        
               script =

     

       63
       63
        
                 ''

     

       64
       64
       -
                   #! ${pkgs.stdenv.shell}

     

       64
       64
       +
                   #! ${pkgs.runtimeShell}

     

       65
       65
        
       

     

       66
       66
        
                   systemConfig=@out@

     

       67
       67

+19 -18

nixos/modules/system/boot/kexec.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
       -
         environment.systemPackages = [ pkgs.kexectools ];

     

       4
       4
       +
         config = lib.mkIf (pkgs.kexectools != null) {

     

       5
       5
       +
           environment.systemPackages = [ pkgs.kexectools ];

     

       5
       6
        
       

     

       6
       6
       -
         systemd.services."prepare-kexec" =

     

       7
       7
       -
           { description = "Preparation for kexec";

     

       8
       8
       -
             wantedBy = [ "kexec.target" ];

     

       9
       9
       -
             before = [ "systemd-kexec.service" ];

     

       10
       10
       -
             unitConfig.DefaultDependencies = false;

     

       11
       11
       -
             serviceConfig.Type = "oneshot";

     

       12
       12
       -
             path = [ pkgs.kexectools ];

     

       13
       13
       -
             script =

     

       14
       14
       -
               ''

     

       15
       15
       -
                 p=$(readlink -f /nix/var/nix/profiles/system)

     

       16
       16
       -
                 if ! [ -d $p ]; then exit 1; fi

     

       17
       17
       -
                 exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"

     

       18
       18
       -
               '';

     

       19
       19
       -
           };

     

       20
       20
       -
       

     

       21
       21
       -
       }
     

       7
       7
       +
           systemd.services."prepare-kexec" =

     

       8
       8
       +
             { description = "Preparation for kexec";

     

       9
       9
       +
               wantedBy = [ "kexec.target" ];

     

       10
       10
       +
               before = [ "systemd-kexec.service" ];

     

       11
       11
       +
               unitConfig.DefaultDependencies = false;

     

       12
       12
       +
               serviceConfig.Type = "oneshot";

     

       13
       13
       +
               path = [ pkgs.kexectools ];

     

       14
       14
       +
               script =

     

       15
       15
       +
                 ''

     

       16
       16
       +
                   p=$(readlink -f /nix/var/nix/profiles/system)

     

       17
       17
       +
                   if ! [ -d $p ]; then exit 1; fi

     

       18
       18
       +
                   exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"

     

       19
       19
       +
                 '';

     

       20
       20
       +
             };

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+2 -2

nixos/modules/system/boot/loader/grub/grub.nix

···

       40
       40
        
           { splashImage = f cfg.splashImage;

     

       41
       41
        
             grub = f grub;

     

       42
       42
        
             grubTarget = f (grub.grubTarget or "");

     

       43
       43
       -
             shell = "${pkgs.stdenv.shell}";

     

       43
       43
       +
             shell = "${pkgs.runtimeShell}";

     

       44
       44
        
             fullName = (builtins.parseDrvName realGrub.name).name;

     

       45
       45
        
             fullVersion = (builtins.parseDrvName realGrub.name).version;

     

       46
       46
        
             grubEfi = f grubEfi;

     
···

       536
       536
        
                   btrfsprogs = pkgs.btrfs-progs;

     

       537
       537
        
                 };

     

       538
       538
        
               in pkgs.writeScript "install-grub.sh" (''

     

       539
       539
       -
               #!${pkgs.stdenv.shell}

     

       539
       539
       +
               #!${pkgs.runtimeShell}

     

       540
       540
        
               set -e

     

       541
       541
        
               export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX XMLSAXBase ListCompare ])}

     

       542
       542
        
               ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}

+49 -5

nixos/modules/system/boot/stage-1.nix

···

       30
       30
        
         # mounting `/`, like `/` on a loopback).

     

       31
       31
        
         fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;

     

       32
       32
        
       

     

       33
       33
       +
         # A utility for enumerating the shared-library dependencies of a program

     

       34
       34
       +
         findLibs = pkgs.writeShellScriptBin "find-libs" ''

     

       35
       35
       +
           set -euo pipefail

     

       36
       36
       +
       

     

       37
       37
       +
           declare -A seen

     

       38
       38
       +
           declare -a left

     

       39
       39
       +
       

     

       40
       40
       +
           patchelf="${pkgs.buildPackages.patchelf}/bin/patchelf"

     

       41
       41
       +
       

     

       42
       42
       +
           function add_needed {

     

       43
       43
       +
             rpath="$($patchelf --print-rpath $1)"

     

       44
       44
       +
             dir="$(dirname $1)"

     

       45
       45
       +
             for lib in $($patchelf --print-needed $1); do

     

       46
       46
       +
               left+=("$lib" "$rpath" "$dir")

     

       47
       47
       +
             done

     

       48
       48
       +
           }

     

       49
       49
       +
       

     

       50
       50
       +
           add_needed $1

     

       51
       51
       +
       

     

       52
       52
       +
           while [ ''${#left[@]} -ne 0 ]; do

     

       53
       53
       +
             next=''${left[0]}

     

       54
       54
       +
             rpath=''${left[1]}

     

       55
       55
       +
             ORIGIN=''${left[2]}

     

       56
       56
       +
             left=("''${left[@]:3}")

     

       57
       57
       +
             if [ -z ''${seen[$next]+x} ]; then

     

       58
       58
       +
               seen[$next]=1

     

       59
       59
       +
               IFS=: read -ra paths <<< $rpath

     

       60
       60
       +
               res=

     

       61
       61
       +
               for path in "''${paths[@]}"; do

     

       62
       62
       +
                 path=$(eval "echo $path")

     

       63
       63
       +
                 if [ -f "$path/$next" ]; then

     

       64
       64
       +
                     res="$path/$next"

     

       65
       65
       +
                     echo "$res"

     

       66
       66
       +
                     add_needed "$res"

     

       67
       67
       +
                     break

     

       68
       68
       +
                 fi

     

       69
       69
       +
               done

     

       70
       70
       +
               if [ -z "$res" ]; then

     

       71
       71
       +
                 echo "Couldn't satisfy dependency $next" >&2

     

       72
       72
       +
                 exit 1

     

       73
       73
       +
               fi

     

       74
       74
       +
             fi

     

       75
       75
       +
           done

     

       76
       76
       +
         '';

     

       33
       77
        
       

     

       34
       78
        
         # Some additional utilities needed in stage 1, like mount, lvm, fsck

     

       35
       79
        
         # etc.  We don't want to bring in all of those packages, so we just

     
···

       37
       81
        
         # we just copy what we need from Glibc and use patchelf to make it

     

       38
       82
        
         # work.

     

       39
       83
        
         extraUtils = pkgs.runCommandCC "extra-utils"

     

       40
       40
       -
           { buildInputs = [pkgs.nukeReferences];

     

       84
       84
       +
           { nativeBuildInputs = [pkgs.buildPackages.nukeReferences];

     

       41
       85
        
             allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd

     

       42
       86
        
           }

     

       43
       87
        
           ''

     
···

       103
       147
        
             # Copy all of the needed libraries

     

       104
       148
        
             find $out/bin $out/lib -type f | while read BIN; do

     

       105
       149
        
               echo "Copying libs for executable $BIN"

     

       106
       106
       -
               LDD="$(ldd $BIN)" || continue

     

       107
       107
       -
               LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')"

     

       108
       108
       -
               for LIB in $LIBS; do

     

       150
       150
       +
               for LIB in $(${findLibs}/bin/find-libs $BIN); do

     

       109
       151
        
                 TGT="$out/lib/$(basename $LIB)"

     

       110
       152
        
                 if [ ! -f "$TGT" ]; then

     

       111
       153
        
                   SRC="$(readlink -e $LIB)"

     
···

       132
       174
        
               fi

     

       133
       175
        
             done

     

       134
       176
        
       

     

       177
       177
       +
             if [ -z "${toString pkgs.stdenv.isCross}" ]; then

     

       135
       178
        
             # Make sure that the patchelf'ed binaries still work.

     

       136
       179
        
             echo "testing patched programs..."

     

       137
       180
        
             $out/bin/ash -c 'echo hello world' | grep "hello world"

     
···

       144
       187
        
             $out/bin/mdadm --version

     

       145
       188
        
       

     

       146
       189
        
             ${config.boot.initrd.extraUtilsCommandsTest}

     

       190
       190
       +
             fi

     

       147
       191
        
           ''; # */

     

       148
       192
        
       

     

       149
       193
        
       

     
···

       245
       289
        
                   { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; }

     

       246
       290
        
                   ''

     

       247
       291
        
                     target=$out

     

       248
       248
       -
                     ${pkgs.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out

     

       292
       292
       +
                     ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out

     

       249
       293
        
                   '';

     

       250
       294
        
                 symlink = "/etc/modprobe.d/ubuntu.conf";

     

       251
       295
        
               }

+1

nixos/modules/system/boot/stage-2.nix

···

       10
       10
        
         bootStage2 = pkgs.substituteAll {

     

       11
       11
        
           src = ./stage-2-init.sh;

     

       12
       12
        
           shellDebug = "${pkgs.bashInteractive}/bin/bash";

     

       13
       13
       +
           shell = "${pkgs.bash}/bin/bash";

     

       13
       14
        
           isExecutable = true;

     

       14
       15
        
           inherit (config.nix) readOnlyStore;

     

       15
       16
        
           inherit (config.networking) useHostResolvConf;

+6 -6

nixos/modules/system/boot/systemd.nix

···

       241
       241
        
               }

     

       242
       242
        
               (mkIf (config.preStart != "")

     

       243
       243
        
                 { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" ''

     

       244
       244
       -
                     #! ${pkgs.stdenv.shell} -e

     

       244
       244
       +
                     #! ${pkgs.runtimeShell} -e

     

       245
       245
        
                     ${config.preStart}

     

       246
       246
        
                   '';

     

       247
       247
        
                 })

     

       248
       248
        
               (mkIf (config.script != "")

     

       249
       249
        
                 { serviceConfig.ExecStart = makeJobScript "${name}-start" ''

     

       250
       250
       -
                     #! ${pkgs.stdenv.shell} -e

     

       250
       250
       +
                     #! ${pkgs.runtimeShell} -e

     

       251
       251
        
                     ${config.script}

     

       252
       252
        
                   '' + " " + config.scriptArgs;

     

       253
       253
        
                 })

     

       254
       254
        
               (mkIf (config.postStart != "")

     

       255
       255
        
                 { serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" ''

     

       256
       256
       -
                     #! ${pkgs.stdenv.shell} -e

     

       256
       256
       +
                     #! ${pkgs.runtimeShell} -e

     

       257
       257
        
                     ${config.postStart}

     

       258
       258
        
                   '';

     

       259
       259
        
                 })

     

       260
       260
        
               (mkIf (config.reload != "")

     

       261
       261
        
                 { serviceConfig.ExecReload = makeJobScript "${name}-reload" ''

     

       262
       262
       -
                     #! ${pkgs.stdenv.shell} -e

     

       262
       262
       +
                     #! ${pkgs.runtimeShell} -e

     

       263
       263
        
                     ${config.reload}

     

       264
       264
        
                   '';

     

       265
       265
        
                 })

     

       266
       266
        
               (mkIf (config.preStop != "")

     

       267
       267
        
                 { serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" ''

     

       268
       268
       -
                     #! ${pkgs.stdenv.shell} -e

     

       268
       268
       +
                     #! ${pkgs.runtimeShell} -e

     

       269
       269
        
                     ${config.preStop}

     

       270
       270
        
                   '';

     

       271
       271
        
                 })

     

       272
       272
        
               (mkIf (config.postStop != "")

     

       273
       273
        
                 { serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" ''

     

       274
       274
       -
                     #! ${pkgs.stdenv.shell} -e

     

       274
       274
       +
                     #! ${pkgs.runtimeShell} -e

     

       275
       275
        
                     ${config.postStop}

     

       276
       276
        
                   '';

     

       277
       277
        
                 })

+1 -1

nixos/modules/tasks/kbd.nix

···

       13
       13
        
         isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale);

     

       14
       14
        
       

     

       15
       15
        
         optimizedKeymap = pkgs.runCommand "keymap" {

     

       16
       16
       -
           nativeBuildInputs = [ pkgs.kbd ];

     

       16
       16
       +
           nativeBuildInputs = [ pkgs.buildPackages.kbd ];

     

       17
       17
        
           LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**";

     

       18
       18
        
         } ''

     

       19
       19
        
           loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out

+4 -4

nixos/modules/tasks/network-interfaces.nix

···

       26
       26
        
           executable = true;

     

       27
       27
        
           destination = "/bin/bridge-stp";

     

       28
       28
        
           text = ''

     

       29
       29
       -
             #!${pkgs.stdenv.shell} -e

     

       29
       29
       +
             #!${pkgs.runtimeShell} -e

     

       30
       30
        
             export PATH="${pkgs.mstpd}/bin"

     

       31
       31
        
       

     

       32
       32
        
             BRIDGES=(${concatStringsSep " " (attrNames rstpBridges)})

     
···

       64
       64
        
       

     

       65
       65
        
         # udev script that configures a physical wlan device and adds virtual interfaces

     

       66
       66
        
         wlanDeviceUdevScript = device: interfaceList: pkgs.writeScript "wlan-${device}-udev-script" ''

     

       67
       67
       -
           #!${pkgs.stdenv.shell}

     

       67
       67
       +
           #!${pkgs.runtimeShell}

     

       68
       68
        
       

     

       69
       69
        
           # Change the wireless phy device to a predictable name.

     

       70
       70
        
           if [ -e "/sys/class/net/${device}/phy80211/name" ]; then

     
···

       1158
       1158
        
                   # The script creates the required, new WLAN interfaces interfaces and configures the

     

       1159
       1159
        
                   # existing, default interface.

     

       1160
       1160
        
                   curInterfaceScript = device: current: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${device}.sh" ''

     

       1161
       1161
       -
                     #!${pkgs.stdenv.shell}

     

       1161
       1161
       +
                     #!${pkgs.runtimeShell}

     

       1162
       1162
        
                     # Change the wireless phy device to a predictable name.

     

       1163
       1163
        
                     ${pkgs.iw}/bin/iw phy `${pkgs.coreutils}/bin/cat /sys/class/net/$INTERFACE/phy80211/name` set name ${device}

     

       1164
       1164
        
       

     
···

       1177
       1177
        
       

     

       1178
       1178
        
                   # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.

     

       1179
       1179
        
                   newInterfaceScript = device: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" ''

     

       1180
       1180
       -
                     #!${pkgs.stdenv.shell}

     

       1180
       1180
       +
                     #!${pkgs.runtimeShell}

     

       1181
       1181
        
                     # Configure the new interface

     

       1182
       1182
        
                     ${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type}

     

       1183
       1183
        
                     ${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"}

+1 -1

nixos/modules/virtualisation/amazon-init.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         script = ''

     

       5
       5
       -
           #!${pkgs.stdenv.shell} -eu

     

       5
       5
       +
           #!${pkgs.runtimeShell} -eu

     

       6
       6
        
       

     

       7
       7
        
           echo "attempting to fetch configuration from EC2 user data..."

     

       8
       8

+1 -1

nixos/modules/virtualisation/azure-agent.nix

···

       47
       47
        
         };

     

       48
       48
        
       

     

       49
       49
        
         provisionedHook = pkgs.writeScript "provisioned-hook" ''

     

       50
       50
       -
           #!${pkgs.stdenv.shell}

     

       50
       50
       +
           #!${pkgs.runtimeShell}

     

       51
       51
        
           ${config.systemd.package}/bin/systemctl start provisioned.target

     

       52
       52
        
         '';

     

       53
       53

+2 -2

nixos/modules/virtualisation/containers.nix

···

       33
       33
        
           in

     

       34
       34
        
             pkgs.writeScript "container-init"

     

       35
       35
        
             ''

     

       36
       36
       -
               #! ${pkgs.stdenv.shell} -e

     

       36
       36
       +
               #! ${pkgs.runtimeShell} -e

     

       37
       37
        
       

     

       38
       38
        
               # Initialise the container side of the veth pair.

     

       39
       39
        
               if [ "$PRIVATE_NETWORK" = 1 ]; then

     
···

       223
       223
        
         serviceDirectives = cfg: {

     

       224
       224
        
           ExecReload = pkgs.writeScript "reload-container"

     

       225
       225
        
             ''

     

       226
       226
       -
               #! ${pkgs.stdenv.shell} -e

     

       226
       226
       +
               #! ${pkgs.runtimeShell} -e

     

       227
       227
        
               ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \

     

       228
       228
        
                 bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"

     

       229
       229
        
             '';

+1 -1

nixos/modules/virtualisation/openvswitch.nix

···

       169
       169
        
               mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/}

     

       170
       170
        
               ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey

     

       171
       171
        
               ln -fs ${pkgs.writeScript "racoon-restart" ''

     

       172
       172
       -
               #!${pkgs.stdenv.shell}

     

       172
       172
       +
               #!${pkgs.runtimeShell}

     

       173
       173
        
               /var/run/current-system/sw/bin/systemctl $1 racoon

     

       174
       174
        
               ''} ${runDir}/ipsec/etc/init.d/racoon

     

       175
       175
        
             '';

+1 -1

nixos/modules/virtualisation/qemu-vm.nix

···

       30
       30
        
         # Shell script to start the VM.

     

       31
       31
        
         startVM =

     

       32
       32
        
           ''

     

       33
       33
       -
             #! ${pkgs.stdenv.shell}

     

       33
       33
       +
             #! ${pkgs.runtimeShell}

     

       34
       34
        
       

     

       35
       35
        
             NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})

     

       36
       36

+3 -1

nixos/tests/printing.nix

···

       39
       39
        
             $client->waitForUnit("cups.service");

     

       40
       40
        
             $client->sleep(10); # wait until cups is fully initialized

     

       41
       41
        
             $client->succeed("lpstat -r") =~ /scheduler is running/ or die;

     

       42
       42
       -
             $client->succeed("lpstat -H") =~ "localhost:631" or die;

     

       42
       42
       +
             # Test that UNIX socket is used for connections.

     

       43
       43
       +
             $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;

     

       44
       44
       +
             # Test that HTTP server is available too.

     

       43
       45
        
             $client->succeed("curl --fail http://localhost:631/");

     

       44
       46
        
             $client->succeed("curl --fail http://server:631/");

     

       45
       47
        
             $server->fail("curl --fail --connect-timeout 2  http://client:631/");

+2

pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix

···

       28
       28
        
           "--sysconfdir=/etc"

     

       29
       29
        
         ] ++ stdenv.lib.optional useGTK2 "--with-gtk2";

     

       30
       30
        
       

     

       31
       31
       +
         NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];

     

       32
       32
       +
       

     

       31
       33
        
         installFlags = [

     

       32
       34
        
           "localstatedir=\${TMPDIR}"

     

       33
       35
        
           "sysconfdir=\${out}/etc"

+9 -5

pkgs/applications/misc/pytrainer/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel

     

       1
       1
       +
       { stdenv, fetchFromGitHub, perl, python, sqlite, gpsbabel

     

       2
       2
        
       , withWebKit ? false }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
       

     

       6
       6
        
         # Pytrainer needs a matplotlib with GTK backend. Also ensure we are

     

       7
       7
        
         # using the pygtk with glade support as needed by pytrainer.

     

       8
       8
       -
         matplotlibGtk = python2Packages.matplotlib.override {

     

       8
       8
       +
         matplotlibGtk = python.pkgs.matplotlib.override {

     

       9
       9
        
           enableGtk2 = true;

     

       10
       10
       -
           pygtk = python2Packages.pyGtkGlade;

     

       10
       10
       +
           pygtk = python.pkgs.pyGtkGlade;

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
       in

     

       14
       14
        
       

     

       15
       15
       -
       python2Packages.buildPythonApplication rec {

     

       15
       15
       +
       python.pkgs.buildPythonApplication rec {

     

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

     

       17
       17
        
         version = "1.12.0";

     

       18
       18
        
       

     
···

       40
       40
        
             --replace "'mysqlclient'," ""

     

       41
       41
        
         '';

     

       42
       42
        
       

     

       43
       43
       -
         propagatedBuildInputs = with python2Packages; [

     

       43
       43
       +
         propagatedBuildInputs = with python.pkgs; [

     

       44
       44
        
           dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2

     

       45
       45
        
         ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];

     

       46
       46
        
       

     
···

       49
       49
        
         # This package contains no binaries to patch or strip.

     

       50
       50
        
         dontPatchELF = true;

     

       51
       51
        
         dontStrip = true;

     

       52
       52
       +
       

     

       53
       53
       +
         checkPhase = ''

     

       54
       54
       +
           ${python.interpreter} -m unittest discover

     

       55
       55
       +
         '';

     

       52
       56
        
       

     

       53
       57
        
         meta = with stdenv.lib; {

     

       54
       58
        
           homepage = https://github.com/pytrainer/pytrainer/wiki;

+2 -2

pkgs/applications/science/spyder/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonApplication rec {

     

       12
       12
        
         pname = "spyder";

     

       13
       13
       -
         version = "3.2.6";

     

       13
       13
       +
         version = "3.2.7";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "87d6a4f5ee1aac4284461ee3584c3ade50cb53feb3fe35abebfdfb9be18c526a";

     

       17
       17
       +
           sha256 = "b5bb8fe0a556930dc09b68fa2741a0de3da6488843ec960e0c62f1f3b2e08e2f";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?

+2 -2

pkgs/applications/version-management/nbstripout/default.nix

···

       3
       3
        
       with python2Packages;

     

       4
       4
        
       buildPythonApplication rec {

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
       -
         version = "0.3.0";

     

       6
       6
       +
         version = "0.3.1";

     

       7
       7
        
         pname = "nbstripout";

     

       8
       8
        
       

     

       9
       9
        
         # Mercurial should be added as a build input but because it's a Python

     
···

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "126xhjma4a0k7gq58hbqglhb3rai0a576azz7g8gmqjr3kl0264v";

     

       17
       17
       +
           sha256 = "b997c99b8bbb865988202d2f005cdaabb2598b07dad891c302a147a5871a4a95";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         # for some reason, darwin uses /bin/sh echo native instead of echo binary, so

+13 -13

pkgs/build-support/bintools-wrapper/default.nix

···

       5
       5
        
       # script that sets up the right environment variables so that the

     

       6
       6
        
       # compiler and the linker just "work".

     

       7
       7
        
       

     

       8
       8
       -
       { name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""

     

       8
       8
       +
       { name ? ""

     

       9
       9
       +
       , stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""

     

       9
       10
        
       , bintools ? null, libc ? null

     

       10
       11
        
       , coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null

     

       11
       12
        
       , extraPackages ? [], extraBuildCommands ? ""

     
···

       15
       16
        
       

     

       16
       17
        
       with stdenvNoCC.lib;

     

       17
       18
        
       

     

       18
       18
       -
       assert nativeTools -> nativePrefix != "";

     

       19
       19
       +
       assert nativeTools -> !propagateDoc && nativePrefix != "";

     

       19
       20
        
       assert !nativeTools ->

     

       20
       21
        
         bintools != null && coreutils != null && gnugrep != null;

     

       21
       22
        
       assert !(nativeLibc && noLibc);

     
···

       83
       84
        
       

     

       84
       85
        
         inherit targetPrefix infixSalt;

     

       85
       86
        
       

     

       86
       86
       -
         outputs = [ "out" "info" "man" ];

     

       87
       87
       +
         outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ];

     

       87
       88
        
       

     

       88
       89
        
         passthru = {

     

       89
       90
        
           inherit bintools libc nativeTools nativeLibc nativePrefix;

     
···

       111
       112
        
           ''

     

       112
       113
        
             set -u

     

       113
       114
        
       

     

       114
       114
       -
             mkdir -p $out/bin {$out,$info,$man}/nix-support

     

       115
       115
       +
             mkdir -p $out/bin $out/nix-support

     

       115
       116
        
       

     

       116
       117
        
             wrap() {

     

       117
       118
        
               local dst="$1"

     
···

       244
       245
        
           '')

     

       245
       246
        
       

     

       246
       247
        
           + optionalString (!nativeTools) ''

     

       247
       247
       -
       

     

       248
       248
        
             ##

     

       249
       249
        
             ## User env support

     

       250
       250
        
             ##

     

       251
       251
        
       

     

       252
       252
        
             # Propagate the underling unwrapped bintools so that if you

     

       253
       253
       -
             # install the wrapper, you get tools like objdump, the manpages,

     

       254
       254
       -
             # etc. as well (same for any binaries of libc).

     

       253
       253
       +
             # install the wrapper, you get tools like objdump (same for any

     

       254
       254
       +
             # binaries of libc).

     

       255
       255
        
             printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages

     

       256
       256
       +
           ''

     

       256
       257
        
       

     

       258
       258
       +
           + optionalString propagateDoc ''

     

       257
       259
        
             ##

     

       258
       260
        
             ## Man page and info support

     

       259
       261
        
             ##

     

       260
       262
        
       

     

       261
       261
       -
             printWords ${bintools.info or ""} \

     

       262
       262
       -
               >> $info/nix-support/propagated-build-inputs

     

       263
       263
       -
             printWords ${bintools.man or ""} \

     

       264
       264
       -
               >> $man/nix-support/propagated-build-inputs

     

       263
       263
       +
             mkdir -p $man/nix-support $info/nix-support

     

       264
       264
       +
             printWords ${bintools.man or ""} >> $man/nix-support/propagated-build-inputs

     

       265
       265
       +
             printWords ${bintools.info or ""} >> $info/nix-support/propagated-build-inputs

     

       265
       266
        
           ''

     

       266
       267
        
       

     

       267
       268
        
           + ''

     

       268
       268
       -
       

     

       269
       269
        
             ##

     

       270
       270
        
             ## Hardening support

     

       271
       271
        
             ##

     
···

       293
       293
        
             ##

     

       294
       294
        
             ## Extra custom steps

     

       295
       295
        
             ##

     

       296
       296
       -
       

     

       297
       296
        
           ''

     

       297
       297
       +
       

     

       298
       298
        
           + extraBuildCommands;

     

       299
       299
        
       

     

       300
       300
        
         inherit dynamicLinker expand-response-params;

-5

pkgs/build-support/cc-wrapper/add-flags.sh

···

       9
       9
        
           NIX+CFLAGS_LINK

     

       10
       10
        
           NIX+CXXSTDLIB_COMPILE

     

       11
       11
        
           NIX+CXXSTDLIB_LINK

     

       12
       12
       -
           NIX+GNATFLAGS_COMPILE

     

       13
       12
        
       )

     

       14
       13
        
       var_templates_bool=(

     

       15
       14
        
           NIX+ENFORCE_NO_NATIVE

     
···

       49
       48
        
       

     

       50
       49
        
       if [ -e @out@/nix-support/cc-cflags ]; then

     

       51
       50
        
           NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE"

     

       52
       52
       -
       fi

     

       53
       53
       -
       

     

       54
       54
       -
       if [ -e @out@/nix-support/gnat-cflags ]; then

     

       55
       55
       -
           NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE"

     

       56
       51
        
       fi

     

       57
       52
        
       

     

       58
       53
        
       if [ -e @out@/nix-support/cc-ldflags ]; then

+12 -38

pkgs/build-support/cc-wrapper/default.nix

···

       5
       5
        
       # script that sets up the right environment variables so that the

     

       6
       6
        
       # compiler and the linker just "work".

     

       7
       7
        
       

     

       8
       8
       -
       { name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""

     

       8
       8
       +
       { name ? ""

     

       9
       9
       +
       , stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""

     

       9
       10
        
       , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell

     

       10
       10
       -
       , zlib ? null, extraPackages ? [], extraBuildCommands ? ""

     

       11
       11
       +
       , extraPackages ? [], extraBuildCommands ? ""

     

       11
       12
        
       , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null

     

       12
       13
        
       , buildPackages ? {}

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       with stdenvNoCC.lib;

     

       16
       17
        
       

     

       17
       17
       -
       assert nativeTools -> nativePrefix != "";

     

       18
       18
       +
       assert nativeTools -> !propagateDoc && nativePrefix != "";

     

       18
       19
        
       assert !nativeTools ->

     

       19
       20
        
         cc != null && coreutils != null && gnugrep != null;

     

       20
       21
        
       assert !(nativeLibc && noLibc);

     

       21
       22
        
       assert (noLibc || nativeLibc) == (libc == null);

     

       22
       22
       -
       

     

       23
       23
       -
       # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper.

     

       24
       24
       -
       assert cc.langVhdl or false -> zlib != null;

     

       25
       23
        
       

     

       26
       24
        
       let

     

       27
       25
        
         stdenv = stdenvNoCC;

     
···

       84
       82
        
       

     

       85
       83
        
         inherit targetPrefix infixSalt;

     

       86
       84
        
       

     

       87
       87
       -
         outputs = [ "out" "man" ];

     

       85
       85
       +
         outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ];

     

       88
       86
        
       

     

       89
       87
        
         passthru = {

     

       90
       88
        
           # "cc" is the generic name for a C compiler, but there is no one for package

     
···

       115
       113
        
           ''

     

       116
       114
        
             set -u

     

       117
       115
        
       

     

       118
       118
       -
             mkdir -p $out/bin $out/nix-support $man/nix-support

     

       116
       116
       +
             mkdir -p $out/bin $out/nix-support

     

       119
       117
        
       

     

       120
       118
        
             wrap() {

     

       121
       119
        
               local dst="$1"

     
···

       188
       186
        
       

     

       189
       187
        
           + optionalString cc.langGo or false ''

     

       190
       188
        
             wrap ${targetPrefix}gccgo ${./cc-wrapper.sh} $ccPath/${targetPrefix}gccgo

     

       191
       191
       -
           ''

     

       192
       192
       -
       

     

       193
       193
       -
           + optionalString cc.langAda or false ''

     

       194
       194
       -
             wrap ${targetPrefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${targetPrefix}gnatgcc

     

       195
       195
       -
             wrap ${targetPrefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatmake

     

       196
       196
       -
             wrap ${targetPrefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatbind

     

       197
       197
       -
             wrap ${targetPrefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${targetPrefix}gnatlink

     

       198
       198
       -
           ''

     

       199
       199
       -
       

     

       200
       200
       -
           + optionalString cc.langVhdl or false ''

     

       201
       201
       -
             ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl

     

       202
       189
        
           '';

     

       203
       190
        
       

     

       204
       191
        
         propagatedBuildInputs = [ bintools ];

     
···

       246
       233
        
           ''

     

       247
       234
        
       

     

       248
       235
        
           + optionalString (!nativeTools) ''

     

       249
       249
       -
       

     

       250
       236
        
             ##

     

       251
       237
        
             ## Initial CFLAGS

     

       252
       238
        
             ##

     
···

       261
       247
        
             fi

     

       262
       248
        
             ccLDFlags+=" -L${cc_solib}/lib"

     

       263
       249
        
             ccCFlags+=" -B${cc_solib}/lib"

     

       264
       264
       -
       

     

       265
       265
       -
             ${optionalString cc.langVhdl or false ''

     

       266
       266
       -
               ccLDFlags+=" -L${zlib.out}/lib"

     

       267
       267
       -
             ''}

     

       268
       268
       -
       

     

       269
       269
       -
             # Find the gcc libraries path (may work only without multilib).

     

       270
       270
       -
             ${optionalString cc.langAda or false ''

     

       271
       271
       -
               basePath=`echo ${cc_solib}/lib/*/*/*`

     

       272
       272
       -
               ccCFlags+=" -B$basePath -I$basePath/adainclude"

     

       273
       273
       -
               gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"

     

       274
       274
       -
               echo "$gnatCFlags" > $out/nix-support/gnat-cflags

     

       275
       275
       -
             ''}

     

       276
       250
        
       

     

       277
       251
        
             echo "$ccLDFlags" > $out/nix-support/cc-ldflags

     

       278
       252
        
             echo "$ccCFlags" > $out/nix-support/cc-cflags

     

       253
       253
       +
           ''

     

       279
       254
        
       

     

       255
       255
       +
           + optionalString propagateDoc ''

     

       280
       256
        
             ##

     

       281
       281
       -
             ## User env support

     

       257
       257
       +
             ## Man page and info support

     

       282
       258
        
             ##

     

       283
       259
        
       

     

       284
       284
       -
             # Propagate the wrapped cc so that if you install the wrapper,

     

       285
       285
       -
             # you get tools like gcov, the manpages, etc. as well (including

     

       286
       286
       -
             # for binutils and Glibc).

     

       260
       260
       +
             mkdir -p $man/nix-support $info/nix-support

     

       287
       261
        
             printWords ${cc.man or ""}  > $man/nix-support/propagated-user-env-packages

     

       262
       262
       +
             printWords ${cc.info or ""}  > $info/nix-support/propagated-user-env-packages

     

       288
       263
        
           ''

     

       289
       264
        
       

     

       290
       265
        
           + ''

     

       291
       291
       -
       

     

       292
       266
        
             ##

     

       293
       267
        
             ## Hardening support

     

       294
       268
        
             ##

     
···

       308
       282
        
             ##

     

       309
       283
        
             ## Extra custom steps

     

       310
       284
        
             ##

     

       311
       311
       -
       

     

       312
       285
        
           ''

     

       286
       286
       +
       

     

       313
       287
        
           + extraBuildCommands;

     

       314
       288
        
       

     

       315
       289
        
         inherit expand-response-params;

-122

pkgs/build-support/cc-wrapper/gnat-wrapper.sh

···

       1
       1
       -
       #! @shell@

     

       2
       2
       -
       set -eu -o pipefail +o posix

     

       3
       3
       -
       shopt -s nullglob

     

       4
       4
       -
       

     

       5
       5
       -
       if (( "${NIX_DEBUG:-0}" >= 7 )); then

     

       6
       6
       -
           set -x

     

       7
       7
       -
       fi

     

       8
       8
       -
       

     

       9
       9
       -
       # N.B. Gnat is not used during bootstrapping, so we don't need to

     

       10
       10
       -
       # worry about the old bash empty array `set -u` workarounds.

     

       11
       11
       -
       

     

       12
       12
       -
       path_backup="$PATH"

     

       13
       13
       -
       

     

       14
       14
       -
       # phase separation makes this look useless

     

       15
       15
       -
       # shellcheck disable=SC2157

     

       16
       16
       -
       if [ -n "@coreutils_bin@" ]; then

     

       17
       17
       -
           PATH="@coreutils_bin@/bin"

     

       18
       18
       -
       fi

     

       19
       19
       -
       

     

       20
       20
       -
       source @out@/nix-support/utils.sh

     

       21
       21
       -
       

     

       22
       22
       -
       if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then

     

       23
       23
       -
           source @out@/nix-support/add-flags.sh

     

       24
       24
       -
       fi

     

       25
       25
       -
       

     

       26
       26
       -
       

     

       27
       27
       -
       # Figure out if linker flags should be passed.  GCC prints annoying

     

       28
       28
       -
       # warnings when they are not needed.

     

       29
       29
       -
       dontLink=0

     

       30
       30
       -
       nonFlagArgs=0

     

       31
       31
       -
       

     

       32
       32
       -
       for i in "$@"; do

     

       33
       33
       -
           if [ "$i" = -c ]; then

     

       34
       34
       -
               dontLink=1

     

       35
       35
       -
           elif [ "$i" = -M ]; then

     

       36
       36
       -
               dontLink=1

     

       37
       37
       -
           elif [ "${i:0:1}" != - ]; then

     

       38
       38
       -
               nonFlagArgs=1

     

       39
       39
       -
           fi

     

       40
       40
       -
       done

     

       41
       41
       -
       

     

       42
       42
       -
       # If we pass a flag like -Wl, then gcc will call the linker unless it

     

       43
       43
       -
       # can figure out that it has to do something else (e.g., because of a

     

       44
       44
       -
       # "-c" flag).  So if no non-flag arguments are given, don't pass any

     

       45
       45
       -
       # linker flags.  This catches cases like "gcc" (should just print

     

       46
       46
       -
       # "gcc: no input files") and "gcc -v" (should print the version).

     

       47
       47
       -
       if [ "$nonFlagArgs" = 0 ]; then

     

       48
       48
       -
           dontLink=1

     

       49
       49
       -
       fi

     

       50
       50
       -
       

     

       51
       51
       -
       

     

       52
       52
       -
       # Optionally filter out paths not refering to the store.

     

       53
       53
       -
       params=("$@")

     

       54
       54
       -
       if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then

     

       55
       55
       -
           rest=()

     

       56
       56
       -
           for p in "${params[@]}"; do

     

       57
       57
       -
               if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then

     

       58
       58
       -
                   skip "${p:2}"

     

       59
       59
       -
               elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then

     

       60
       60
       -
                   skip "${p:2}"

     

       61
       61
       -
               elif [ "${p:0:4}" = -aI/ ] && badPath "${p:3}"; then

     

       62
       62
       -
                   skip "${p:2}"

     

       63
       63
       -
               elif [ "${p:0:4}" = -aO/ ] && badPath "${p:3}"; then

     

       64
       64
       -
                   skip "${p:2}"

     

       65
       65
       -
               else

     

       66
       66
       -
                   rest+=("$p")

     

       67
       67
       -
               fi

     

       68
       68
       -
           done

     

       69
       69
       -
           params=("${rest[@]}")

     

       70
       70
       -
       fi

     

       71
       71
       -
       

     

       72
       72
       -
       

     

       73
       73
       -
       # Clear march/mtune=native -- they bring impurity.

     

       74
       74
       -
       if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then

     

       75
       75
       -
           rest=()

     

       76
       76
       -
           for p in "${params[@]}"; do

     

       77
       77
       -
               if [[ "$p" = -m*=native ]]; then

     

       78
       78
       -
                   skip "$p"

     

       79
       79
       -
               else

     

       80
       80
       -
                   rest+=("$p")

     

       81
       81
       -
               fi

     

       82
       82
       -
           done

     

       83
       83
       -
           params=("${rest[@]}")

     

       84
       84
       -
       fi

     

       85
       85
       -
       

     

       86
       86
       -
       

     

       87
       87
       -
       # Add the flags for the GNAT compiler proper.

     

       88
       88
       -
       extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE)

     

       89
       89
       -
       extraBefore=()

     

       90
       90
       -
       

     

       91
       91
       -
       if [ "$(basename "$0")x" = "gnatmakex" ]; then

     

       92
       92
       -
         extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink ")

     

       93
       93
       -
       fi

     

       94
       94
       -
       

     

       95
       95
       -
       #if [ "$dontLink" != 1 ]; then

     

       96
       96
       -
       #    # Add the flags that should be passed to the linker (and prevent

     

       97
       97
       -
       #    # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again).

     

       98
       98
       -
       #    for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do

     

       99
       99
       -
       #        extraBefore+=("-largs" "$i")

     

       100
       100
       -
       #    done

     

       101
       101
       -
       #    for i in $NIX_@infixSalt@_LDFLAGS; do

     

       102
       102
       -
       #        if [ "${i:0:3}" = -L/ ]; then

     

       103
       103
       -
       #            extraAfter+=("$i")

     

       104
       104
       -
       #        else

     

       105
       105
       -
       #            extraAfter+=("-largs" "$i")

     

       106
       106
       -
       #        fi

     

       107
       107
       -
       #    done

     

       108
       108
       -
       #    export NIX_@infixSalt@_LDFLAGS_SET=1

     

       109
       109
       -
       #fi

     

       110
       110
       -
       

     

       111
       111
       -
       # Optionally print debug info.

     

       112
       112
       -
       if (( "${NIX_DEBUG:-0}" >= 1 )); then

     

       113
       113
       -
           echo "extra flags before to @prog@:" >&2

     

       114
       114
       -
           printf "  %q\n" "${extraBefore[@]}"  >&2

     

       115
       115
       -
           echo "original flags to @prog@:" >&2

     

       116
       116
       -
           printf "  %q\n" "${params[@]}" >&2

     

       117
       117
       -
           echo "extra flags after to @prog@:" >&2

     

       118
       118
       -
           printf "  %q\n" "${extraAfter[@]}" >&2

     

       119
       119
       -
       fi

     

       120
       120
       -
       

     

       121
       121
       -
       PATH="$path_backup"

     

       122
       122
       -
       exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"

-40

pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh

···

       1
       1
       -
       #! @shell@

     

       2
       2
       -
       set -eu -o pipefail +o posix

     

       3
       3
       -
       shopt -s nullglob

     

       4
       4
       -
       

     

       5
       5
       -
       if (( "${NIX_DEBUG:-0}" >= 7 )); then

     

       6
       6
       -
           set -x

     

       7
       7
       -
       fi

     

       8
       8
       -
       

     

       9
       9
       -
       # N.B. Gnat is not used during bootstrapping, so we don't need to

     

       10
       10
       -
       # worry about the old bash empty array `set -u` workarounds.

     

       11
       11
       -
       

     

       12
       12
       -
       # Add the flags for the GNAT compiler proper.

     

       13
       13
       -
       extraAfter=("--GCC=@out@/bin/gcc")

     

       14
       14
       -
       extraBefore=()

     

       15
       15
       -
       

     

       16
       16
       -
       ## Add the flags that should be passed to the linker (and prevent

     

       17
       17
       -
       ## `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again).

     

       18
       18
       -
       #for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do

     

       19
       19
       -
       #    extraBefore+=("-largs" "$i")

     

       20
       20
       -
       #done

     

       21
       21
       -
       #for i in $NIX_@infixSalt@_LDFLAGS; do

     

       22
       22
       -
       #    if [ "${i:0:3}" = -L/ ]; then

     

       23
       23
       -
       #        extraAfter+=("$i")

     

       24
       24
       -
       #    else

     

       25
       25
       -
       #        extraAfter+=("-largs" "$i")

     

       26
       26
       -
       #    fi

     

       27
       27
       -
       #done

     

       28
       28
       -
       #export NIX_@infixSalt@_LDFLAGS_SET=1

     

       29
       29
       -
       

     

       30
       30
       -
       # Optionally print debug info.

     

       31
       31
       -
       if (( "${NIX_DEBUG:-0}" >= 1 )); then

     

       32
       32
       -
           echo "extra flags before to @prog@:" >&2

     

       33
       33
       -
           printf "  %q\n" "${extraBefore[@]}"  >&2

     

       34
       34
       -
           echo "original flags to @prog@:" >&2

     

       35
       35
       -
           printf "  %q\n" "$@" >&2

     

       36
       36
       -
           echo "extra flags after to @prog@:" >&2

     

       37
       37
       -
           printf "  %q\n" "${extraAfter[@]}" >&2

     

       38
       38
       -
       fi

     

       39
       39
       -
       

     

       40
       40
       -
       exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}"

+5 -1

pkgs/build-support/cc-wrapper/utils.sh

···

       25
       25
        
           for infix in "${role_infixes[@]}"; do

     

       26
       26
        
               local inputVar="${var/+/${infix}}"

     

       27
       27
        
               if [ -v "$inputVar" ]; then

     

       28
       28
       -
                   let "${outputVar} |= ${!inputVar}"

     

       28
       28
       +
                   # "1" in the end makes `let` return success error code when

     

       29
       29
       +
                   # expression itself evaluates to zero.

     

       30
       30
       +
                   # We don't use `|| true` because that would silence actual

     

       31
       31
       +
                   # syntax errors from bad variable values.

     

       32
       32
       +
                   let "${outputVar} |= ${!inputVar:-0}" "1"

     

       29
       33
        
               fi

     

       30
       34
        
           done

     

       31
       35
        
       }

-28

pkgs/build-support/gcc-wrapper-old/add-flags

···

       1
       1
       -
       # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.

     

       2
       2
       -
       export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"

     

       3
       3
       -
       

     

       4
       4
       -
       if test -e @out@/nix-support/libc-cflags; then

     

       5
       5
       -
           export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"

     

       6
       6
       -
       fi

     

       7
       7
       -
       

     

       8
       8
       -
       if test -e @out@/nix-support/cc-cflags; then

     

       9
       9
       -
           export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE"

     

       10
       10
       -
       fi

     

       11
       11
       -
       

     

       12
       12
       -
       if test -e @out@/nix-support/gnat-cflags; then

     

       13
       13
       -
           export NIX_GNATFLAGS_COMPILE="$(cat @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE"

     

       14
       14
       -
       fi

     

       15
       15
       -
       

     

       16
       16
       -
       if test -e @out@/nix-support/libc-ldflags; then

     

       17
       17
       -
           export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)"

     

       18
       18
       -
       fi

     

       19
       19
       -
       

     

       20
       20
       -
       if test -e @out@/nix-support/cc-ldflags; then

     

       21
       21
       -
           export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/cc-ldflags)"

     

       22
       22
       -
       fi

     

       23
       23
       -
       

     

       24
       24
       -
       if test -e @out@/nix-support/libc-ldflags-before; then

     

       25
       25
       -
           export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"

     

       26
       26
       -
       fi

     

       27
       27
       -
       

     

       28
       28
       -
       export NIX_CC_WRAPPER_FLAGS_SET=1

-215

pkgs/build-support/gcc-wrapper-old/builder.sh

···

       1
       1
       -
       source $stdenv/setup

     

       2
       2
       -
       

     

       3
       3
       -
       

     

       4
       4
       -
       mkdir -p $out/bin

     

       5
       5
       -
       mkdir -p $out/nix-support

     

       6
       6
       -
       

     

       7
       7
       -
       

     

       8
       8
       -
       if test -z "$nativeLibc"; then

     

       9
       9
       -
           dynamicLinker="$libc/lib/$dynamicLinker"

     

       10
       10
       -
           echo $dynamicLinker > $out/nix-support/dynamic-linker

     

       11
       11
       -
       

     

       12
       12
       -
           if test -e $libc/lib/32/ld-linux.so.2; then

     

       13
       13
       -
               echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32

     

       14
       14
       -
           fi

     

       15
       15
       -
       

     

       16
       16
       -
           # The "-B$libc/lib/" flag is a quick hack to force gcc to link

     

       17
       17
       -
           # against the crt1.o from our own glibc, rather than the one in

     

       18
       18
       -
           # /usr/lib.  (This is only an issue when using an `impure'

     

       19
       19
       -
           # compiler/linker, i.e., one that searches /usr/lib and so on.)

     

       20
       20
       -
           #

     

       21
       21
       -
           # Unfortunately, setting -B appears to override the default search

     

       22
       22
       -
           # path. Thus, the gcc-specific "../includes-fixed" directory is

     

       23
       23
       -
           # now longer searched and glibc's <limits.h> header fails to

     

       24
       24
       -
           # compile, because it uses "#include_next <limits.h>" to find the

     

       25
       25
       -
           # limits.h file in ../includes-fixed. To remedy the problem,

     

       26
       26
       -
           # another -idirafter is necessary to add that directory again.

     

       27
       27
       -
           echo "-B$libc/lib/ -idirafter $libc_dev/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags

     

       28
       28
       -
       

     

       29
       29
       -
           echo "-L$libc/lib" > $out/nix-support/libc-ldflags

     

       30
       30
       -
       

     

       31
       31
       -
           # The dynamic linker is passed in `ldflagsBefore' to allow

     

       32
       32
       -
           # explicit overrides of the dynamic linker by callers to gcc/ld

     

       33
       33
       -
           # (the *last* value counts, so ours should come first).

     

       34
       34
       -
           echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before

     

       35
       35
       -
       fi

     

       36
       36
       -
       

     

       37
       37
       -
       if test -n "$nativeTools"; then

     

       38
       38
       -
           gccPath="$nativePrefix/bin"

     

       39
       39
       -
           ldPath="$nativePrefix/bin"

     

       40
       40
       -
       else

     

       41
       41
       -
           if test -e "$gcc/lib64"; then

     

       42
       42
       -
               gccLDFlags="$gccLDFlags -L$gcc_lib/lib64"

     

       43
       43
       -
           fi

     

       44
       44
       -
           gccLDFlags="$gccLDFlags -L$gcc_lib/lib"

     

       45
       45
       -
           if [ -n "$langVhdl" ]; then

     

       46
       46
       -
               gccLDFlags="$gccLDFlags -L$zlib/lib"

     

       47
       47
       -
           fi

     

       48
       48
       -
           echo "$gccLDFlags" > $out/nix-support/cc-ldflags

     

       49
       49
       -
       

     

       50
       50
       -
           # GCC shows $gcc/lib in `gcc -print-search-dirs', but not

     

       51
       51
       -
           # $gcc/lib64 (even though it does actually search there...)..

     

       52
       52
       -
           # This confuses libtool.  So add it to the compiler tool search

     

       53
       53
       -
           # path explicitly.

     

       54
       54
       -
           if test -e "$gcc/lib64"; then

     

       55
       55
       -
               gccCFlags="$gccCFlags -B$gcc/lib64"

     

       56
       56
       -
           fi

     

       57
       57
       -
       

     

       58
       58
       -
           # Find the gcc libraries path (may work only without multilib)

     

       59
       59
       -
           if [ -n "$langAda" ]; then

     

       60
       60
       -
               basePath=`echo $gcc/lib/*/*/*`

     

       61
       61
       -
               gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude"

     

       62
       62
       -
       

     

       63
       63
       -
               gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"

     

       64
       64
       -
               echo "$gnatCFlags" > $out/nix-support/gnat-cflags

     

       65
       65
       -
           fi

     

       66
       66
       -
           echo "$gccCFlags" > $out/nix-support/cc-cflags

     

       67
       67
       -
           

     

       68
       68
       -
           gccPath="$gcc/bin"

     

       69
       69
       -
           # On Illumos/Solaris we might prefer native ld

     

       70
       70
       -
           if test -n "$nativePrefix"; then

     

       71
       71
       -
             ldPath="$nativePrefix/bin"

     

       72
       72
       -
           else

     

       73
       73
       -
             ldPath="$binutils/bin"

     

       74
       74
       -
           fi;

     

       75
       75
       -
       fi

     

       76
       76
       -
       

     

       77
       77
       -
       

     

       78
       78
       -
       doSubstitute() {

     

       79
       79
       -
           local src=$1

     

       80
       80
       -
           local dst=$2

     

       81
       81
       -
           local ld="$ldPath/ld"

     

       82
       82
       -
           if $ld -V 2>&1 |grep Solaris; then

     

       83
       83
       -
             # Use Solaris specific linker wrapper

     

       84
       84
       -
             ld="$out/bin/ld-solaris"

     

       85
       85
       -
           fi

     

       86
       86
       -
           # Can't use substitute() here, because replace may not have been

     

       87
       87
       -
           # built yet (in the bootstrap).

     

       88
       88
       -
           sed \

     

       89
       89
       -
               -e "s^@out@^$out^g" \

     

       90
       90
       -
               -e "s^@shell@^$shell^g" \

     

       91
       91
       -
               -e "s^@gcc@^$gcc^g" \

     

       92
       92
       -
               -e "s^@gccProg@^$gccProg^g" \

     

       93
       93
       -
               -e "s^@gnatProg@^$gnatProg^g" \

     

       94
       94
       -
               -e "s^@gnatlinkProg@^$gnatlinkProg^g" \

     

       95
       95
       -
               -e "s^@binutils@^$binutils^g" \

     

       96
       96
       -
               -e "s^@coreutils@^$coreutils^g" \

     

       97
       97
       -
               -e "s^@libc@^$libc^g" \

     

       98
       98
       -
               -e "s^@libc_bin@^$libc_bin^g" \

     

       99
       99
       -
               -e "s^@ld@^$ld^g" \

     

       100
       100
       -
               < "$src" > "$dst" 

     

       101
       101
       -
       }

     

       102
       102
       -
       

     

       103
       103
       -
       

     

       104
       104
       -
       # Make wrapper scripts around gcc, g++, and gfortran.  Also make symlinks

     

       105
       105
       -
       # cc, c++, and f77.

     

       106
       106
       -
       mkGccWrapper() {

     

       107
       107
       -
           local dst=$1

     

       108
       108
       -
           local src=$2

     

       109
       109
       -
       

     

       110
       110
       -
           if ! test -f "$src"; then

     

       111
       111
       -
               echo "$src does not exist (skipping)"

     

       112
       112
       -
               return 1

     

       113
       113
       -
           fi

     

       114
       114
       -
       

     

       115
       115
       -
           gccProg="$src"

     

       116
       116
       -
           doSubstitute "$gccWrapper" "$dst"

     

       117
       117
       -
           chmod +x "$dst"

     

       118
       118
       -
       }

     

       119
       119
       -
       

     

       120
       120
       -
       mkGnatWrapper() {

     

       121
       121
       -
           local dst=$1

     

       122
       122
       -
           local src=$2

     

       123
       123
       -
       

     

       124
       124
       -
           if ! test -f "$src"; then

     

       125
       125
       -
               echo "$src does not exist (skipping)"

     

       126
       126
       -
               return 1

     

       127
       127
       -
           fi

     

       128
       128
       -
       

     

       129
       129
       -
           gnatProg="$src"

     

       130
       130
       -
           doSubstitute "$gnatWrapper" "$dst"

     

       131
       131
       -
           chmod +x "$dst"

     

       132
       132
       -
       }

     

       133
       133
       -
       

     

       134
       134
       -
       mkGnatLinkWrapper() {

     

       135
       135
       -
           local dst=$1

     

       136
       136
       -
           local src=$2

     

       137
       137
       -
       

     

       138
       138
       -
           if ! test -f "$src"; then

     

       139
       139
       -
               echo "$src does not exist (skipping)"

     

       140
       140
       -
               return 1

     

       141
       141
       -
           fi

     

       142
       142
       -
       

     

       143
       143
       -
           gnatlinkProg="$src"

     

       144
       144
       -
           doSubstitute "$gnatlinkWrapper" "$dst"

     

       145
       145
       -
           chmod +x "$dst"

     

       146
       146
       -
       }

     

       147
       147
       -
       

     

       148
       148
       -
       if mkGccWrapper $out/bin/gcc $gccPath/gcc

     

       149
       149
       -
       then

     

       150
       150
       -
           ln -sv gcc $out/bin/cc

     

       151
       151
       -
       fi

     

       152
       152
       -
       

     

       153
       153
       -
       if mkGccWrapper $out/bin/g++ $gccPath/g++

     

       154
       154
       -
       then

     

       155
       155
       -
           ln -sv g++ $out/bin/c++

     

       156
       156
       -
       fi

     

       157
       157
       -
       

     

       158
       158
       -
       mkGccWrapper $out/bin/cpp $gccPath/cpp || true

     

       159
       159
       -
       

     

       160
       160
       -
       if mkGccWrapper $out/bin/gfortran $gccPath/gfortran

     

       161
       161
       -
       then

     

       162
       162
       -
           ln -sv gfortran $out/bin/g77

     

       163
       163
       -
           ln -sv gfortran $out/bin/f77

     

       164
       164
       -
       fi

     

       165
       165
       -
       

     

       166
       166
       -
       mkGccWrapper $out/bin/gcj $gccPath/gcj || true

     

       167
       167
       -
       

     

       168
       168
       -
       mkGccWrapper $out/bin/gccgo $gccPath/gccgo || true

     

       169
       169
       -
       

     

       170
       170
       -
       mkGccWrapper $out/bin/gnatgcc $gccPath/gnatgcc || true

     

       171
       171
       -
       mkGnatWrapper $out/bin/gnatmake $gccPath/gnatmake || true

     

       172
       172
       -
       mkGnatWrapper $out/bin/gnatbind $gccPath/gnatbind || true

     

       173
       173
       -
       mkGnatLinkWrapper $out/bin/gnatlink $gccPath/gnatlink || true

     

       174
       174
       -
       

     

       175
       175
       -
       if [ -f $gccPath/ghdl ]; then

     

       176
       176
       -
           ln -sf $gccPath/ghdl $out/bin/ghdl

     

       177
       177
       -
       fi

     

       178
       178
       -
       

     

       179
       179
       -
       

     

       180
       180
       -
       # Create a symlink to as (the assembler).  This is useful when a

     

       181
       181
       -
       # gcc-wrapper is installed in a user environment, as it ensures that

     

       182
       182
       -
       # the right assembler is called.

     

       183
       183
       -
       ln -s $ldPath/as $out/bin/as

     

       184
       184
       -
       

     

       185
       185
       -
       

     

       186
       186
       -
       # Make a wrapper around the linker.

     

       187
       187
       -
       doSubstitute "$ldWrapper" "$out/bin/ld"

     

       188
       188
       -
       chmod +x "$out/bin/ld"

     

       189
       189
       -
       

     

       190
       190
       -
       # Copy solaris ld wrapper if needed

     

       191
       191
       -
       if $ldPath/ld -V 2>&1 |grep Solaris; then

     

       192
       192
       -
         # Use Solaris specific linker wrapper

     

       193
       193
       -
         sed -e "s^@ld@^$ldPath/ld^g" < "$ldSolarisWrapper" > "$out/bin/ld-solaris"

     

       194
       194
       -
         chmod +x "$out/bin/ld-solaris"

     

       195
       195
       -
       fi

     

       196
       196
       -
       

     

       197
       197
       -
       

     

       198
       198
       -
       # Emit a setup hook.  Also store the path to the original GCC and

     

       199
       199
       -
       # Glibc.

     

       200
       200
       -
       test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc

     

       201
       201
       -
       test -n "$libc" && echo $libc > $out/nix-support/orig-libc

     

       202
       202
       -
       

     

       203
       203
       -
       doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"

     

       204
       204
       -
       

     

       205
       205
       -
       doSubstitute "$setupHook" "$out/nix-support/setup-hook"

     

       206
       206
       -
       

     

       207
       207
       -
       cp -p $utils $out/nix-support/utils.sh

     

       208
       208
       -
       

     

       209
       209
       -
       

     

       210
       210
       -
       # Propagate the wrapped gcc so that if you install the wrapper, you get

     

       211
       211
       -
       # tools like gcov, the manpages, etc. as well (including for binutils

     

       212
       212
       -
       # and Glibc).

     

       213
       213
       -
       if test -z "$nativeTools"; then

     

       214
       214
       -
           printWords $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages

     

       215
       215
       -
       fi

-76

pkgs/build-support/gcc-wrapper-old/default.nix

···

       1
       1
       -
       # The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't

     

       2
       2
       -
       # know where the C library and standard header files are.  Therefore

     

       3
       3
       -
       # the compiler produced by that package cannot be installed directly

     

       4
       4
       -
       # in a user environment and used from the command line.  This

     

       5
       5
       -
       # stdenv.mkDerivation provides a wrapper that sets up the right environment

     

       6
       6
       -
       # variables so that the compiler and the linker just "work".

     

       7
       7
       -
       

     

       8
       8
       -
       { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? ""

     

       9
       9
       -
       , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell

     

       10
       10
       -
       , zlib ? null

     

       11
       11
       -
       , hostPlatform, targetPlatform, targetPackages

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       assert nativeTools -> nativePrefix != "";

     

       15
       15
       -
       assert !nativeTools -> gcc != null && binutils != null && coreutils != null;

     

       16
       16
       -
       assert !nativeLibc -> libc != null;

     

       17
       17
       -
       

     

       18
       18
       -
       # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper

     

       19
       19
       -
       assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null;

     

       20
       20
       -
       

     

       21
       21
       -
       let

     

       22
       22
       -
       

     

       23
       23
       -
         gccVersion = (builtins.parseDrvName gcc.name).version;

     

       24
       24
       -
         gccName = (builtins.parseDrvName gcc.name).name;

     

       25
       25
       -
       

     

       26
       26
       -
         langGo = if nativeTools then false else gcc ? langGo && gcc.langGo;

     

       27
       27
       -
       in

     

       28
       28
       -
       

     

       29
       29
       -
       stdenv.mkDerivation {

     

       30
       30
       -
         name =

     

       31
       31
       -
           (if name != "" then name else gccName + "-wrapper") +

     

       32
       32
       -
           (if gcc != null && gccVersion != "" then "-" + gccVersion else "");

     

       33
       33
       -
       

     

       34
       34
       -
         builder = ./builder.sh;

     

       35
       35
       -
         setupHook = ./setup-hook.sh;

     

       36
       36
       -
         gccWrapper = ./gcc-wrapper.sh;

     

       37
       37
       -
         gnatWrapper = ./gnat-wrapper.sh;

     

       38
       38
       -
         gnatlinkWrapper = ./gnatlink-wrapper.sh;

     

       39
       39
       -
         ldWrapper = ./ld-wrapper.sh;

     

       40
       40
       -
         ldSolarisWrapper = ./ld-solaris-wrapper.sh;

     

       41
       41
       -
         utils = ./utils.sh;

     

       42
       42
       -
         addFlags = ./add-flags;

     

       43
       43
       -
       

     

       44
       44
       -
         inherit nativeTools nativeLibc nativePrefix gcc;

     

       45
       45
       -
         gcc_lib = lib.getLib gcc;

     

       46
       46
       -
         libc = if nativeLibc then null else libc;

     

       47
       47
       -
         libc_dev = if nativeLibc then null else lib.getDev libc;

     

       48
       48
       -
         libc_bin = if nativeLibc then null else lib.getBin libc;

     

       49
       49
       -
         binutils = if nativeTools then null else lib.getBin binutils;

     

       50
       50
       -
         # The wrapper scripts use 'cat', so we may need coreutils

     

       51
       51
       -
         coreutils = if nativeTools then null else lib.getBin coreutils;

     

       52
       52
       -
       

     

       53
       53
       -
         langC = if nativeTools then true else gcc.langC;

     

       54
       54
       -
         langCC = if nativeTools then true else gcc.langCC;

     

       55
       55
       -
         langFortran = if nativeTools then false else gcc ? langFortran;

     

       56
       56
       -
         langAda = if nativeTools then false else gcc ? langAda && gcc.langAda;

     

       57
       57
       -
         langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl;

     

       58
       58
       -
         zlib = if gcc != null && gcc ? langVhdl then zlib else null;

     

       59
       59
       -
         shell = shell + shell.shellPath or "";

     

       60
       60
       -
       

     

       61
       61
       -
         preferLocalBuild = true;

     

       62
       62
       -
       

     

       63
       63
       -
         meta =

     

       64
       64
       -
           let gcc_ = if gcc != null then gcc else {}; in

     

       65
       65
       -
           (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) //

     

       66
       66
       -
           { description =

     

       67
       67
       -
               stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_

     

       68
       68
       -
               + " (wrapper script)";

     

       69
       69
       -
           };

     

       70
       70
       -
       

     

       71
       71
       -
         # The dynamic linker has different names on different platforms.

     

       72
       72
       -
         dynamicLinker =

     

       73
       73
       -
           if !nativeLibc then

     

       74
       74
       -
             targetPackages.stdenv.cc.bintools.dynamicLinker

     

       75
       75
       -
           else "";

     

       76
       76
       -
       }

-146

pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh

···

       1
       1
       -
       #! @shell@ -e

     

       2
       2
       -
       

     

       3
       3
       -
       if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then

     

       4
       4
       -
           source "$NIX_CC_WRAPPER_START_HOOK"

     

       5
       5
       -
       fi

     

       6
       6
       -
       

     

       7
       7
       -
       if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then

     

       8
       8
       -
           source @out@/nix-support/add-flags.sh

     

       9
       9
       -
       fi

     

       10
       10
       -
       

     

       11
       11
       -
       source @out@/nix-support/utils.sh

     

       12
       12
       -
       

     

       13
       13
       -
       

     

       14
       14
       -
       # Figure out if linker flags should be passed.  GCC prints annoying

     

       15
       15
       -
       # warnings when they are not needed.

     

       16
       16
       -
       dontLink=0

     

       17
       17
       -
       getVersion=0

     

       18
       18
       -
       nonFlagArgs=0

     

       19
       19
       -
       

     

       20
       20
       -
       for i in "$@"; do

     

       21
       21
       -
           if [ "$i" = -c ]; then

     

       22
       22
       -
               dontLink=1

     

       23
       23
       -
           elif [ "$i" = -S ]; then

     

       24
       24
       -
               dontLink=1

     

       25
       25
       -
           elif [ "$i" = -E ]; then

     

       26
       26
       -
               dontLink=1

     

       27
       27
       -
           elif [ "$i" = -E ]; then

     

       28
       28
       -
               dontLink=1

     

       29
       29
       -
           elif [ "$i" = -M ]; then

     

       30
       30
       -
               dontLink=1

     

       31
       31
       -
           elif [ "$i" = -MM ]; then

     

       32
       32
       -
               dontLink=1

     

       33
       33
       -
           elif [ "$i" = -x ]; then

     

       34
       34
       -
               # At least for the cases c-header or c++-header we should set dontLink.

     

       35
       35
       -
               # I expect no one use -x other than making precompiled headers.

     

       36
       36
       -
               dontLink=1

     

       37
       37
       -
           elif [ "${i:0:1}" != - ]; then

     

       38
       38
       -
               nonFlagArgs=1

     

       39
       39
       -
           elif [ "$i" = -m32 ]; then

     

       40
       40
       -
               if [ -e @out@/nix-support/dynamic-linker-m32 ]; then

     

       41
       41
       -
                   NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"

     

       42
       42
       -
               fi

     

       43
       43
       -
           fi

     

       44
       44
       -
       done

     

       45
       45
       -
       

     

       46
       46
       -
       # If we pass a flag like -Wl, then gcc will call the linker unless it

     

       47
       47
       -
       # can figure out that it has to do something else (e.g., because of a

     

       48
       48
       -
       # "-c" flag).  So if no non-flag arguments are given, don't pass any

     

       49
       49
       -
       # linker flags.  This catches cases like "gcc" (should just print

     

       50
       50
       -
       # "gcc: no input files") and "gcc -v" (should print the version).

     

       51
       51
       -
       if [ "$nonFlagArgs" = 0 ]; then

     

       52
       52
       -
           dontLink=1

     

       53
       53
       -
       fi

     

       54
       54
       -
       

     

       55
       55
       -
       

     

       56
       56
       -
       # Optionally filter out paths not refering to the store.

     

       57
       57
       -
       params=("$@")

     

       58
       58
       -
       if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then

     

       59
       59
       -
           rest=()

     

       60
       60
       -
           n=0

     

       61
       61
       -
           while [ $n -lt ${#params[*]} ]; do

     

       62
       62
       -
               p=${params[n]}

     

       63
       63
       -
               p2=${params[$((n+1))]}

     

       64
       64
       -
               if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then

     

       65
       65
       -
                   skip $p

     

       66
       66
       -
               elif [ "$p" = -L ] && badPath "$p2"; then

     

       67
       67
       -
                   n=$((n + 1)); skip $p2

     

       68
       68
       -
               elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then

     

       69
       69
       -
                   skip $p

     

       70
       70
       -
               elif [ "$p" = -I ] && badPath "$p2"; then

     

       71
       71
       -
                   n=$((n + 1)); skip $p2

     

       72
       72
       -
               elif [ "$p" = -isystem ] && badPath "$p2"; then

     

       73
       73
       -
                   n=$((n + 1)); skip $p2

     

       74
       74
       -
               else

     

       75
       75
       -
                   rest=("${rest[@]}" "$p")

     

       76
       76
       -
               fi

     

       77
       77
       -
               n=$((n + 1))

     

       78
       78
       -
           done

     

       79
       79
       -
           params=("${rest[@]}")

     

       80
       80
       -
       fi

     

       81
       81
       -
       

     

       82
       82
       -
       

     

       83
       83
       -
       # Add the flags for the C compiler proper.

     

       84
       84
       -
       extraAfter=($NIX_CFLAGS_COMPILE)

     

       85
       85
       -
       extraBefore=()

     

       86
       86
       -
       

     

       87
       87
       -
       # When enforcing purity, pretend gcc can't find the current date and

     

       88
       88
       -
       # time

     

       89
       89
       -
       if [ "$NIX_ENFORCE_PURITY" = 1 ]; then

     

       90
       90
       -
           extraAfter+=('-D__DATE__="Jan 01 1970"'

     

       91
       91
       -
               '-D__TIME__="00:00:01"'

     

       92
       92
       -
               )

     

       93
       93
       -
       fi

     

       94
       94
       -
       

     

       95
       95
       -
       

     

       96
       96
       -
       if [ "$dontLink" != 1 ]; then

     

       97
       97
       -
       

     

       98
       98
       -
           # Add the flags that should only be passed to the compiler when

     

       99
       99
       -
           # linking.

     

       100
       100
       -
           extraAfter+=($NIX_CFLAGS_LINK)

     

       101
       101
       -
       

     

       102
       102
       -
           # Add the flags that should be passed to the linker (and prevent

     

       103
       103
       -
           # `ld-wrapper' from adding NIX_LDFLAGS again).

     

       104
       104
       -
           for i in $NIX_LDFLAGS_BEFORE; do

     

       105
       105
       -
               extraBefore=(${extraBefore[@]} "-Wl,$i")

     

       106
       106
       -
           done

     

       107
       107
       -
           for i in $NIX_LDFLAGS; do

     

       108
       108
       -
               if [ "${i:0:3}" = -L/ ]; then

     

       109
       109
       -
                   extraAfter+=("$i")

     

       110
       110
       -
               else

     

       111
       111
       -
                   extraAfter+=("-Wl,$i")

     

       112
       112
       -
               fi

     

       113
       113
       -
           done

     

       114
       114
       -
           export NIX_LDFLAGS_SET=1

     

       115
       115
       -
       fi

     

       116
       116
       -
       

     

       117
       117
       -
       # As a very special hack, if the arguments are just `-v', then don't

     

       118
       118
       -
       # add anything.  This is to prevent `gcc -v' (which normally prints

     

       119
       119
       -
       # out the version number and returns exit code 0) from printing out

     

       120
       120
       -
       # `No input files specified' and returning exit code 1.

     

       121
       121
       -
       if [ "$*" = -v ]; then

     

       122
       122
       -
           extraAfter=()

     

       123
       123
       -
           extraBefore=()

     

       124
       124
       -
       fi

     

       125
       125
       -
       

     

       126
       126
       -
       # Optionally print debug info.

     

       127
       127
       -
       if [ -n "$NIX_DEBUG" ]; then

     

       128
       128
       -
         echo "original flags to @prog@:" >&2

     

       129
       129
       -
         for i in "${params[@]}"; do

     

       130
       130
       -
             echo "  $i" >&2

     

       131
       131
       -
         done

     

       132
       132
       -
         echo "extraBefore flags to @prog@:" >&2

     

       133
       133
       -
         for i in ${extraBefore[@]}; do

     

       134
       134
       -
             echo "  $i" >&2

     

       135
       135
       -
         done

     

       136
       136
       -
         echo "extraAfter flags to @prog@:" >&2

     

       137
       137
       -
         for i in ${extraAfter[@]}; do

     

       138
       138
       -
             echo "  $i" >&2

     

       139
       139
       -
         done

     

       140
       140
       -
       fi

     

       141
       141
       -
       

     

       142
       142
       -
       if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then

     

       143
       143
       -
           source "$NIX_CC_WRAPPER_EXEC_HOOK"

     

       144
       144
       -
       fi

     

       145
       145
       -
       

     

       146
       146
       -
       exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}"

-147

pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh

···

       1
       1
       -
       #! @shell@ -e

     

       2
       2
       -
       

     

       3
       3
       -
       if test -n "$NIX_CC_WRAPPER_START_HOOK"; then

     

       4
       4
       -
           source "$NIX_CC_WRAPPER_START_HOOK"

     

       5
       5
       -
       fi

     

       6
       6
       -
       

     

       7
       7
       -
       if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then

     

       8
       8
       -
           source @out@/nix-support/add-flags.sh

     

       9
       9
       -
       fi

     

       10
       10
       -
       

     

       11
       11
       -
       source @out@/nix-support/utils.sh

     

       12
       12
       -
       

     

       13
       13
       -
       

     

       14
       14
       -
       # Figure out if linker flags should be passed.  GCC prints annoying

     

       15
       15
       -
       # warnings when they are not needed.

     

       16
       16
       -
       dontLink=0

     

       17
       17
       -
       getVersion=0

     

       18
       18
       -
       nonFlagArgs=0

     

       19
       19
       -
       

     

       20
       20
       -
       for i in "$@"; do

     

       21
       21
       -
           if test "$i" = "-c"; then

     

       22
       22
       -
               dontLink=1

     

       23
       23
       -
           elif test "$i" = "-S"; then

     

       24
       24
       -
               dontLink=1

     

       25
       25
       -
           elif test "$i" = "-E"; then

     

       26
       26
       -
               dontLink=1

     

       27
       27
       -
           elif test "$i" = "-E"; then

     

       28
       28
       -
               dontLink=1

     

       29
       29
       -
           elif test "$i" = "-M"; then

     

       30
       30
       -
               dontLink=1

     

       31
       31
       -
           elif test "$i" = "-MM"; then

     

       32
       32
       -
               dontLink=1

     

       33
       33
       -
           elif test "$i" = "-x"; then

     

       34
       34
       -
               # At least for the cases c-header or c++-header we should set dontLink.

     

       35
       35
       -
               # I expect no one use -x other than making precompiled headers.

     

       36
       36
       -
               dontLink=1

     

       37
       37
       -
           elif test "${i:0:1}" != "-"; then

     

       38
       38
       -
               nonFlagArgs=1

     

       39
       39
       -
           elif test "$i" = "-m32"; then

     

       40
       40
       -
               if test -e @out@/nix-support/dynamic-linker-m32; then

     

       41
       41
       -
                   NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"

     

       42
       42
       -
               fi

     

       43
       43
       -
           fi

     

       44
       44
       -
       done

     

       45
       45
       -
       

     

       46
       46
       -
       # If we pass a flag like -Wl, then gcc will call the linker unless it

     

       47
       47
       -
       # can figure out that it has to do something else (e.g., because of a

     

       48
       48
       -
       # "-c" flag).  So if no non-flag arguments are given, don't pass any

     

       49
       49
       -
       # linker flags.  This catches cases like "gcc" (should just print

     

       50
       50
       -
       # "gcc: no input files") and "gcc -v" (should print the version).

     

       51
       51
       -
       if test "$nonFlagArgs" = "0"; then

     

       52
       52
       -
           dontLink=1

     

       53
       53
       -
       fi

     

       54
       54
       -
       

     

       55
       55
       -
       

     

       56
       56
       -
       # Optionally filter out paths not refering to the store.

     

       57
       57
       -
       params=("$@")

     

       58
       58
       -
       if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then

     

       59
       59
       -
           rest=()

     

       60
       60
       -
           n=0

     

       61
       61
       -
           while test $n -lt ${#params[*]}; do

     

       62
       62
       -
               p=${params[n]}

     

       63
       63
       -
               p2=${params[$((n+1))]}

     

       64
       64
       -
               if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then

     

       65
       65
       -
                   skip $p

     

       66
       66
       -
               elif test "$p" = "-L" && badPath "$p2"; then

     

       67
       67
       -
                   n=$((n + 1)); skip $p2

     

       68
       68
       -
               elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then

     

       69
       69
       -
                   skip $p

     

       70
       70
       -
               elif test "$p" = "-I" && badPath "$p2"; then

     

       71
       71
       -
                   n=$((n + 1)); skip $p2

     

       72
       72
       -
               elif test "$p" = "-isystem" && badPath "$p2"; then

     

       73
       73
       -
                   n=$((n + 1)); skip $p2

     

       74
       74
       -
               else

     

       75
       75
       -
                   rest=("${rest[@]}" "$p")

     

       76
       76
       -
               fi

     

       77
       77
       -
               n=$((n + 1))

     

       78
       78
       -
           done

     

       79
       79
       -
           params=("${rest[@]}")

     

       80
       80
       -
       fi

     

       81
       81
       -
       

     

       82
       82
       -
       

     

       83
       83
       -
       # Add the flags for the C compiler proper.

     

       84
       84
       -
       extraAfter=($NIX_CFLAGS_COMPILE)

     

       85
       85
       -
       extraBefore=()

     

       86
       86
       -
       

     

       87
       87
       -
       if test "$dontLink" != "1"; then

     

       88
       88
       -
       

     

       89
       89
       -
           # Add the flags that should only be passed to the compiler when

     

       90
       90
       -
           # linking.

     

       91
       91
       -
           extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK)

     

       92
       92
       -
       

     

       93
       93
       -
           # Add the flags that should be passed to the linker (and prevent

     

       94
       94
       -
           # `ld-wrapper' from adding NIX_LDFLAGS again).

     

       95
       95
       -
           for i in $NIX_LDFLAGS_BEFORE; do

     

       96
       96
       -
               extraBefore=(${extraBefore[@]} "-Wl,$i")

     

       97
       97
       -
           done

     

       98
       98
       -
           for i in $NIX_LDFLAGS; do

     

       99
       99
       -
       	if test "${i:0:3}" = "-L/"; then

     

       100
       100
       -
       	    extraAfter=(${extraAfter[@]} "$i")

     

       101
       101
       -
       	else

     

       102
       102
       -
       	    extraAfter=(${extraAfter[@]} "-Wl,$i")

     

       103
       103
       -
       	fi

     

       104
       104
       -
           done

     

       105
       105
       -
           export NIX_LDFLAGS_SET=1

     

       106
       106
       -
       fi

     

       107
       107
       -
       

     

       108
       108
       -
       # As a very special hack, if the arguments are just `-v', then don't

     

       109
       109
       -
       # add anything.  This is to prevent `gcc -v' (which normally prints

     

       110
       110
       -
       # out the version number and returns exit code 0) from printing out

     

       111
       111
       -
       # `No input files specified' and returning exit code 1.

     

       112
       112
       -
       if test "$*" = "-v"; then

     

       113
       113
       -
           extraAfter=()

     

       114
       114
       -
           extraBefore=()

     

       115
       115
       -
       fi    

     

       116
       116
       -
       

     

       117
       117
       -
       # Optionally print debug info.

     

       118
       118
       -
       if test "$NIX_DEBUG" = "1"; then

     

       119
       119
       -
         echo "original flags to @gccProg@:" >&2

     

       120
       120
       -
         for i in "${params[@]}"; do

     

       121
       121
       -
             echo "  $i" >&2

     

       122
       122
       -
         done

     

       123
       123
       -
         echo "extraBefore flags to @gccProg@:" >&2

     

       124
       124
       -
         for i in ${extraBefore[@]}; do

     

       125
       125
       -
             echo "  $i" >&2

     

       126
       126
       -
         done

     

       127
       127
       -
         echo "extraAfter flags to @gccProg@:" >&2

     

       128
       128
       -
         for i in ${extraAfter[@]}; do

     

       129
       129
       -
             echo "  $i" >&2

     

       130
       130
       -
         done

     

       131
       131
       -
       fi

     

       132
       132
       -
       

     

       133
       133
       -
       if test -n "$NIX_CC_WRAPPER_EXEC_HOOK"; then

     

       134
       134
       -
           source "$NIX_CC_WRAPPER_EXEC_HOOK"

     

       135
       135
       -
       fi

     

       136
       136
       -
       

     

       137
       137
       -
       

     

       138
       138
       -
       # Call the real `gcc'.  Filter out warnings from stderr about unused

     

       139
       139
       -
       # `-B' flags, since they confuse some programs.  Deep bash magic to

     

       140
       140
       -
       # apply grep to stderr (by swapping stdin/stderr twice).

     

       141
       141
       -
       if test -z "$NIX_CC_NEEDS_GREP"; then

     

       142
       142
       -
           @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}

     

       143
       143
       -
       else

     

       144
       144
       -
           (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \

     

       145
       145
       -
               | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-

     

       146
       146
       -
           exit $?

     

       147
       147
       -
       fi

-113

pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh

···

       1
       1
       -
       #! @shell@ -e

     

       2
       2
       -
       

     

       3
       3
       -
       if test -n "$NIX_GNAT_WRAPPER_START_HOOK"; then

     

       4
       4
       -
           source "$NIX_GNAT_WRAPPER_START_HOOK"

     

       5
       5
       -
       fi

     

       6
       6
       -
       

     

       7
       7
       -
       if test -z "$NIX_GNAT_WRAPPER_FLAGS_SET"; then

     

       8
       8
       -
           source @out@/nix-support/add-flags.sh

     

       9
       9
       -
       fi

     

       10
       10
       -
       

     

       11
       11
       -
       source @out@/nix-support/utils.sh

     

       12
       12
       -
       

     

       13
       13
       -
       

     

       14
       14
       -
       # Figure out if linker flags should be passed.  GCC prints annoying

     

       15
       15
       -
       # warnings when they are not needed.

     

       16
       16
       -
       dontLink=0

     

       17
       17
       -
       getVersion=0

     

       18
       18
       -
       nonFlagArgs=0

     

       19
       19
       -
       

     

       20
       20
       -
       for i in "$@"; do

     

       21
       21
       -
           if test "$i" = "-c"; then

     

       22
       22
       -
               dontLink=1

     

       23
       23
       -
           elif test "$i" = "-M"; then

     

       24
       24
       -
               dontLink=1

     

       25
       25
       -
           elif test "${i:0:1}" != "-"; then

     

       26
       26
       -
               nonFlagArgs=1

     

       27
       27
       -
           elif test "$i" = "-m32"; then

     

       28
       28
       -
               if test -e @out@/nix-support/dynamic-linker-m32; then

     

       29
       29
       -
                   NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"

     

       30
       30
       -
               fi

     

       31
       31
       -
           fi

     

       32
       32
       -
       done

     

       33
       33
       -
       

     

       34
       34
       -
       # If we pass a flag like -Wl, then gcc will call the linker unless it

     

       35
       35
       -
       # can figure out that it has to do something else (e.g., because of a

     

       36
       36
       -
       # "-c" flag).  So if no non-flag arguments are given, don't pass any

     

       37
       37
       -
       # linker flags.  This catches cases like "gcc" (should just print

     

       38
       38
       -
       # "gcc: no input files") and "gcc -v" (should print the version).

     

       39
       39
       -
       if test "$nonFlagArgs" = "0"; then

     

       40
       40
       -
           dontLink=1

     

       41
       41
       -
       fi

     

       42
       42
       -
       

     

       43
       43
       -
       

     

       44
       44
       -
       # Optionally filter out paths not refering to the store.

     

       45
       45
       -
       params=("$@")

     

       46
       46
       -
       if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then

     

       47
       47
       -
           rest=()

     

       48
       48
       -
           n=0

     

       49
       49
       -
           while test $n -lt ${#params[*]}; do

     

       50
       50
       -
               p=${params[n]}

     

       51
       51
       -
               p2=${params[$((n+1))]}

     

       52
       52
       -
               if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then

     

       53
       53
       -
                   skip $p

     

       54
       54
       -
               elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then

     

       55
       55
       -
                   skip $p

     

       56
       56
       -
               elif test "${p:0:4}" = "-aI/" && badPath "${p:3}"; then

     

       57
       57
       -
                   skip $p

     

       58
       58
       -
               elif test "${p:0:4}" = "-aO/" && badPath "${p:3}"; then

     

       59
       59
       -
                   skip $p

     

       60
       60
       -
               else

     

       61
       61
       -
                   rest=("${rest[@]}" "$p")

     

       62
       62
       -
               fi

     

       63
       63
       -
               n=$((n + 1))

     

       64
       64
       -
           done

     

       65
       65
       -
           params=("${rest[@]}")

     

       66
       66
       -
       fi

     

       67
       67
       -
       

     

       68
       68
       -
       

     

       69
       69
       -
       # Add the flags for the GNAT compiler proper.

     

       70
       70
       -
       extraAfter=($NIX_GNATFLAGS_COMPILE)

     

       71
       71
       -
       extraBefore=()

     

       72
       72
       -
       

     

       73
       73
       -
       if [ "`basename $0`x" = "gnatmakex" ]; then

     

       74
       74
       -
         extraBefore=("--GNATBIND=@out@/bin/gnatbind --GNATLINK=@out@/bin/gnatlink ")

     

       75
       75
       -
       fi

     

       76
       76
       -
       

     

       77
       77
       -
       # Add the flags that should be passed to the linker (and prevent

     

       78
       78
       -
       # `ld-wrapper' from adding NIX_LDFLAGS again).

     

       79
       79
       -
       #for i in $NIX_LDFLAGS_BEFORE; do

     

       80
       80
       -
       #    extraBefore=(${extraBefore[@]} "-largs $i")

     

       81
       81
       -
       #done

     

       82
       82
       -
       

     

       83
       83
       -
       # Optionally print debug info.

     

       84
       84
       -
       if test "$NIX_DEBUG" = "1"; then

     

       85
       85
       -
         echo "original flags to @gnatProg@:" >&2

     

       86
       86
       -
         for i in "${params[@]}"; do

     

       87
       87
       -
             echo "  $i" >&2

     

       88
       88
       -
         done

     

       89
       89
       -
         echo "extraBefore flags to @gnatProg@:" >&2

     

       90
       90
       -
         for i in ${extraBefore[@]}; do

     

       91
       91
       -
             echo "  $i" >&2

     

       92
       92
       -
         done

     

       93
       93
       -
         echo "extraAfter flags to @gnatProg@:" >&2

     

       94
       94
       -
         for i in ${extraAfter[@]}; do

     

       95
       95
       -
             echo "  $i" >&2

     

       96
       96
       -
         done

     

       97
       97
       -
       fi

     

       98
       98
       -
       

     

       99
       99
       -
       if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then

     

       100
       100
       -
           source "$NIX_GNAT_WRAPPER_EXEC_HOOK"

     

       101
       101
       -
       fi

     

       102
       102
       -
       

     

       103
       103
       -
       

     

       104
       104
       -
       # Call the real `gcc'.  Filter out warnings from stderr about unused

     

       105
       105
       -
       # `-B' flags, since they confuse some programs.  Deep bash magic to

     

       106
       106
       -
       # apply grep to stderr (by swapping stdin/stderr twice).

     

       107
       107
       -
       if test -z "$NIX_GNAT_NEEDS_GREP"; then

     

       108
       108
       -
           @gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}

     

       109
       109
       -
       else

     

       110
       110
       -
           (@gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \

     

       111
       111
       -
               | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-

     

       112
       112
       -
           exit $?

     

       113
       113
       -
       fi

-43

pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh

···

       1
       1
       -
       #! @shell@ -e

     

       2
       2
       -
       

     

       3
       3
       -
       # Add the flags for the GNAT compiler proper.

     

       4
       4
       -
       extraAfter="--GCC=@out@/bin/gcc"

     

       5
       5
       -
       extraBefore=()

     

       6
       6
       -
       

     

       7
       7
       -
       # Add the flags that should be passed to the linker (and prevent

     

       8
       8
       -
       # `ld-wrapper' from adding NIX_LDFLAGS again).

     

       9
       9
       -
       #for i in $NIX_LDFLAGS_BEFORE; do

     

       10
       10
       -
       #    extraBefore=(${extraBefore[@]} "-largs $i")

     

       11
       11
       -
       #done

     

       12
       12
       -
       

     

       13
       13
       -
       # Optionally print debug info.

     

       14
       14
       -
       if test "$NIX_DEBUG" = "1"; then

     

       15
       15
       -
         echo "original flags to @gnatlinkProg@:" >&2

     

       16
       16
       -
         for i in "$@"; do

     

       17
       17
       -
             echo "  $i" >&2

     

       18
       18
       -
         done

     

       19
       19
       -
         echo "extraBefore flags to @gnatlinkProg@:" >&2

     

       20
       20
       -
         for i in ${extraBefore[@]}; do

     

       21
       21
       -
             echo "  $i" >&2

     

       22
       22
       -
         done

     

       23
       23
       -
         echo "extraAfter flags to @gnatlinkProg@:" >&2

     

       24
       24
       -
         for i in ${extraAfter[@]}; do

     

       25
       25
       -
             echo "  $i" >&2

     

       26
       26
       -
         done

     

       27
       27
       -
       fi

     

       28
       28
       -
       

     

       29
       29
       -
       if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then

     

       30
       30
       -
           source "$NIX_GNAT_WRAPPER_EXEC_HOOK"

     

       31
       31
       -
       fi

     

       32
       32
       -
       

     

       33
       33
       -
       

     

       34
       34
       -
       # Call the real `gcc'.  Filter out warnings from stderr about unused

     

       35
       35
       -
       # `-B' flags, since they confuse some programs.  Deep bash magic to

     

       36
       36
       -
       # apply grep to stderr (by swapping stdin/stderr twice).

     

       37
       37
       -
       if test -z "$NIX_GNAT_NEEDS_GREP"; then

     

       38
       38
       -
           @gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]}

     

       39
       39
       -
       else

     

       40
       40
       -
           (@gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} 3>&2 2>&1 1>&3- \

     

       41
       41
       -
               | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-

     

       42
       42
       -
           exit $?

     

       43
       43
       -
       fi

-40

pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh

···

       1
       1
       -
       #!@shell@

     

       2
       2
       -
       

     

       3
       3
       -
       set -e

     

       4
       4
       -
       set -u

     

       5
       5
       -
       

     

       6
       6
       -
       # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'(

     

       7
       7
       -
       # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3

     

       8
       8
       -
       #   but still no success.

     

       9
       9
       -
       cmd="@ld@ -z ignore"

     

       10
       10
       -
       

     

       11
       11
       -
       args=("$@");

     

       12
       12
       -
       

     

       13
       13
       -
       # This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library.

     

       14
       14
       -
       # GNU binutils does not have this problem:

     

       15
       15
       -
       #   http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter

     

       16
       16
       -
       i=0;

     

       17
       17
       -
       while [[ $i -lt $# ]]; do

     

       18
       18
       -
           case "${args[$i]}" in

     

       19
       19
       -
               -L)  cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;;

     

       20
       20
       -
               -L*) cmd="$cmd ${args[$i]}" ;;

     

       21
       21
       -
               *)   ;;

     

       22
       22
       -
           esac

     

       23
       23
       -
           i=($i+1);

     

       24
       24
       -
       done

     

       25
       25
       -
       

     

       26
       26
       -
       i=0;

     

       27
       27
       -
       while [[ $i -lt $# ]]; do

     

       28
       28
       -
           case "${args[$i]}" in

     

       29
       29
       -
               -L)  i=($i+1); ;;

     

       30
       30
       -
               -L*) ;;

     

       31
       31
       -
               *)   cmd="$cmd ${args[$i]}" ;;

     

       32
       32
       -
           esac

     

       33
       33
       -
           i=($i+1);

     

       34
       34
       -
       done

     

       35
       35
       -
       

     

       36
       36
       -
       # Trace:

     

       37
       37
       -
       set -x

     

       38
       38
       -
       exec $cmd

     

       39
       39
       -
       

     

       40
       40
       -
       exit 0

-166

pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh

···

       1
       1
       -
       #! @shell@ -e

     

       2
       2
       -
       

     

       3
       3
       -
       if test -n "$NIX_LD_WRAPPER_START_HOOK"; then

     

       4
       4
       -
           source "$NIX_LD_WRAPPER_START_HOOK"

     

       5
       5
       -
       fi

     

       6
       6
       -
       

     

       7
       7
       -
       if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then

     

       8
       8
       -
           source @out@/nix-support/add-flags.sh

     

       9
       9
       -
       fi

     

       10
       10
       -
       

     

       11
       11
       -
       source @out@/nix-support/utils.sh

     

       12
       12
       -
       

     

       13
       13
       -
       

     

       14
       14
       -
       # Optionally filter out paths not refering to the store.

     

       15
       15
       -
       params=("$@")

     

       16
       16
       -
       if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \

     

       17
       17
       -
               -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then

     

       18
       18
       -
           rest=()

     

       19
       19
       -
           n=0

     

       20
       20
       -
           while test $n -lt ${#params[*]}; do

     

       21
       21
       -
               p=${params[n]}

     

       22
       22
       -
               p2=${params[$((n+1))]}

     

       23
       23
       -
               if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then

     

       24
       24
       -
                   skip $p

     

       25
       25
       -
               elif test "$p" = "-L" && badPath "$p2"; then

     

       26
       26
       -
                   n=$((n + 1)); skip $p2

     

       27
       27
       -
               elif test "$p" = "-rpath" && badPath "$p2"; then

     

       28
       28
       -
                   n=$((n + 1)); skip $p2

     

       29
       29
       -
               elif test "$p" = "-dynamic-linker" && badPath "$p2"; then

     

       30
       30
       -
                   n=$((n + 1)); skip $p2

     

       31
       31
       -
               elif test "${p:0:1}" = "/" && badPath "$p"; then

     

       32
       32
       -
                   # We cannot skip this; barf.

     

       33
       33
       -
                   echo "impure path \`$p' used in link" >&2

     

       34
       34
       -
                   exit 1

     

       35
       35
       -
               elif test "${p:0:9}" = "--sysroot"; then

     

       36
       36
       -
                   # Our ld is not built with sysroot support (Can we fix that?)

     

       37
       37
       -
                   :

     

       38
       38
       -
               else

     

       39
       39
       -
                   rest=("${rest[@]}" "$p")

     

       40
       40
       -
               fi

     

       41
       41
       -
               n=$((n + 1))

     

       42
       42
       -
           done

     

       43
       43
       -
           params=("${rest[@]}")

     

       44
       44
       -
       fi

     

       45
       45
       -
       

     

       46
       46
       -
       

     

       47
       47
       -
       extra=()

     

       48
       48
       -
       extraBefore=()

     

       49
       49
       -
       

     

       50
       50
       -
       if test -z "$NIX_LDFLAGS_SET"; then

     

       51
       51
       -
           extra+=($NIX_LDFLAGS)

     

       52
       52
       -
           extraBefore+=($NIX_LDFLAGS_BEFORE)

     

       53
       53
       -
       fi

     

       54
       54
       -
       

     

       55
       55
       -
       extra+=($NIX_LDFLAGS_AFTER)

     

       56
       56
       -
       

     

       57
       57
       -
       

     

       58
       58
       -
       # Add all used dynamic libraries to the rpath.

     

       59
       59
       -
       if test "$NIX_DONT_SET_RPATH" != "1"; then

     

       60
       60
       -
       

     

       61
       61
       -
           libPath=""

     

       62
       62
       -
           addToLibPath() {

     

       63
       63
       -
               local path="$1"

     

       64
       64
       -
               if test "${path:0:1}" != "/"; then return 0; fi

     

       65
       65
       -
               case "$path" in

     

       66
       66
       -
                   *..*|*./*|*/.*|*//*)

     

       67
       67
       -
                       local path2

     

       68
       68
       -
                       if path2=$(readlink -f "$path"); then

     

       69
       69
       -
                           path="$path2"

     

       70
       70
       -
                       fi

     

       71
       71
       -
                       ;;

     

       72
       72
       -
               esac

     

       73
       73
       -
               case $libPath in

     

       74
       74
       -
                   *\ $path\ *) return 0 ;;

     

       75
       75
       -
               esac

     

       76
       76
       -
               libPath="$libPath $path "

     

       77
       77
       -
           }

     

       78
       78
       -
           

     

       79
       79
       -
           addToRPath() {

     

       80
       80
       -
               # If the path is not in the store, don't add it to the rpath.

     

       81
       81
       -
               # This typically happens for libraries in /tmp that are later

     

       82
       82
       -
               # copied to $out/lib.  If not, we're screwed.

     

       83
       83
       -
               if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi

     

       84
       84
       -
               case $rpath in

     

       85
       85
       -
                   *\ $1\ *) return 0 ;;

     

       86
       86
       -
               esac

     

       87
       87
       -
               rpath="$rpath $1 "

     

       88
       88
       -
           }

     

       89
       89
       -
       

     

       90
       90
       -
           libs=""

     

       91
       91
       -
           addToLibs() {

     

       92
       92
       -
               libs="$libs $1"

     

       93
       93
       -
           }

     

       94
       94
       -
       

     

       95
       95
       -
           rpath=""

     

       96
       96
       -
       

     

       97
       97
       -
           # First, find all -L... switches.

     

       98
       98
       -
           allParams=("${params[@]}" ${extra[@]})

     

       99
       99
       -
           n=0

     

       100
       100
       -
           while test $n -lt ${#allParams[*]}; do

     

       101
       101
       -
               p=${allParams[n]}

     

       102
       102
       -
               p2=${allParams[$((n+1))]}

     

       103
       103
       -
               if test "${p:0:3}" = "-L/"; then

     

       104
       104
       -
                   addToLibPath ${p:2}

     

       105
       105
       -
               elif test "$p" = "-L"; then

     

       106
       106
       -
                   addToLibPath ${p2}

     

       107
       107
       -
                   n=$((n + 1))

     

       108
       108
       -
               elif test "$p" = "-l"; then

     

       109
       109
       -
                   addToLibs ${p2}

     

       110
       110
       -
                   n=$((n + 1))

     

       111
       111
       -
               elif test "${p:0:2}" = "-l"; then

     

       112
       112
       -
                   addToLibs ${p:2}

     

       113
       113
       -
               elif test "$p" = "-dynamic-linker"; then

     

       114
       114
       -
                   # Ignore the dynamic linker argument, or it 

     

       115
       115
       -
                   # will get into the next 'elif'. We don't want

     

       116
       116
       -
                   # the dynamic linker path rpath to go always first.

     

       117
       117
       -
                   n=$((n + 1))

     

       118
       118
       -
               elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then

     

       119
       119
       -
                   # This is a direct reference to a shared library, so add

     

       120
       120
       -
                   # its directory to the rpath.

     

       121
       121
       -
                   path="$(dirname "$p")";

     

       122
       122
       -
                   addToRPath "${path}"

     

       123
       123
       -
               fi

     

       124
       124
       -
               n=$((n + 1))

     

       125
       125
       -
           done

     

       126
       126
       -
       

     

       127
       127
       -
           # Second, for each directory in the library search path (-L...),

     

       128
       128
       -
           # see if it contains a dynamic library used by a -l... flag.  If

     

       129
       129
       -
           # so, add the directory to the rpath.

     

       130
       130
       -
           # It's important to add the rpath in the order of -L..., so

     

       131
       131
       -
           # the link time chosen objects will be those of runtime linking.

     

       132
       132
       -
           

     

       133
       133
       -
           for i in $libPath; do

     

       134
       134
       -
               for j in $libs; do

     

       135
       135
       -
                   if test -f "$i/lib$j.so"; then

     

       136
       136
       -
                       addToRPath $i

     

       137
       137
       -
                       break

     

       138
       138
       -
                   fi

     

       139
       139
       -
               done

     

       140
       140
       -
           done

     

       141
       141
       -
           

     

       142
       142
       -
       

     

       143
       143
       -
           # Finally, add `-rpath' switches.

     

       144
       144
       -
           for i in $rpath; do

     

       145
       145
       -
               extra=(${extra[@]} -rpath $i)

     

       146
       146
       -
           done

     

       147
       147
       -
       fi

     

       148
       148
       -
       

     

       149
       149
       -
       

     

       150
       150
       -
       # Optionally print debug info.

     

       151
       151
       -
       if test "$NIX_DEBUG" = "1"; then

     

       152
       152
       -
         echo "original flags to @ld@:" >&2

     

       153
       153
       -
         for i in "${params[@]}"; do

     

       154
       154
       -
             echo "  $i" >&2

     

       155
       155
       -
         done

     

       156
       156
       -
         echo "extra flags to @ld@:" >&2

     

       157
       157
       -
         for i in ${extra[@]}; do

     

       158
       158
       -
             echo "  $i" >&2

     

       159
       159
       -
         done

     

       160
       160
       -
       fi

     

       161
       161
       -
       

     

       162
       162
       -
       if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then

     

       163
       163
       -
           source "$NIX_LD_WRAPPER_EXEC_HOOK"

     

       164
       164
       -
       fi

     

       165
       165
       -
       

     

       166
       166
       -
       exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}

-33

pkgs/build-support/gcc-wrapper-old/setup-hook.sh

···

       1
       1
       -
       gccWrapperOld_addCVars () {

     

       2
       2
       -
           if test -d $1/include; then

     

       3
       3
       -
               export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include"

     

       4
       4
       -
           fi

     

       5
       5
       -
       

     

       6
       6
       -
           if test -d $1/lib64; then

     

       7
       7
       -
               export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64"

     

       8
       8
       -
           fi

     

       9
       9
       -
       

     

       10
       10
       -
           if test -d $1/lib; then

     

       11
       11
       -
               export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib"

     

       12
       12
       -
           fi

     

       13
       13
       -
       }

     

       14
       14
       -
       

     

       15
       15
       -
       envBuildBuildHooks+=(gccWrapperOld_addCVars)

     

       16
       16
       -
       

     

       17
       17
       -
       # Note: these come *after* $out in the PATH (see setup.sh).

     

       18
       18
       -
       

     

       19
       19
       -
       if test -n "@gcc@"; then

     

       20
       20
       -
           addToSearchPath PATH @gcc@/bin

     

       21
       21
       -
       fi

     

       22
       22
       -
       

     

       23
       23
       -
       if test -n "@binutils@"; then

     

       24
       24
       -
           addToSearchPath PATH @binutils@/bin

     

       25
       25
       -
       fi

     

       26
       26
       -
       

     

       27
       27
       -
       if test -n "@libc@"; then

     

       28
       28
       -
           addToSearchPath PATH @libc_bin@/bin

     

       29
       29
       -
       fi

     

       30
       30
       -
       

     

       31
       31
       -
       if test -n "@coreutils@"; then

     

       32
       32
       -
           addToSearchPath PATH @coreutils@/bin

     

       33
       33
       -
       fi

-26

pkgs/build-support/gcc-wrapper-old/utils.sh

···

       1
       1
       -
       skip () {

     

       2
       2
       -
           if test "$NIX_DEBUG" = "1"; then

     

       3
       3
       -
               echo "skipping impure path $1" >&2

     

       4
       4
       -
           fi

     

       5
       5
       -
       }

     

       6
       6
       -
       

     

       7
       7
       -
       

     

       8
       8
       -
       # Checks whether a path is impure.  E.g., `/lib/foo.so' is impure, but

     

       9
       9
       -
       # `/nix/store/.../lib/foo.so' isn't.

     

       10
       10
       -
       badPath() {

     

       11
       11
       -
           local p=$1

     

       12
       12
       -
           

     

       13
       13
       -
           # Relative paths are okay (since they're presumably relative to

     

       14
       14
       -
           # the temporary build directory).

     

       15
       15
       -
           if test "${p:0:1}" != "/"; then return 1; fi

     

       16
       16
       -
           

     

       17
       17
       -
           @extraPathTests@

     

       18
       18
       -
       

     

       19
       19
       -
           # Otherwise, the path should refer to the store or some temporary

     

       20
       20
       -
           # directory (including the build directory).

     

       21
       21
       -
           test \

     

       22
       22
       -
               "$p" != "/dev/null" -a \

     

       23
       23
       -
               "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \

     

       24
       24
       -
               "${p:0:4}" != "/tmp" -a \

     

       25
       25
       -
               "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"

     

       26
       26
       -
       }

+1 -1

pkgs/build-support/kernel/modules-closure.nix

···

       9
       9
        
       stdenvNoCC.mkDerivation {

     

       10
       10
        
         name = kernel.name + "-shrunk";

     

       11
       11
        
         builder = ./modules-closure.sh;

     

       12
       12
       -
         buildInputs = [ nukeReferences kmod ];

     

       12
       12
       +
         nativeBuildInputs = [ nukeReferences kmod ];

     

       13
       13
        
         inherit kernel firmware rootModules allowMissing;

     

       14
       14
        
         allowedReferences = ["out"];

     

       15
       15
        
       }

+6

pkgs/data/misc/cacert/default.nix

···

       20
       20
        
       

     

       21
       21
        
         src = nss.src;

     

       22
       22
        
       

     

       23
       23
       +
         outputs = [ "out" "unbundled" ];

     

       24
       24
       +
       

     

       23
       25
        
         nativeBuildInputs = [ python ];

     

       24
       26
        
       

     

       25
       27
        
         configurePhase = ''

     
···

       50
       52
        
         installPhase = ''

     

       51
       53
        
           mkdir -pv $out/etc/ssl/certs

     

       52
       54
        
           cp -v ca-bundle.crt $out/etc/ssl/certs

     

       55
       55
       +
           # install individual certs in unbundled output

     

       56
       56
       +
           mkdir -pv $unbundled/etc/ssl/certs

     

       57
       57
       +
           cp -v *.crt $unbundled/etc/ssl/certs

     

       58
       58
       +
           rm -f $unbundled/etc/ssl/certs/ca-bundle.crt  # not wanted in unbundled

     

       53
       59
        
         '';

     

       54
       60
        
       

     

       55
       61
        
         setupHook = ./setup-hook.sh;

+4 -8

pkgs/data/misc/poppler-data/default.nix

···

       1
       1
       -
       { fetchurl, stdenv }:

     

       1
       1
       +
       { fetchurl, stdenv, cmake, ninja }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "poppler-data-0.4.7";

     

       4
       4
       +
         name = "poppler-data-0.4.8";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://poppler.freedesktop.org/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "1pm7wg6xqj4sppb5az4pa7psfdk4yxxkw52j85bm9fksibcb0lp7";

     

       8
       8
       +
           sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         postPatch = ''

     

       12
       12
       -
           sed -i 's,$(datadir)/pkgconfig,$(prefix)/lib/pkgconfig,g' Makefile

     

       13
       13
       -
         '';

     

       14
       14
       -
       

     

       15
       15
       -
         installFlags = [ "prefix=$(out)" ];

     

       11
       11
       +
         nativeBuildInputs = [ cmake ninja ];

     

       16
       12
        
       

     

       17
       13
        
         meta = with stdenv.lib; {

     

       18
       14
        
           homepage = https://poppler.freedesktop.org/;

+16 -1

pkgs/data/misc/tzdata/default.nix

···

       1
       1
       -
       { stdenv, fetchurl }:

     

       1
       1
       +
       { stdenv, fetchurl, buildPackages }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       28
       28
        
           "MANDIR=$(man)/share/man"

     

       29
       29
        
           "AWK=awk"

     

       30
       30
        
           "CFLAGS=-DHAVE_LINK=0"

     

       31
       31
       +
           "cc=${stdenv.cc.targetPrefix}cc"

     

       32
       32
       +
           "AR=${stdenv.cc.targetPrefix}ar"

     

       31
       33
        
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       36
       36
       +
       

     

       37
       37
       +
         installFlags = [ "ZIC=./zic-native" ];

     

       38
       38
       +
       

     

       39
       39
       +
         preInstall = ''

     

       40
       40
       +
            mv zic.o zic.o.orig

     

       41
       41
       +
            mv zic zic.orig

     

       42
       42
       +
            make $makeFlags cc=cc AR=ar zic

     

       43
       43
       +
            mv zic zic-native

     

       44
       44
       +
            mv zic.o.orig zic.o

     

       45
       45
       +
            mv zic.orig zic

     

       46
       46
       +
         '';

     

       32
       47
        
       

     

       33
       48
        
         postInstall =

     

       34
       49
        
           ''

-472

pkgs/development/compilers/gcc/4.5/default.nix

···

       1
       1
       -
       { stdenv, targetPackages, fetchurl, noSysDirs

     

       2
       2
       -
       , langC ? true, langCC ? true, langFortran ? false

     

       3
       3
       -
       , langJava ? false

     

       4
       4
       -
       , langAda ? false

     

       5
       5
       -
       , langVhdl ? false

     

       6
       6
       -
       , profiledCompiler ? false

     

       7
       7
       -
       , staticCompiler ? false

     

       8
       8
       -
       , enableShared ? true

     

       9
       9
       -
       , texinfo ? null

     

       10
       10
       -
       , perl ? null # optional, for texi2pod (then pod2man); required for Java

     

       11
       11
       -
       , gmp, mpfr, libmpc, gettext, which

     

       12
       12
       -
       , libelf                      # optional, for link-time optimizations (LTO)

     

       13
       13
       -
       , ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework

     

       14
       14
       -
       , zlib ? null, boehmgc ? null

     

       15
       15
       -
       , zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null

     

       16
       16
       -
       , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null

     

       17
       17
       -
       , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null

     

       18
       18
       -
       , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null

     

       19
       19
       -
       , gnatboot ? null

     

       20
       20
       -
       , enableMultilib ? false

     

       21
       21
       -
       , name ? "gcc"

     

       22
       22
       -
       , libcCross ? null

     

       23
       23
       -
       , crossStageStatic ? false

     

       24
       24
       -
       , gnat ? null

     

       25
       25
       -
       , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd

     

       26
       26
       -
       , stripped ? true

     

       27
       27
       -
       , buildPlatform, hostPlatform, targetPlatform

     

       28
       28
       -
       , buildPackages

     

       29
       29
       -
       }:

     

       30
       30
       -
       

     

       31
       31
       -
       assert langJava     -> zip != null && unzip != null

     

       32
       32
       -
                              && zlib != null && boehmgc != null

     

       33
       33
       -
                              && perl != null;  # for `--enable-java-home'

     

       34
       34
       -
       assert langAda      -> gnatboot != null;

     

       35
       35
       -
       assert langVhdl     -> gnat != null;

     

       36
       36
       -
       

     

       37
       37
       -
       # LTO needs libelf and zlib.

     

       38
       38
       -
       assert libelf != null -> zlib != null;

     

       39
       39
       -
       

     

       40
       40
       -
       with stdenv.lib;

     

       41
       41
       -
       with builtins;

     

       42
       42
       -
       

     

       43
       43
       -
       let version = "4.5.4";

     

       44
       44
       -
           javaEcj = fetchurl {

     

       45
       45
       -
             # The `$(top_srcdir)/ecj.jar' file is automatically picked up at

     

       46
       46
       -
             # `configure' time.

     

       47
       47
       -
       

     

       48
       48
       -
             # XXX: Eventually we might want to take it from upstream.

     

       49
       49
       -
             url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";

     

       50
       50
       -
             sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";

     

       51
       51
       -
           };

     

       52
       52
       -
       

     

       53
       53
       -
           # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a

     

       54
       54
       -
           # binary distribution here to allow the whole chain to be bootstrapped.

     

       55
       55
       -
           javaAntlr = fetchurl {

     

       56
       56
       -
             url = http://www.antlr.org/download/antlr-3.1.3.jar;

     

       57
       57
       -
             sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09";

     

       58
       58
       -
           };

     

       59
       59
       -
       

     

       60
       60
       -
           xlibs = [

     

       61
       61
       -
             libX11 libXt libSM libICE libXtst libXrender libXrandr libXi

     

       62
       62
       -
             xproto renderproto xextproto inputproto randrproto

     

       63
       63
       -
           ];

     

       64
       64
       -
       

     

       65
       65
       -
           javaAwtGtk = langJava && gtk2 != null;

     

       66
       66
       -
       

     

       67
       67
       -
           /* Platform flags */

     

       68
       68
       -
           platformFlags = let

     

       69
       69
       -
               gccArch = targetPlatform.platform.gcc.arch or null;

     

       70
       70
       -
               gccCpu = targetPlatform.platform.gcc.cpu or null;

     

       71
       71
       -
               gccAbi = targetPlatform.platform.gcc.abi or null;

     

       72
       72
       -
               gccFpu = targetPlatform.platform.gcc.fpu or null;

     

       73
       73
       -
               gccFloat = targetPlatform.platform.gcc.float or null;

     

       74
       74
       -
               gccMode = targetPlatform.platform.gcc.mode or null;

     

       75
       75
       -
             in

     

       76
       76
       -
               optional (gccArch != null) "--with-arch=${gccArch}" ++

     

       77
       77
       -
               optional (gccCpu != null) "--with-cpu=${gccCpu}" ++

     

       78
       78
       -
               optional (gccAbi != null) "--with-abi=${gccAbi}" ++

     

       79
       79
       -
               optional (gccFpu != null) "--with-fpu=${gccFpu}" ++

     

       80
       80
       -
               optional (gccFloat != null) "--with-float=${gccFloat}" ++

     

       81
       81
       -
               optional (gccMode != null) "--with-mode=${gccMode}";

     

       82
       82
       -
       

     

       83
       83
       -
           /* Cross-gcc settings */

     

       84
       84
       -
           crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt");

     

       85
       85
       -
       

     

       86
       86
       -
           crossConfigureFlags =

     

       87
       87
       -
             # Ensure that -print-prog-name is able to find the correct programs.

     

       88
       88
       -
             [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"

     

       89
       89
       -
               "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++

     

       90
       90
       -
             (if crossMingw && crossStageStatic then [

     

       91
       91
       -
               "--with-headers=${libcCross}/include"

     

       92
       92
       -
               "--with-gcc"

     

       93
       93
       -
               "--with-gnu-as"

     

       94
       94
       -
               "--with-gnu-ld"

     

       95
       95
       -
               "--with-gnu-ld"

     

       96
       96
       -
               "--disable-shared"

     

       97
       97
       -
               "--disable-nls"

     

       98
       98
       -
               "--disable-debug"

     

       99
       99
       -
               "--enable-sjlj-exceptions"

     

       100
       100
       -
               "--enable-threads=win32"

     

       101
       101
       -
               "--disable-win32-registry"

     

       102
       102
       -
             ] else if crossStageStatic then [

     

       103
       103
       -
               "--disable-libssp"

     

       104
       104
       -
               "--disable-nls"

     

       105
       105
       -
               "--without-headers"

     

       106
       106
       -
               "--disable-threads"

     

       107
       107
       -
               "--disable-libmudflap"

     

       108
       108
       -
               "--disable-libgomp"

     

       109
       109
       -
               "--disable-shared"

     

       110
       110
       -
               "--disable-decimal-float" # libdecnumber requires libc

     

       111
       111
       -
             ] else [

     

       112
       112
       -
               "--with-headers=${libcCross}/include"

     

       113
       113
       -
               "--enable-__cxa_atexit"

     

       114
       114
       -
               "--enable-long-long"

     

       115
       115
       -
             ] ++

     

       116
       116
       -
               (if crossMingw then [

     

       117
       117
       -
                 "--enable-threads=win32"

     

       118
       118
       -
                 "--enable-sjlj-exceptions"

     

       119
       119
       -
                 "--enable-hash-synchronization"

     

       120
       120
       -
                 "--enable-version-specific-runtime-libs"

     

       121
       121
       -
                 "--enable-libssp"

     

       122
       122
       -
                 "--disable-nls"

     

       123
       123
       -
                 "--with-dwarf2"

     

       124
       124
       -
               ] else [

     

       125
       125
       -
                 "--enable-threads=posix"

     

       126
       126
       -
                 "--enable-nls"

     

       127
       127
       -
                 "--disable-decimal-float" # No final libdecnumber (it may work only in 386)

     

       128
       128
       -
               ]));

     

       129
       129
       -
           stageNameAddon = if crossStageStatic then "-stage-static" else

     

       130
       130
       -
             "-stage-final";

     

       131
       131
       -
           crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";

     

       132
       132
       -
       

     

       133
       133
       -
       in

     

       134
       134
       -
       

     

       135
       135
       -
       # We need all these X libraries when building AWT with GTK+.

     

       136
       136
       -
       assert gtk2 != null -> (filter (x: x == null) xlibs) == [];

     

       137
       137
       -
       

     

       138
       138
       -
       stdenv.mkDerivation ({

     

       139
       139
       -
         name = "${name}-${version}" + crossNameAddon;

     

       140
       140
       -
       

     

       141
       141
       -
         builder = ../builder.sh;

     

       142
       142
       -
       

     

       143
       143
       -
         src = (import ./sources.nix) {

     

       144
       144
       -
           inherit fetchurl optional version;

     

       145
       145
       -
           inherit langC langCC langFortran langJava langAda;

     

       146
       146
       -
         };

     

       147
       147
       -
       

     

       148
       148
       -
         hardeningDisable = [ "format" ] ++ optional (name != "gnat") "all";

     

       149
       149
       -
       

     

       150
       150
       -
         outputs = [ "out" "man" "info" ]

     

       151
       151
       -
           ++ optional (!(hostPlatform.is64bit && langAda)) "lib";

     

       152
       152
       -
       

     

       153
       153
       -
         setOutputFlags = false;

     

       154
       154
       -
         NIX_NO_SELF_RPATH = true;

     

       155
       155
       -
       

     

       156
       156
       -
         libc_dev = stdenv.cc.libc_dev;

     

       157
       157
       -
       

     

       158
       158
       -
         patches =

     

       159
       159
       -
           [ ]

     

       160
       160
       -
           ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch

     

       161
       161
       -
           ++ optional noSysDirs ./no-sys-dirs.patch

     

       162
       162
       -
           # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

     

       163
       163
       -
           # target libraries and tools.

     

       164
       164
       -
           ++ optional langAda ../gnat-cflags.patch

     

       165
       165
       -
           ++ optional langVhdl ./ghdl-ortho-cflags.patch

     

       166
       166
       -
           ++ [ ../struct-ucontext-4.5.patch ] # glibc-2.26

     

       167
       167
       -
           ;

     

       168
       168
       -
       

     

       169
       169
       -
         postPatch =

     

       170
       170
       -
           if (stdenv.system == "i586-pc-gnu"

     

       171
       171
       -
               || (libcCross != null                  # e.g., building `gcc.crossDrv'

     

       172
       172
       -
                   && libcCross ? crossConfig

     

       173
       173
       -
                   && libcCross.crossConfig == "i586-pc-gnu")

     

       174
       174
       -
               || (targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"

     

       175
       175
       -
                   && libcCross != null))

     

       176
       176
       -
           then

     

       177
       177
       -
             # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not

     

       178
       178
       -
             # in glibc, so add the right `-I' flags to the default spec string.

     

       179
       179
       -
             assert libcCross != null -> libpthreadCross != null;

     

       180
       180
       -
             let

     

       181
       181
       -
               libc = if libcCross != null then libcCross else stdenv.glibc;

     

       182
       182
       -
               gnu_h = "gcc/config/gnu.h";

     

       183
       183
       -
               i386_gnu_h = "gcc/config/i386/gnu.h";

     

       184
       184
       -
               extraCPPDeps =

     

       185
       185
       -
                    libc.propagatedBuildInputs

     

       186
       186
       -
                 ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross

     

       187
       187
       -
                 ++ stdenv.lib.optional (libpthread != null) libpthread;

     

       188
       188
       -
               extraCPPSpec =

     

       189
       189
       -
                 concatStrings (intersperse " "

     

       190
       190
       -
                                 (map (x: "-I${x.dev or x}/include") extraCPPDeps));

     

       191
       191
       -
               extraLibSpec =

     

       192
       192
       -
                 if libpthreadCross != null

     

       193
       193
       -
                 then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"

     

       194
       194
       -
                 else "-L${libpthread}/lib";

     

       195
       195
       -
             in

     

       196
       196
       -
               '' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..."

     

       197
       197
       -
                  sed -i "${i386_gnu_h}" \

     

       198
       198
       -
                      -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'

     

       199
       199
       -
       

     

       200
       200
       -
                  echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."

     

       201
       201
       -
                  sed -i "${gnu_h}" \

     

       202
       202
       -
                      -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'

     

       203
       203
       -
       

     

       204
       204
       -
                  echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."

     

       205
       205
       -
                  sed -i "${gnu_h}" \

     

       206
       206
       -
                      -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'

     

       207
       207
       -
                  sed -i gcc/config/t-gnu \

     

       208
       208
       -
                      -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g'

     

       209
       209
       -
               ''

     

       210
       210
       -
           else if targetPlatform != hostPlatform || stdenv.cc.libc != null then

     

       211
       211
       -
             # On NixOS, use the right path to the dynamic linker instead of

     

       212
       212
       -
             # `/lib/ld*.so'.

     

       213
       213
       -
             let

     

       214
       214
       -
               libc = if libcCross != null then libcCross else stdenv.cc.libc;

     

       215
       215
       -
             in

     

       216
       216
       -
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."

     

       217
       217
       -
                  for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h

     

       218
       218
       -
                  do

     

       219
       219
       -
                    grep -q LIBC_DYNAMIC_LINKER "$header" || continue

     

       220
       220
       -
                    echo "  fixing \`$header'..."

     

       221
       221
       -
                    sed -i "$header" \

     

       222
       222
       -
                        -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'

     

       223
       223
       -
                  done

     

       224
       224
       -
               ''

     

       225
       225
       -
           else null;

     

       226
       226
       -
       

     

       227
       227
       -
         # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,

     

       228
       228
       -
         crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;

     

       229
       229
       -
         inherit noSysDirs profiledCompiler staticCompiler langJava

     

       230
       230
       -
           libcCross crossMingw;

     

       231
       231
       -
       

     

       232
       232
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       233
       233
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       234
       234
       -
           ++ optional (perl != null) perl;

     

       235
       235
       -
       

     

       236
       236
       -
         # For building runtime libs

     

       237
       237
       -
         depsBuildTarget =

     

       238
       238
       -
           if hostPlatform == buildPlatform then [

     

       239
       239
       -
             targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       240
       240
       -
           ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       241
       241
       -
             stdenv.cc

     

       242
       242
       -
           ];

     

       243
       243
       -
       

     

       244
       244
       -
         buildInputs = [

     

       245
       245
       -
           gmp mpfr libmpc libelf

     

       246
       246
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       247
       247
       -
         ] ++ (optional (ppl != null) ppl)

     

       248
       248
       -
           ++ (optional (cloogppl != null) cloogppl)

     

       249
       249
       -
           ++ (optional (zlib != null) zlib)

     

       250
       250
       -
           ++ (optional langJava boehmgc)

     

       251
       251
       -
           ++ (optionals langJava [zip unzip])

     

       252
       252
       -
           ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs))

     

       253
       253
       -
           ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])

     

       254
       254
       -
           ++ (optionals langAda [gnatboot])

     

       255
       255
       -
           ++ (optionals langVhdl [gnat])

     

       256
       256
       -
           ;

     

       257
       257
       -
       

     

       258
       258
       -
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       259
       259
       -
         configurePlatforms =

     

       260
       260
       -
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       261
       261
       -
           if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm

     

       262
       262
       -
           then []

     

       263
       263
       -
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       264
       264
       -
       

     

       265
       265
       -
         configureFlags =

     

       266
       266
       -
           # Basic dependencies

     

       267
       267
       -
           [

     

       268
       268
       -
             "--with-gmp=${gmp.dev}"

     

       269
       269
       -
             "--with-mpfr=${mpfr.dev}"

     

       270
       270
       -
             "--with-mpc=${libmpc}"

     

       271
       271
       -
           ] ++

     

       272
       272
       -
           optional (libelf != null) "--with-libelf=${libelf}" ++

     

       273
       273
       -
           optional (!(crossMingw && crossStageStatic))

     

       274
       274
       -
             "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++

     

       275
       275
       -
       

     

       276
       276
       -
           # Basic configuration

     

       277
       277
       -
           [

     

       278
       278
       -
             "--disable-libstdcxx-pch"

     

       279
       279
       -
             "--without-included-gettext"

     

       280
       280
       -
             "--with-system-zlib"

     

       281
       281
       -
             "--enable-languages=${

     

       282
       282
       -
               concatStrings (intersperse ","

     

       283
       283
       -
                 (  optional langC        "c"

     

       284
       284
       -
                 ++ optional langCC       "c++"

     

       285
       285
       -
                 ++ optional langFortran  "fortran"

     

       286
       286
       -
                 ++ optional langJava     "java"

     

       287
       287
       -
                 ++ optional langAda      "ada"

     

       288
       288
       -
                 ++ optional langVhdl     "vhdl"

     

       289
       289
       -
                 )

     

       290
       290
       -
               )

     

       291
       291
       -
             }"

     

       292
       292
       -
           ] ++

     

       293
       293
       -
           optional (!enableMultilib) "--disable-multilib" ++

     

       294
       294
       -
           optional (!enableShared) "--disable-shared" ++

     

       295
       295
       -
       

     

       296
       296
       -
           # Optional features

     

       297
       297
       -
           optional (cloogppl != null) "--with-cloog=${cloogppl}" ++

     

       298
       298
       -
           optional (ppl != null) "--with-ppl=${ppl}" ++

     

       299
       299
       -
       

     

       300
       300
       -
           # Java options

     

       301
       301
       -
           optionals langJava [

     

       302
       302
       -
             "--with-ecj-jar=${javaEcj}"

     

       303
       303
       -
       

     

       304
       304
       -
             # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See

     

       305
       305
       -
             # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.

     

       306
       306
       -
             "--enable-java-home"

     

       307
       307
       -
             "--with-java-home=\${prefix}/lib/jvm/jre"

     

       308
       308
       -
           ] ++

     

       309
       309
       -
           optional javaAwtGtk "--enable-java-awt=gtk" ++

     

       310
       310
       -
           optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++

     

       311
       311
       -
       

     

       312
       312
       -
           # Ada

     

       313
       313
       -
           optional langAda "--enable-libada" ++

     

       314
       314
       -
       

     

       315
       315
       -
           platformFlags ++

     

       316
       316
       -
           optional (targetPlatform != hostPlatform) crossConfigureFlags ++

     

       317
       317
       -
       

     

       318
       318
       -
           # Platform-specific flags

     

       319
       319
       -
           optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++

     

       320
       320
       -
           # Trick that should be taken out once we have a mipsel-linux not loongson2f

     

       321
       321
       -
           optional (targetPlatform == hostPlatform && stdenv.system == "mipsel-linux") "--with-arch=loongson2f"

     

       322
       322
       -
         ;

     

       323
       323
       -
       

     

       324
       324
       -
         targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

     

       325
       325
       -
       

     

       326
       326
       -
         /* For cross-built gcc (build != host == target) */

     

       327
       327
       -
         crossAttrs = {

     

       328
       328
       -
           dontStrip = true;

     

       329
       329
       -
         };

     

       330
       330
       -
       

     

       331
       331
       -
         # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the

     

       332
       332
       -
         # library headers and binaries, regarless of the language being compiled.

     

       333
       333
       -
         #

     

       334
       334
       -
         # Note: When building the Java AWT GTK+ peer, the build system doesn't honor

     

       335
       335
       -
         # `--with-gmp' et al., e.g., when building

     

       336
       336
       -
         # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add

     

       337
       337
       -
         # them to $CPATH and $LIBRARY_PATH in this case.

     

       338
       338
       -
         #

     

       339
       339
       -
         # Likewise, the LTO code doesn't find zlib.

     

       340
       340
       -
         #

     

       341
       341
       -
         # Cross-compiling, we need gcc not to read ./specs in order to build the g++

     

       342
       342
       -
         # compiler (after the specs for the cross-gcc are created). Having

     

       343
       343
       -
         # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.

     

       344
       344
       -
       

     

       345
       345
       -
         CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]

     

       346
       346
       -
           ++ optional (zlib != null) zlib

     

       347
       347
       -
           ++ optional langJava boehmgc

     

       348
       348
       -
           ++ optionals javaAwtGtk xlibs

     

       349
       349
       -
           ++ optionals javaAwtGtk [ gmp mpfr ]

     

       350
       350
       -
           ++ optional (libpthread != null) libpthread

     

       351
       351
       -
           ++ optional (libpthreadCross != null) libpthreadCross

     

       352
       352
       -
       

     

       353
       353
       -
           # On GNU/Hurd glibc refers to Mach & Hurd

     

       354
       354
       -
           # headers.

     

       355
       355
       -
           ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)

     

       356
       356
       -
                        libcCross.propagatedBuildInputs

     

       357
       357
       -
         ));

     

       358
       358
       -
       

     

       359
       359
       -
         LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([]

     

       360
       360
       -
           ++ optional (zlib != null) zlib

     

       361
       361
       -
           ++ optional langJava boehmgc

     

       362
       362
       -
           ++ optionals javaAwtGtk xlibs

     

       363
       363
       -
           ++ optionals javaAwtGtk [ gmp mpfr ]

     

       364
       364
       -
           ++ optional (libpthread != null) libpthread)

     

       365
       365
       -
         );

     

       366
       366
       -
       

     

       367
       367
       -
         EXTRA_TARGET_FLAGS = optionals

     

       368
       368
       -
           (targetPlatform != hostPlatform && libcCross != null)

     

       369
       369
       -
           ([

     

       370
       370
       -
             "-idirafter ${libcCross.dev}/include"

     

       371
       371
       -
           ] ++ optionals (! crossStageStatic) [

     

       372
       372
       -
             "-B${libcCross.out}/lib"

     

       373
       373
       -
           ]);

     

       374
       374
       -
       

     

       375
       375
       -
         EXTRA_TARGET_LDFLAGS = optionals

     

       376
       376
       -
           (targetPlatform != hostPlatform && libcCross != null)

     

       377
       377
       -
           ([

     

       378
       378
       -
             "-Wl,-L${libcCross.out}/lib"

     

       379
       379
       -
           ] ++ (if crossStageStatic then [

     

       380
       380
       -
               "-B${libcCross.out}/lib"

     

       381
       381
       -
             ] else [

     

       382
       382
       -
               "-Wl,-rpath,${libcCross.out}/lib"

     

       383
       383
       -
               "-Wl,-rpath-link,${libcCross.out}/lib"

     

       384
       384
       -
           ]) ++ optionals (libpthreadCross != null) [

     

       385
       385
       -
             "-L${libpthreadCross}/lib"

     

       386
       386
       -
             "-Wl,${libpthreadCross.TARGET_LDFLAGS}"

     

       387
       387
       -
           ]);

     

       388
       388
       -
       

     

       389
       389
       -
         passthru = {

     

       390
       390
       -
           inherit langC langCC langAda langFortran langVhdl enableMultilib version;

     

       391
       391
       -
           isGNU = true;

     

       392
       392
       -
           hardeningUnsupportedFlags = [ "stackprotector" ];

     

       393
       393
       -
         };

     

       394
       394
       -
       

     

       395
       395
       -
         enableParallelBuilding = !langAda;

     

       396
       396
       -
       

     

       397
       397
       -
         meta = {

     

       398
       398
       -
           homepage = http://gcc.gnu.org/;

     

       399
       399
       -
           license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+

     

       400
       400
       -
           description = "GNU Compiler Collection, version ${version}"

     

       401
       401
       -
             + (if stripped then "" else " (with debugging info)");

     

       402
       402
       -
       

     

       403
       403
       -
           longDescription = ''

     

       404
       404
       -
             The GNU Compiler Collection includes compiler front ends for C, C++,

     

       405
       405
       -
             Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well

     

       406
       406
       -
             as libraries for these languages (libstdc++, libgcj, libgomp,...).

     

       407
       407
       -
       

     

       408
       408
       -
             GCC development is a part of the GNU Project, aiming to improve the

     

       409
       409
       -
             compiler used in the GNU system including the GNU/Linux variant.

     

       410
       410
       -
           '';

     

       411
       411
       -
       

     

       412
       412
       -
           maintainers = [

     

       413
       413
       -
             stdenv.lib.maintainers.viric

     

       414
       414
       -
           ];

     

       415
       415
       -
       

     

       416
       416
       -
           # Volunteers needed for the {Cyg,Dar}win ports of *PPL.

     

       417
       417
       -
           # gnatboot is not available out of linux platforms, so we disable the darwin build

     

       418
       418
       -
           # for the gnat (ada compiler).

     

       419
       419
       -
           platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ];

     

       420
       420
       -
         };

     

       421
       421
       -
       }

     

       422
       422
       -
       

     

       423
       423
       -
       // optionalAttrs (targetPlatform != hostPlatform || libcCross != null) {

     

       424
       424
       -
         # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of,

     

       425
       425
       -
         # say, "i586-pc-gnu-gcc -E" when building `gcc.crossDrv'.

     

       426
       426
       -
         # FIXME: Fix `builder.sh' directly in the next stdenv-update.

     

       427
       427
       -
         postUnpack = "unset CPP";

     

       428
       428
       -
       }

     

       429
       429
       -
       

     

       430
       430
       -
       // optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {

     

       431
       431
       -
         makeFlags = [ "all-gcc" "all-target-libgcc" ];

     

       432
       432
       -
         installTargets = "install-gcc install-target-libgcc";

     

       433
       433
       -
       }

     

       434
       434
       -
       

     

       435
       435
       -
       # GCC 4.5.2 doesn't support the `install-strip' target, so let `stdenv' do

     

       436
       436
       -
       # the stripping by default.

     

       437
       437
       -
       // optionalAttrs (!stripped) { dontStrip = true; }

     

       438
       438
       -
       

     

       439
       439
       -
       // optionalAttrs langVhdl rec {

     

       440
       440
       -
         name = "ghdl-0.29";

     

       441
       441
       -
       

     

       442
       442
       -
         ghdlSrc = fetchurl {

     

       443
       443
       -
           url = "http://ghdl.free.fr/ghdl-0.29.tar.bz2";

     

       444
       444
       -
           sha256 = "15mlinr1lwljwll9ampzcfcrk9bk0qpdks1kxlvb70xf9zhh2jva";

     

       445
       445
       -
         };

     

       446
       446
       -
       

     

       447
       447
       -
         # Ghdl has some timestamps checks, storing file timestamps in '.cf' files.

     

       448
       448
       -
         # As we will change the timestamps to 1970-01-01 00:00:01, we also set the

     

       449
       449
       -
         # content of that .cf to that value. This way ghdl does not complain on

     

       450
       450
       -
         # the installed object files from the basic libraries (ieee, ...)

     

       451
       451
       -
         postInstallGhdl = ''

     

       452
       452
       -
           pushd $out

     

       453
       453
       -
           find . -name "*.cf" -exec \

     

       454
       454
       -
               sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \;

     

       455
       455
       -
           popd

     

       456
       456
       -
         '';

     

       457
       457
       -
       

     

       458
       458
       -
         postUnpack = ''

     

       459
       459
       -
           tar xvf ${ghdlSrc}

     

       460
       460
       -
           mv ghdl-*/vhdl gcc*/gcc

     

       461
       461
       -
           rm -Rf ghdl-*

     

       462
       462
       -
         '';

     

       463
       463
       -
       

     

       464
       464
       -
         meta = {

     

       465
       465
       -
           homepage = http://ghdl.free.fr/;

     

       466
       466
       -
           license = stdenv.lib.licenses.gpl2Plus;

     

       467
       467
       -
           description = "Complete VHDL simulator, using the GCC technology (gcc ${version})";

     

       468
       468
       -
           maintainers = with stdenv.lib.maintainers; [viric];

     

       469
       469
       -
           platforms = with stdenv.lib.platforms; linux;

     

       470
       470
       -
         };

     

       471
       471
       -
       

     

       472
       472
       -
       })

-111

pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch

···

       1
       1
       -
       diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in

     

       2
       2
       -
       index 8f481df..681ac59 100644

     

       3
       3
       -
       --- a/gcc/vhdl/Make-lang.in

     

       4
       4
       -
       +++ b/gcc/vhdl/Make-lang.in

     

       5
       5
       -
       @@ -96,7 +96,7 @@ AGCC_GCCOBJ_DIR=../

     

       6
       6
       -
        AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \

     

       7
       7
       -
         -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \

     

       8
       8
       -
         -I$(AGCC_GCCSRC_DIR)/libcpp/include

     

       9
       9
       -
       -AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS)

     

       10
       10
       -
       +AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) $(CFLAGS) $(INCLUDES)

     

       11
       11
       -
        

     

       12
       12
       -
        AGCC_LOCAL_OBJS=ortho-lang.o

     

       13
       13
       -
        

     

       14
       14
       -
       @@ -140,7 +140,7 @@ ghdl$(exeext): force

     

       15
       15
       -
        

     

       16
       16
       -
        # Ghdl libraries.

     

       17
       17
       -
        ghdllib: ghdl$(exeext) $(GCC_PASSES) force

     

       18
       18
       -
       -	$(MAKE_IN_VHDL) GRT_FLAGS="-O -g" ghdllib

     

       19
       19
       -
       +	$(MAKE_IN_VHDL) GRT_FLAGS="-O -g $(CFLAGS)" ghdllib

     

       20
       20
       -
        

     

       21
       21
       -
        # Build hooks:

     

       22
       22
       -
        

     

       23
       23
       -
       diff --git a/gcc/vhdl/Makefile.in b/gcc/vhdl/Makefile.in

     

       24
       24
       -
       index d754c6c..07abc4a 100644

     

       25
       25
       -
       --- a/gcc/vhdl/Makefile.in

     

       26
       26
       -
       +++ b/gcc/vhdl/Makefile.in

     

       27
       27
       -
       @@ -80,7 +80,8 @@ T_CPPFLAGS =

     

       28
       28
       -
        X_ADAFLAGS =

     

       29
       29
       -
        T_ADAFLAGS =

     

       30
       30
       -
        

     

       31
       31
       -
       -ADAC = $(CC)

     

       32
       32
       -
       +# Never use the bootstrapped compiler, as it may not be built for ada

     

       33
       33
       -
       +ADAC = gcc

     

       34
       34
       -
        

     

       35
       35
       -
        ECHO = echo

     

       36
       36
       -
        CHMOD = chmod

     

       37
       37
       -
       diff --git a/gcc/vhdl/ortho-lang.c b/gcc/vhdl/ortho-lang.c

     

       38
       38
       -
       index 84aeb92..8eddd42 100644

     

       39
       39
       -
       --- a/gcc/vhdl/ortho-lang.c

     

       40
       40
       -
       +++ b/gcc/vhdl/ortho-lang.c

     

       41
       41
       -
       @@ -16,6 +16,7 @@

     

       42
       42
       -
        #include "options.h"

     

       43
       43
       -
        #include "real.h"

     

       44
       44
       -
       -#include "tree-gimple.h"

     

       45
       45
       -
       +#include "gimple.h"

     

       46
       46
       -
       +#include "tree.h"

     

       47
       47
       -
        #include "function.h"

     

       48
       48
       -
        #include "cgraph.h"

     

       49
       49
       -
        #include "target.h"

     

       50
       50
       -
       @@ -680,38 +681,10 @@ type_for_mode (enum machine_mode mode, int unsignedp)

     

       51
       51
       -
        

     

       52
       52
       -
        const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;

     

       53
       53
       -
        

     

       54
       54
       -
       -/* Tree code classes.  */

     

       55
       55
       -
       -

     

       56
       56
       -
       -#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,

     

       57
       57
       -
       -

     

       58
       58
       -
       -const enum tree_code_class tree_code_type[] = {

     

       59
       59
       -
       -#include "tree.def"

     

       60
       60
       -
       -  'x'

     

       61
       61
       -
       -};

     

       62
       62
       -
       -#undef DEFTREECODE

     

       63
       63
       -
       -

     

       64
       64
       -
       -/* Table indexed by tree code giving number of expression

     

       65
       65
       -
       -   operands beyond the fixed part of the node structure.

     

       66
       66
       -
       -   Not used for types or decls.  */

     

       67
       67
       -
       -

     

       68
       68
       -
       -#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,

     

       69
       69
       -
       -

     

       70
       70
       -
       -const unsigned char tree_code_length[] = {

     

       71
       71
       -
       -#include "tree.def"

     

       72
       72
       -
       -  0

     

       73
       73
       -
       -};

     

       74
       74
       -
       -#undef DEFTREECODE

     

       75
       75
       -
       -

     

       76
       76
       -
       -#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) NAME,

     

       77
       77
       -
       -const char * const tree_code_name[] = {

     

       78
       78
       -
       -#include "tree.def"

     

       79
       79
       -
       -  "@@dummy"

     

       80
       80
       -
       -};

     

       81
       81
       -
       -#undef DEFTREECODE

     

       82
       82
       -
        

     

       83
       83
       -
        union lang_tree_node 

     

       84
       84
       -
          GTY((desc ("0"),

     

       85
       85
       -
       -       chain_next ("(union lang_tree_node *) GENERIC_NEXT (&%h.generic)")))

     

       86
       86
       -
       +       chain_next ("(union lang_tree_node *) TREE_CHAIN (&%h.generic)")))

     

       87
       87
       -
        {

     

       88
       88
       -
          union tree_node GTY ((tag ("0"))) generic;

     

       89
       89
       -
        };

     

       90
       90
       -
       @@ -1162,7 +1135,7 @@ new_access_type (tree dtype)

     

       91
       91
       -
              res = make_node (POINTER_TYPE);

     

       92
       92
       -
              TREE_TYPE (res) = NULL_TREE;

     

       93
       93
       -
              /* Seems necessary.  */

     

       94
       94
       -
       -      TYPE_MODE (res) = Pmode;

     

       95
       95
       -
       +      SET_TYPE_MODE (res, Pmode);

     

       96
       96
       -
              layout_type (res);

     

       97
       97
       -
              return res;

     

       98
       98
       -
            }

     

       99
       99
       -
       diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in

     

       100
       100
       -
       index e201f64..f36fb97 100644

     

       101
       101
       -
       --- a/gcc/vhdl/Make-lang.in

     

       102
       102
       -
       +++ b/gcc/vhdl/Make-lang.in

     

       103
       103
       -
       @@ -132,7 +132,7 @@ ghdl1$(exeext): $(AGCC_OBJS) $(AGCC_DEPS) force

     

       104
       104
       -
        	 -cargs $(CFLAGS) $(GHDL_ADAFLAGS)

     

       105
       105
       -
        	$(GNATMAKE) -o $@ -aI$(srcdir)/vhdl -aOvhdl ortho_gcc-main \

     

       106
       106
       -
        	 -bargs -E -cargs $(CFLAGS) $(GHDL_ADAFLAGS) \

     

       107
       107
       -
       -	 -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS)

     

       108
       108
       -
       +	 -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) $(CLOOGLIBS) $(PPLLIBS)

     

       109
       109
       -
        

     

       110
       110
       -
        # The driver for ghdl.

     

       111
       111
       -
        ghdl$(exeext): force

-54

pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch

···

       1
       1
       -
       diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c

     

       2
       2
       -
       --- gcc-4.3.1-orig/gcc/cppdefault.c	2007-07-26 10:37:01.000000000 +0200

     

       3
       3
       -
       +++ gcc-4.3.1/gcc/cppdefault.c	2008-06-25 17:48:23.000000000 +0200

     

       4
       4
       -
       @@ -41,6 +41,10 @@

     

       5
       5
       -
        # undef CROSS_INCLUDE_DIR

     

       6
       6
       -
        #endif

     

       7
       7
       -
        

     

       8
       8
       -
       +#undef LOCAL_INCLUDE_DIR

     

       9
       9
       -
       +#undef SYSTEM_INCLUDE_DIR

     

       10
       10
       -
       +#undef STANDARD_INCLUDE_DIR

     

       11
       11
       -
       +

     

       12
       12
       -
        const struct default_include cpp_include_defaults[]

     

       13
       13
       -
        #ifdef INCLUDE_DEFAULTS

     

       14
       14
       -
        = INCLUDE_DEFAULTS;

     

       15
       15
       -
       diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c

     

       16
       16
       -
       --- gcc-4.3.1-orig/gcc/gcc.c	2008-03-02 23:55:19.000000000 +0100

     

       17
       17
       -
       +++ gcc-4.3.1/gcc/gcc.c	2008-06-25 17:52:53.000000000 +0200

     

       18
       18
       -
       @@ -1478,10 +1478,10 @@

     

       19
       19
       -
        /* Default prefixes to attach to command names.  */

     

       20
       20
       -
        

     

       21
       21
       -
        #ifndef STANDARD_STARTFILE_PREFIX_1

     

       22
       22
       -
       -#define STANDARD_STARTFILE_PREFIX_1 "/lib/"

     

       23
       23
       -
       +#define STANDARD_STARTFILE_PREFIX_1 ""

     

       24
       24
       -
        #endif

     

       25
       25
       -
        #ifndef STANDARD_STARTFILE_PREFIX_2

     

       26
       26
       -
       -#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"

     

       27
       27
       -
       +#define STANDARD_STARTFILE_PREFIX_2 ""

     

       28
       28
       -
        #endif

     

       29
       29
       -
        

     

       30
       30
       -
        #ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */

     

       31
       31
       -
       --- gcc-4.3.1-orig/gcc/Makefile.in	2008-05-11 20:54:15.000000000 +0200

     

       32
       32
       -
       +++ gcc-4.3.1/gcc/Makefile.in	2008-06-25 17:48:23.000000000 +0200

     

       33
       33
       -
       @@ -378,7 +378,11 @@

     

       34
       34
       -
        MD5_H	    = $(srcdir)/../include/md5.h

     

       35
       35
       -
        

     

       36
       36
       -
        # Default native SYSTEM_HEADER_DIR, to be overridden by targets.

     

       37
       37
       -
       -NATIVE_SYSTEM_HEADER_DIR = /usr/include

     

       38
       38
       -
       +# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent

     

       39
       39
       -
       +# `fixinc' from fixing header files in /usr/include.  However,

     

       40
       40
       -
       +# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set

     

       41
       41
       -
       +# it to some dummy directory.

     

       42
       42
       -
       +NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)

     

       43
       43
       -
        # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.

     

       44
       44
       -
        CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@

     

       45
       45
       -
        

     

       46
       46
       -
       @@ -3277,7 +3281,7 @@

     

       47
       47
       -
          -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \

     

       48
       48
       -
          -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \

     

       49
       49
       -
          -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \

     

       50
       50
       -
       -  -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \

     

       51
       51
       -
       +  -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \

     

       52
       52
       -
          -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \

     

       53
       53
       -
          -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \

     

       54
       54
       -
          -DPREFIX=\"$(prefix)/\" \

-26

pkgs/development/compilers/gcc/4.5/sources.nix

···

       1
       1
       -
       /* Automatically generated by `update-gcc.sh', do not edit.

     

       2
       2
       -
          For GCC 4.5.4.  */

     

       3
       3
       -
       { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:

     

       4
       4
       -
       

     

       5
       5
       -
       assert version == "4.5.4";

     

       6
       6
       -
       optional /* langC */ true (fetchurl {

     

       7
       7
       -
         url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";

     

       8
       8
       -
         sha256 = "894d90f72cbfc8707e330fa2b1847c443fa97cf9b7f26e86be554709510e624a";

     

       9
       9
       -
       }) ++

     

       10
       10
       -
       optional langCC (fetchurl {

     

       11
       11
       -
         url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";

     

       12
       12
       -
         sha256 = "f7e3bab5e22713fbce46c2acb35fb727748473a34a942ce00393d75e1b09b6b9";

     

       13
       13
       -
       }) ++

     

       14
       14
       -
       optional langFortran (fetchurl {

     

       15
       15
       -
         url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";

     

       16
       16
       -
         sha256 = "cf0803b4f5334a526dd8da1b2171d6724f50c17346b2d5c509b6abc973d2ef34";

     

       17
       17
       -
       }) ++

     

       18
       18
       -
       optional langJava (fetchurl {

     

       19
       19
       -
         url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";

     

       20
       20
       -
         sha256 = "c98398da6f8c4c7d1758e291089d99853fdd27112cd3f146b7a8c26e6d762a23";

     

       21
       21
       -
       }) ++

     

       22
       22
       -
       optional langAda (fetchurl {

     

       23
       23
       -
         url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";

     

       24
       24
       -
         sha256 = "8abddae15be65572b4d639bd9818057019bb4a45da4decfc6451511c8d580c5e";

     

       25
       25
       -
       }) ++

     

       26
       26
       -
       []

+2 -20

pkgs/development/compilers/gcc/4.8/default.nix

···

       3
       3
        
       , langObjC ? targetPlatform.isDarwin

     

       4
       4
        
       , langObjCpp ? targetPlatform.isDarwin

     

       5
       5
        
       , langJava ? false

     

       6
       6
       -
       , langAda ? false

     

       7
       7
       -
       , langVhdl ? false

     

       8
       6
        
       , langGo ? false

     

       9
       7
        
       , profiledCompiler ? false

     

       10
       8
        
       , staticCompiler ? false

     
···

       21
       19
        
       , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null

     

       22
       20
        
       , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null

     

       23
       21
        
       , x11Support ? langJava

     

       24
       24
       -
       , gnatboot ? null

     

       25
       22
        
       , enableMultilib ? false

     

       26
       23
        
       , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins

     

       27
       24
        
       , name ? "gcc"

     

       28
       25
        
       , libcCross ? null

     

       29
       26
        
       , crossStageStatic ? false

     

       30
       30
       -
       , gnat ? null

     

       31
       27
        
       , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd

     

       32
       28
        
       , stripped ? true

     

       33
       29
        
       , gnused ? null

     
···

       39
       35
        
       assert langJava     -> zip != null && unzip != null

     

       40
       36
        
                              && zlib != null && boehmgc != null

     

       41
       37
        
                              && perl != null;  # for `--enable-java-home'

     

       42
       42
       -
       assert langAda      -> gnatboot != null;

     

       43
       43
       -
       assert langVhdl     -> gnat != null;

     

       44
       38
        
       

     

       45
       39
        
       # We enable the isl cloog backend.

     

       46
       40
        
       assert cloog != null -> isl != null;

     
···

       68
       62
        
             ++ optional enableParallelBuilding ../parallel-bconfig.patch

     

       69
       63
        
             ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch

     

       70
       64
        
             ++ optional noSysDirs ../no-sys-dirs.patch

     

       71
       71
       -
             # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

     

       72
       72
       -
             # target libraries and tools.

     

       73
       73
       -
             ++ optional langAda ../gnat-cflags.patch

     

       74
       65
        
             ++ optional langFortran ../gfortran-driving.patch

     

       75
       66
        
             ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch

     

       76
       67
        
             ++ [(fetchpatch {

     
···

       279
       270
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       280
       271
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       281
       272
        
           ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])

     

       282
       282
       -
           ++ (optionals langAda [gnatboot])

     

       283
       283
       -
           ++ (optionals langVhdl [gnat])

     

       284
       273
        
       

     

       285
       274
        
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       286
       275
        
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     
···

       330
       319
        
                 ++ optional langCC       "c++"

     

       331
       320
        
                 ++ optional langFortran  "fortran"

     

       332
       321
        
                 ++ optional langJava     "java"

     

       333
       333
       -
                 ++ optional langAda      "ada"

     

       334
       334
       -
                 ++ optional langVhdl     "vhdl"

     

       335
       322
        
                 ++ optional langGo       "go"

     

       336
       323
        
                 ++ optional langObjC     "objc"

     

       337
       324
        
                 ++ optional langObjCpp   "obj-c++"

     
···

       368
       355
        
           ] ++

     

       369
       356
        
           optional javaAwtGtk "--enable-java-awt=gtk" ++

     

       370
       357
        
           optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++

     

       371
       371
       -
       

     

       372
       372
       -
           # Ada

     

       373
       373
       -
           optional langAda "--enable-libada" ++

     

       374
       358
        
       

     

       375
       359
        
           platformFlags ++

     

       376
       360
        
           optional (targetPlatform != hostPlatform) crossConfigureFlags ++

     
···

       464
       448
        
           ]);

     

       465
       449
        
       

     

       466
       450
        
         passthru = {

     

       467
       467
       -
           inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version;

     

       451
       451
       +
           inherit langC langCC langObjC langObjCpp langFortran langGo version;

     

       468
       452
        
           isGNU = true;

     

       469
       453
        
           hardeningUnsupportedFlags = [ "stackprotector" ];

     

       470
       454
        
         };

     
···

       490
       474
        
       

     

       491
       475
        
           maintainers = with stdenv.lib.maintainers; [ viric peti ];

     

       492
       476
        
       

     

       493
       493
       -
           # gnatboot is not available out of linux platforms, so we disable the darwin build

     

       494
       494
       -
           # for the gnat (ada compiler).

     

       495
       477
        
           platforms =

     

       496
       478
        
             stdenv.lib.platforms.linux ++

     

       497
       479
        
             stdenv.lib.platforms.freebsd ++

     

       498
       480
        
             stdenv.lib.platforms.illumos ++

     

       499
       499
       -
             optionals (langAda == false) stdenv.lib.platforms.darwin;

     

       481
       481
       +
             stdenv.lib.platforms.darwin;

     

       500
       482
        
         };

     

       501
       483
        
       }

     

       502
       484

+2 -20

pkgs/development/compilers/gcc/4.9/default.nix

···

       3
       3
        
       , langObjC ? targetPlatform.isDarwin

     

       4
       4
        
       , langObjCpp ? targetPlatform.isDarwin

     

       5
       5
        
       , langJava ? false

     

       6
       6
       -
       , langAda ? false

     

       7
       7
       -
       , langVhdl ? false

     

       8
       6
        
       , langGo ? false

     

       9
       7
        
       , profiledCompiler ? false

     

       10
       8
        
       , staticCompiler ? false

     
···

       21
       19
        
       , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null

     

       22
       20
        
       , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null

     

       23
       21
        
       , x11Support ? langJava

     

       24
       24
       -
       , gnatboot ? null

     

       25
       22
        
       , enableMultilib ? false

     

       26
       23
        
       , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins

     

       27
       24
        
       , name ? "gcc"

     

       28
       25
        
       , libcCross ? null

     

       29
       26
        
       , crossStageStatic ? false

     

       30
       30
       -
       , gnat ? null

     

       31
       27
        
       , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd

     

       32
       28
        
       , stripped ? true

     

       33
       29
        
       , gnused ? null

     
···

       39
       35
        
       assert langJava     -> zip != null && unzip != null

     

       40
       36
        
                              && zlib != null && boehmgc != null

     

       41
       37
        
                              && perl != null;  # for `--enable-java-home'

     

       42
       42
       -
       assert langAda      -> gnatboot != null;

     

       43
       43
       -
       assert langVhdl     -> gnat != null;

     

       44
       38
        
       

     

       45
       39
        
       # We enable the isl cloog backend.

     

       46
       40
        
       assert cloog != null -> isl != null;

     
···

       69
       63
        
             ++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ]

     

       70
       64
        
             ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch

     

       71
       65
        
             ++ optional noSysDirs ../no-sys-dirs.patch

     

       72
       72
       -
             # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

     

       73
       73
       -
             # target libraries and tools.

     

       74
       74
       -
             ++ optional langAda ../gnat-cflags.patch

     

       75
       66
        
             ++ optional langFortran ../gfortran-driving.patch

     

       76
       67
        
             ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26

     

       77
       68
        
             ;

     
···

       284
       275
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       285
       276
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       286
       277
        
           ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])

     

       287
       287
       -
           ++ (optionals langAda [gnatboot])

     

       288
       288
       -
           ++ (optionals langVhdl [gnat])

     

       289
       278
        
       

     

       290
       279
        
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       291
       280
        
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     
···

       338
       327
        
                 ++ optional langCC       "c++"

     

       339
       328
        
                 ++ optional langFortran  "fortran"

     

       340
       329
        
                 ++ optional langJava     "java"

     

       341
       341
       -
                 ++ optional langAda      "ada"

     

       342
       342
       -
                 ++ optional langVhdl     "vhdl"

     

       343
       330
        
                 ++ optional langGo       "go"

     

       344
       331
        
                 ++ optional langObjC     "objc"

     

       345
       332
        
                 ++ optional langObjCpp   "obj-c++"

     
···

       376
       363
        
           ] ++

     

       377
       364
        
           optional javaAwtGtk "--enable-java-awt=gtk" ++

     

       378
       365
        
           optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++

     

       379
       379
       -
       

     

       380
       380
       -
           # Ada

     

       381
       381
       -
           optional langAda "--enable-libada" ++

     

       382
       366
        
       

     

       383
       367
        
           platformFlags ++

     

       384
       368
        
           optional (targetPlatform != hostPlatform) crossConfigureFlags ++

     
···

       472
       456
        
           ]);

     

       473
       457
        
       

     

       474
       458
        
         passthru =

     

       475
       475
       -
           { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };

     

       459
       459
       +
           { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };

     

       476
       460
        
       

     

       477
       461
        
         inherit enableParallelBuilding enableMultilib;

     

       478
       462
        
       

     
···

       495
       479
        
       

     

       496
       480
        
           maintainers = with stdenv.lib.maintainers; [ viric peti ];

     

       497
       481
        
       

     

       498
       498
       -
           # gnatboot is not available out of linux platforms, so we disable the darwin build

     

       499
       499
       -
           # for the gnat (ada compiler).

     

       500
       482
        
           platforms =

     

       501
       483
        
             stdenv.lib.platforms.linux ++

     

       502
       484
        
             stdenv.lib.platforms.freebsd ++

     

       503
       485
        
             stdenv.lib.platforms.illumos ++

     

       504
       504
       -
             optionals (langAda == false) stdenv.lib.platforms.darwin;

     

       486
       486
       +
             stdenv.lib.platforms.darwin;

     

       505
       487
        
         };

     

       506
       488
        
       }

     

       507
       489

+2 -20

pkgs/development/compilers/gcc/5/default.nix

···

       3
       3
        
       , langObjC ? targetPlatform.isDarwin

     

       4
       4
        
       , langObjCpp ? targetPlatform.isDarwin

     

       5
       5
        
       , langJava ? false

     

       6
       6
       -
       , langAda ? false

     

       7
       7
       -
       , langVhdl ? false

     

       8
       6
        
       , langGo ? false

     

       9
       7
        
       , profiledCompiler ? false

     

       10
       8
        
       , staticCompiler ? false

     
···

       21
       19
        
       , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null

     

       22
       20
        
       , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null

     

       23
       21
        
       , x11Support ? langJava

     

       24
       24
       -
       , gnatboot ? null

     

       25
       22
        
       , enableMultilib ? false

     

       26
       23
        
       , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins

     

       27
       24
        
       , name ? "gcc"

     

       28
       25
        
       , libcCross ? null

     

       29
       26
        
       , crossStageStatic ? false

     

       30
       30
       -
       , gnat ? null

     

       31
       27
        
       , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd

     

       32
       28
        
       , stripped ? true

     

       33
       29
        
       , gnused ? null

     
···

       40
       36
        
       assert langJava     -> zip != null && unzip != null

     

       41
       37
        
                              && zlib != null && boehmgc != null

     

       42
       38
        
                              && perl != null;  # for `--enable-java-home'

     

       43
       43
       -
       assert langAda      -> gnatboot != null;

     

       44
       44
       -
       assert langVhdl     -> gnat != null;

     

       45
       39
        
       

     

       46
       40
        
       # LTO needs libelf and zlib.

     

       47
       41
        
       assert libelf != null -> zlib != null;

     
···

       67
       61
        
             [ ../use-source-date-epoch.patch ]

     

       68
       62
        
             ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch

     

       69
       63
        
             ++ optional noSysDirs ../no-sys-dirs.patch

     

       70
       70
       -
             # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

     

       71
       71
       -
             # target libraries and tools.

     

       72
       72
       -
             ++ optional langAda ../gnat-cflags.patch

     

       73
       64
        
             ++ optional langFortran ../gfortran-driving.patch

     

       74
       65
        
       

     

       75
       66
        
             # This could be applied unconditionally but I don't want to cause a full

     
···

       306
       297
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       307
       298
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       308
       299
        
           ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])

     

       309
       309
       -
           ++ (optionals langAda [gnatboot])

     

       310
       310
       -
           ++ (optionals langVhdl [gnat])

     

       311
       300
        
       

     

       312
       301
        
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       313
       302
        
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     
···

       359
       348
        
                 ++ optional langCC       "c++"

     

       360
       349
        
                 ++ optional langFortran  "fortran"

     

       361
       350
        
                 ++ optional langJava     "java"

     

       362
       362
       -
                 ++ optional langAda      "ada"

     

       363
       363
       -
                 ++ optional langVhdl     "vhdl"

     

       364
       351
        
                 ++ optional langGo       "go"

     

       365
       352
        
                 ++ optional langObjC     "objc"

     

       366
       353
        
                 ++ optional langObjCpp   "obj-c++"

     
···

       392
       379
        
           ] ++

     

       393
       380
        
           optional javaAwtGtk "--enable-java-awt=gtk" ++

     

       394
       381
        
           optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++

     

       395
       395
       -
       

     

       396
       396
       -
           # Ada

     

       397
       397
       -
           optional langAda "--enable-libada" ++

     

       398
       382
        
       

     

       399
       383
        
           platformFlags ++

     

       400
       384
        
           optional (targetPlatform != hostPlatform) crossConfigureFlags ++

     
···

       489
       473
        
           ]);

     

       490
       474
        
       

     

       491
       475
        
         passthru =

     

       492
       492
       -
           { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };

     

       476
       476
       +
           { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };

     

       493
       477
        
       

     

       494
       478
        
         inherit enableParallelBuilding enableMultilib;

     

       495
       479
        
       

     
···

       512
       496
        
       

     

       513
       497
        
           maintainers = with stdenv.lib.maintainers; [ viric peti ];

     

       514
       498
        
       

     

       515
       515
       -
           # gnatboot is not available out of linux platforms, so we disable the darwin build

     

       516
       516
       -
           # for the gnat (ada compiler).

     

       517
       499
        
           platforms =

     

       518
       500
        
             stdenv.lib.platforms.linux ++

     

       519
       501
        
             stdenv.lib.platforms.freebsd ++

     

       520
       520
       -
             optionals (langAda == false) stdenv.lib.platforms.darwin;

     

       502
       502
       +
             stdenv.lib.platforms.darwin;

     

       521
       503
        
         };

     

       522
       504
        
       }

     

       523
       505

+2 -20

pkgs/development/compilers/gcc/6/default.nix

···

       3
       3
        
       , langObjC ? targetPlatform.isDarwin

     

       4
       4
        
       , langObjCpp ? targetPlatform.isDarwin

     

       5
       5
        
       , langJava ? false

     

       6
       6
       -
       , langAda ? false

     

       7
       7
       -
       , langVhdl ? false

     

       8
       6
        
       , langGo ? false

     

       9
       7
        
       , profiledCompiler ? false

     

       10
       8
        
       , staticCompiler ? false

     
···

       21
       19
        
       , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null

     

       22
       20
        
       , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null

     

       23
       21
        
       , x11Support ? langJava

     

       24
       24
       -
       , gnatboot ? null

     

       25
       22
        
       , enableMultilib ? false

     

       26
       23
        
       , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins

     

       27
       24
        
       , name ? "gcc"

     

       28
       25
        
       , libcCross ? null

     

       29
       26
        
       , crossStageStatic ? false

     

       30
       30
       -
       , gnat ? null

     

       31
       27
        
       , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd

     

       32
       28
        
       , stripped ? true

     

       33
       29
        
       , gnused ? null

     
···

       40
       36
        
       assert langJava     -> zip != null && unzip != null

     

       41
       37
        
                              && zlib != null && boehmgc != null

     

       42
       38
        
                              && perl != null;  # for `--enable-java-home'

     

       43
       43
       -
       assert langAda      -> gnatboot != null;

     

       44
       44
       -
       assert langVhdl     -> gnat != null;

     

       45
       39
        
       

     

       46
       40
        
       # LTO needs libelf and zlib.

     

       47
       41
        
       assert libelf != null -> zlib != null;

     
···

       66
       60
        
             [ ../use-source-date-epoch.patch ]

     

       67
       61
        
             ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch

     

       68
       62
        
             ++ optional noSysDirs ../no-sys-dirs.patch

     

       69
       69
       -
             # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

     

       70
       70
       -
             # target libraries and tools.

     

       71
       71
       -
             ++ optional langAda ../gnat-cflags.patch

     

       72
       63
        
             ++ optional langFortran ../gfortran-driving.patch

     

       73
       64
        
             ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26

     

       74
       65
        
             ++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26

     
···

       306
       297
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       307
       298
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       308
       299
        
           ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])

     

       309
       309
       -
           ++ (optionals langAda [gnatboot])

     

       310
       310
       -
           ++ (optionals langVhdl [gnat])

     

       311
       300
        
       

     

       312
       301
        
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       313
       302
        
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     
···

       363
       352
        
                 ++ optional langCC       "c++"

     

       364
       353
        
                 ++ optional langFortran  "fortran"

     

       365
       354
        
                 ++ optional langJava     "java"

     

       366
       366
       -
                 ++ optional langAda      "ada"

     

       367
       367
       -
                 ++ optional langVhdl     "vhdl"

     

       368
       355
        
                 ++ optional langGo       "go"

     

       369
       356
        
                 ++ optional langObjC     "objc"

     

       370
       357
        
                 ++ optional langObjCpp   "obj-c++"

     
···

       396
       383
        
           ] ++

     

       397
       384
        
           optional javaAwtGtk "--enable-java-awt=gtk" ++

     

       398
       385
        
           optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++

     

       399
       399
       -
       

     

       400
       400
       -
           # Ada

     

       401
       401
       -
           optional langAda "--enable-libada" ++

     

       402
       386
        
       

     

       403
       387
        
           platformFlags ++

     

       404
       388
        
           optional (targetPlatform != hostPlatform) crossConfigureFlags ++

     
···

       492
       476
        
           ]);

     

       493
       477
        
       

     

       494
       478
        
         passthru =

     

       495
       495
       -
           { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };

     

       479
       479
       +
           { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };

     

       496
       480
        
       

     

       497
       481
        
         inherit enableParallelBuilding enableMultilib;

     

       498
       482
        
       

     
···

       515
       499
        
       

     

       516
       500
        
           maintainers = with stdenv.lib.maintainers; [ viric peti ];

     

       517
       501
        
       

     

       518
       518
       -
           # gnatboot is not available out of linux platforms, so we disable the darwin build

     

       519
       519
       -
           # for the gnat (ada compiler).

     

       520
       502
        
           platforms =

     

       521
       503
        
             stdenv.lib.platforms.linux ++

     

       522
       504
        
             stdenv.lib.platforms.freebsd ++

     

       523
       523
       -
             optionals (langAda == false) stdenv.lib.platforms.darwin;

     

       505
       505
       +
             stdenv.lib.platforms.darwin;

     

       524
       506
        
         };

     

       525
       507
        
       }

     

       526
       508

+5 -20

pkgs/development/compilers/gcc/7/default.nix

···

       3
       3
        
       , langObjC ? targetPlatform.isDarwin

     

       4
       4
        
       , langObjCpp ? targetPlatform.isDarwin

     

       5
       5
        
       , langJava ? false

     

       6
       6
       -
       , langAda ? false

     

       7
       7
       -
       , langVhdl ? false

     

       8
       6
        
       , langGo ? false

     

       9
       7
        
       , profiledCompiler ? false

     

       10
       8
        
       , staticCompiler ? false

     
···

       21
       19
        
       , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null

     

       22
       20
        
       , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null

     

       23
       21
        
       , x11Support ? langJava

     

       24
       24
       -
       , gnatboot ? null

     

       25
       22
        
       , enableMultilib ? false

     

       26
       23
        
       , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins

     

       27
       24
        
       , name ? "gcc"

     

       28
       25
        
       , libcCross ? null

     

       29
       26
        
       , crossStageStatic ? false

     

       30
       30
       -
       , gnat ? null

     

       31
       27
        
       , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd

     

       32
       28
        
       , stripped ? true

     

       33
       29
        
       , gnused ? null

     
···

       40
       36
        
       assert langJava     -> zip != null && unzip != null

     

       41
       37
        
                              && zlib != null && boehmgc != null

     

       42
       38
        
                              && perl != null;  # for `--enable-java-home'

     

       43
       43
       -
       assert langAda      -> gnatboot != null;

     

       44
       44
       -
       assert langVhdl     -> gnat != null;

     

       45
       39
        
       

     

       46
       40
        
       # LTO needs libelf and zlib.

     

       47
       41
        
       assert libelf != null -> zlib != null;

     
···

       70
       64
        
               url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";

     

       71
       65
        
               sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";

     

       72
       66
        
             })

     

       73
       73
       -
             # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

     

       74
       74
       -
             # target libraries and tools.

     

       75
       75
       -
             ++ optional langAda ../gnat-cflags.patch

     

       76
       76
       -
             ++ optional langFortran ../gfortran-driving.patch;

     

       67
       67
       +
             ++ optional langFortran ../gfortran-driving.patch

     

       68
       68
       +
                # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html

     

       69
       69
       +
             ++ optional targetPlatform.isRiscV ./riscv-pthread-reentrant.patch;

     

       77
       70
        
       

     

       78
       71
        
           javaEcj = fetchurl {

     

       79
       72
        
             # The `$(top_srcdir)/ecj.jar' file is automatically picked up at

     
···

       306
       299
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       307
       300
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       308
       301
        
           ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])

     

       309
       309
       -
           ++ (optionals langAda [gnatboot])

     

       310
       310
       -
           ++ (optionals langVhdl [gnat])

     

       311
       302
        
       

     

       312
       303
        
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       313
       304
        
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     
···

       359
       350
        
                 ++ optional langCC       "c++"

     

       360
       351
        
                 ++ optional langFortran  "fortran"

     

       361
       352
        
                 ++ optional langJava     "java"

     

       362
       362
       -
                 ++ optional langAda      "ada"

     

       363
       363
       -
                 ++ optional langVhdl     "vhdl"

     

       364
       353
        
                 ++ optional langGo       "go"

     

       365
       354
        
                 ++ optional langObjC     "objc"

     

       366
       355
        
                 ++ optional langObjCpp   "obj-c++"

     
···

       393
       382
        
           optional javaAwtGtk "--enable-java-awt=gtk" ++

     

       394
       383
        
           optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++

     

       395
       384
        
       

     

       396
       396
       -
           # Ada

     

       397
       397
       -
           optional langAda "--enable-libada" ++

     

       398
       385
        
       

     

       399
       386
        
           platformFlags ++

     

       400
       387
        
           optional (targetPlatform != hostPlatform) crossConfigureFlags ++

     
···

       488
       475
        
           ]);

     

       489
       476
        
       

     

       490
       477
        
         passthru =

     

       491
       491
       -
           { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };

     

       478
       478
       +
           { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };

     

       492
       479
        
       

     

       493
       480
        
         inherit enableParallelBuilding enableMultilib;

     

       494
       481
        
       

     
···

       511
       498
        
       

     

       512
       499
        
           maintainers = with stdenv.lib.maintainers; [ ];

     

       513
       500
        
       

     

       514
       514
       -
           # gnatboot is not available out of linux platforms, so we disable the darwin build

     

       515
       515
       -
           # for the gnat (ada compiler).

     

       516
       501
        
           platforms =

     

       517
       502
        
             stdenv.lib.platforms.linux ++

     

       518
       503
        
             stdenv.lib.platforms.freebsd ++

     

       519
       519
       -
             optionals (langAda == false) stdenv.lib.platforms.darwin;

     

       504
       504
       +
             stdenv.lib.platforms.darwin;

     

       520
       505
        
         };

     

       521
       506
        
       }

     

       522
       507

+13

pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch

···

       1
       1
       +
       Index: gcc/config/riscv/linux.h

     

       2
       2
       +
       ===================================================================

     

       3
       3
       +
       --- a/gcc/config/riscv/linux.h	(revision 257620)

     

       4
       4
       +
       +++ b/gcc/config/riscv/linux.h	(revision 257621)

     

       5
       5
       +
       @@ -47,6 +47,8 @@

     

       6
       6
       +
        

     

       7
       7
       +
        #define ICACHE_FLUSH_FUNC "__riscv_flush_icache"

     

       8
       8
       +
        

     

       9
       9
       +
       +#define CPP_SPEC "%{pthread:-D_REENTRANT}"

     

       10
       10
       +
       +

     

       11
       11
       +
        #define LINK_SPEC "\

     

       12
       12
       +
        -melf" XLEN_SPEC "lriscv \

     

       13
       13
       +
        %{shared} \

-2

pkgs/development/compilers/gcc/builder.sh

···

       287
       287
        
           # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31

     

       288
       288
        
           paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus}

     

       289
       289
        
       

     

       290
       290
       -
           eval "$postInstallGhdl"

     

       291
       291
       -
       

     

       292
       290
        
           # Two identical man pages are shipped (moving and compressing is done later)

     

       293
       291
        
           ln -sf gcc.1 "$out"/share/man/man1/g++.1

     

       294
       292
        
       }

-33

pkgs/development/compilers/gcc/gnat-cflags.patch

···

       1
       1
       -
       diff --git a/libada/Makefile.in b/libada/Makefile.in

     

       2
       2
       -
       index f5057a0..337e0c6 100644

     

       3
       3
       -
       --- a/libada/Makefile.in

     

       4
       4
       -
       +++ b/libada/Makefile.in

     

       5
       5
       -
       @@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)

     

       6
       6
       -
        WARN_CFLAGS = @warn_cflags@

     

       7
       7
       -
        

     

       8
       8
       -
        TARGET_LIBGCC2_CFLAGS=

     

       9
       9
       -
       -GNATLIBCFLAGS= -g -O2

     

       10
       10
       -
       +GNATLIBCFLAGS= -g -O2 $(CFLAGS)

     

       11
       11
       -
        GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \

     

       12
       12
       -
        	-DIN_RTS @have_getipinfo@

     

       13
       13
       -
        

     

       14
       14
       -
       --- a/gcc/ada/gcc-interface/Makefile.in

     

       15
       15
       -
       +++ b/gcc/ada/gcc-interface/Makefile.in

     

       16
       16
       -
       @@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata

     

       17
       17
       -
        SOME_ADAFLAGS =-gnata

     

       18
       18
       -
        FORCE_DEBUG_ADAFLAGS = -g

     

       19
       19
       -
        GNATLIBFLAGS = -gnatpg -nostdinc

     

       20
       20
       -
       -GNATLIBCFLAGS = -g -O2

     

       21
       21
       -
       +GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)

     

       22
       22
       -
        # Pretend that _Unwind_GetIPInfo is available for the target by default.  This

     

       23
       23
       -
        # should be autodetected during the configuration of libada and passed down to

     

       24
       24
       -
        # here, but we need something for --disable-libada and hope for the best.

     

       25
       25
       -
       @@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))

     

       26
       26
       -
        # Link flags used to build gnat tools.  By default we prefer to statically

     

       27
       27
       -
        # link with libgcc to avoid a dependency on shared libgcc (which is tricky

     

       28
       28
       -
        # to deal with as it may conflict with the libgcc provided by the system).

     

       29
       29
       -
       -GCC_LINK_FLAGS=-static-libgcc

     

       30
       30
       -
       +GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET)

     

       31
       31
       -
        

     

       32
       32
       -
        # End of variables for you to override.

     

       33
       33
       -

+2 -20

pkgs/development/compilers/gcc/snapshot/default.nix

···

       3
       3
        
       , langObjC ? targetPlatform.isDarwin

     

       4
       4
        
       , langObjCpp ? targetPlatform.isDarwin

     

       5
       5
        
       , langJava ? false

     

       6
       6
       -
       , langAda ? false

     

       7
       7
       -
       , langVhdl ? false

     

       8
       6
        
       , langGo ? false

     

       9
       7
        
       , profiledCompiler ? false

     

       10
       8
        
       , staticCompiler ? false

     
···

       21
       19
        
       , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null

     

       22
       20
        
       , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null

     

       23
       21
        
       , x11Support ? langJava

     

       24
       24
       -
       , gnatboot ? null

     

       25
       22
        
       , enableMultilib ? false

     

       26
       23
        
       , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins

     

       27
       24
        
       , name ? "gcc"

     

       28
       25
        
       , libcCross ? null

     

       29
       26
        
       , crossStageStatic ? false

     

       30
       30
       -
       , gnat ? null

     

       31
       27
        
       , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd

     

       32
       28
        
       , stripped ? true

     

       33
       29
        
       , gnused ? null

     
···

       41
       37
        
       assert langJava     -> zip != null && unzip != null

     

       42
       38
        
                              && zlib != null && boehmgc != null

     

       43
       39
        
                              && perl != null;  # for `--enable-java-home'

     

       44
       44
       -
       assert langAda      -> gnatboot != null;

     

       45
       45
       -
       assert langVhdl     -> gnat != null;

     

       46
       40
        
       

     

       47
       41
        
       # LTO needs libelf and zlib.

     

       48
       42
        
       assert libelf != null -> zlib != null;

     
···

       67
       61
        
             [ ]

     

       68
       62
        
             ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch

     

       69
       63
        
             ++ optional noSysDirs ../no-sys-dirs.patch

     

       70
       70
       -
             # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

     

       71
       71
       -
             # target libraries and tools.

     

       72
       72
       -
             ++ optional langAda ../gnat-cflags.patch

     

       73
       64
        
             ++ optional langFortran ../gfortran-driving.patch;

     

       74
       65
        
       

     

       75
       66
        
           javaEcj = fetchurl {

     
···

       278
       269
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       279
       270
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       280
       271
        
           ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])

     

       281
       281
       -
           ++ (optionals langAda [gnatboot])

     

       282
       282
       -
           ++ (optionals langVhdl [gnat])

     

       283
       272
        
       

     

       284
       273
        
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       285
       274
        
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     
···

       331
       320
        
                 ++ optional langCC       "c++"

     

       332
       321
        
                 ++ optional langFortran  "fortran"

     

       333
       322
        
                 ++ optional langJava     "java"

     

       334
       334
       -
                 ++ optional langAda      "ada"

     

       335
       335
       -
                 ++ optional langVhdl     "vhdl"

     

       336
       323
        
                 ++ optional langGo       "go"

     

       337
       324
        
                 ++ optional langObjC     "objc"

     

       338
       325
        
                 ++ optional langObjCpp   "obj-c++"

     
···

       364
       351
        
           ] ++

     

       365
       352
        
           optional javaAwtGtk "--enable-java-awt=gtk" ++

     

       366
       353
        
           optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++

     

       367
       367
       -
       

     

       368
       368
       -
           # Ada

     

       369
       369
       -
           optional langAda "--enable-libada" ++

     

       370
       354
        
       

     

       371
       355
        
           platformFlags ++

     

       372
       356
        
           optional (targetPlatform != hostPlatform) crossConfigureFlags ++

     
···

       460
       444
        
           ]);

     

       461
       445
        
       

     

       462
       446
        
         passthru =

     

       463
       463
       -
           { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };

     

       447
       447
       +
           { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };

     

       464
       448
        
       

     

       465
       449
        
         inherit enableParallelBuilding enableMultilib;

     

       466
       450
        
       

     
···

       483
       467
        
       

     

       484
       468
        
           maintainers = with stdenv.lib.maintainers; [ ];

     

       485
       469
        
       

     

       486
       486
       -
           # gnatboot is not available out of linux platforms, so we disable the darwin build

     

       487
       487
       -
           # for the gnat (ada compiler).

     

       488
       470
        
           platforms =

     

       489
       471
        
             stdenv.lib.platforms.linux ++

     

       490
       472
        
             stdenv.lib.platforms.freebsd ++

     

       491
       491
       -
             optionals (langAda == false) stdenv.lib.platforms.darwin;

     

       473
       473
       +
             stdenv.lib.platforms.darwin;

     

       492
       474
        
       

     

       493
       475
        
           broken = true;

     

       494
       476
        
         };

-44

pkgs/development/compilers/ghdl/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, gnat, zlib, llvm_35, ncurses, clang, flavour ? "mcode" }:

     

       2
       2
       -
       

     

       3
       3
       -
       # mcode only works on x86, while the llvm flavour works on both x86 and x86_64.

     

       4
       4
       -
       

     

       5
       5
       -
       

     

       6
       6
       -
       assert flavour == "llvm" || flavour == "mcode";

     

       7
       7
       -
       

     

       8
       8
       -
       let

     

       9
       9
       -
         inherit (stdenv.lib) optional;

     

       10
       10
       -
         inherit (stdenv.lib) optionals;

     

       11
       11
       -
         version = "0.33";

     

       12
       12
       -
       in

     

       13
       13
       -
       stdenv.mkDerivation rec {

     

       14
       14
       -
         name = "ghdl-${flavour}-${version}";

     

       15
       15
       -
       

     

       16
       16
       -
         src = fetchFromGitHub {

     

       17
       17
       -
           owner = "tgingold";

     

       18
       18
       -
           repo = "ghdl";

     

       19
       19
       -
           rev = "v${version}";

     

       20
       20
       -
           sha256 = "0g72rk2yzr0lrpncq2c1qcv71w3mi2hjq84r1yzgjr6d0qm87r2a";

     

       21
       21
       -
         };

     

       22
       22
       -
       

     

       23
       23
       -
         buildInputs = [ gnat zlib ] ++ optionals (flavour == "llvm") [ clang ncurses ];

     

       24
       24
       -
       

     

       25
       25
       -
         configureFlags = optional (flavour == "llvm") "--with-llvm=${llvm_35}";

     

       26
       26
       -
       

     

       27
       27
       -
         patchPhase = ''

     

       28
       28
       -
           # Disable warnings-as-errors, because there are warnings (unused things)

     

       29
       29
       -
           sed -i s/-gnatwae/-gnatwa/ Makefile.in ghdl.gpr.in

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         hardeningDisable = [ "all" ];

     

       33
       33
       -
       

     

       34
       34
       -
         enableParallelBuilding = true;

     

       35
       35
       -
       

     

       36
       36
       -
         meta = {

     

       37
       37
       -
           homepage = https://sourceforge.net/p/ghdl-updates/wiki/Home/;

     

       38
       38
       -
           description = "Free VHDL simulator";

     

       39
       39
       -
           maintainers = with stdenv.lib.maintainers; [viric];

     

       40
       40
       -
           platforms = with stdenv.lib.platforms; (if flavour == "llvm" then [ "i686-linux" "x86_64-linux" ]

     

       41
       41
       -
             else [ "i686-linux" ]);

     

       42
       42
       -
           license = stdenv.lib.licenses.gpl2Plus;

     

       43
       43
       -
         };

     

       44
       44
       -
       }

-48

pkgs/development/compilers/gnatboot/default.nix

···

       1
       1
       -
       {stdenv, fetchurl}:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "gentoo-gnatboot-4.1";

     

       5
       5
       -
       

     

       6
       6
       -
         src = if stdenv.system == "i686-linux" then

     

       7
       7
       -
           fetchurl {

     

       8
       8
       -
             url = "mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2";

     

       9
       9
       -
             sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr";

     

       10
       10
       -
           }

     

       11
       11
       -
           else if stdenv.system == "x86_64-linux" then

     

       12
       12
       -
           fetchurl {

     

       13
       13
       -
             url = "mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2";

     

       14
       14
       -
             sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4";

     

       15
       15
       -
           } else throw "Platform not supported";

     

       16
       16
       -
       

     

       17
       17
       -
         dontStrip=1;

     

       18
       18
       -
       

     

       19
       19
       -
         installPhase = ''

     

       20
       20
       -
           mkdir -p $out

     

       21
       21
       -
           cp -R * $out

     

       22
       22
       -
           set +e

     

       23
       23
       -
           for a in $out/bin/* ; do

     

       24
       24
       -
             patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \

     

       25
       25
       -
               --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a

     

       26
       26
       -
           done

     

       27
       27
       -
           set -e

     

       28
       28
       -
           mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc

     

       29
       29
       -
           ln -s $out/bin/gnatgcc $out/bin/gcc

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         passthru = {

     

       33
       33
       -
           langC = true; /* TRICK for gcc-wrapper to wrap it */

     

       34
       34
       -
           langCC = false;

     

       35
       35
       -
           langFortran = false;

     

       36
       36
       -
           langAda = true;

     

       37
       37
       -
         };

     

       38
       38
       -
       

     

       39
       39
       -
         meta = {

     

       40
       40
       -
           homepage = http://gentoo.org;

     

       41
       41
       -
           license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+

     

       42
       42
       -
           maintainers = [

     

       43
       43
       -
             stdenv.lib.maintainers.viric

     

       44
       44
       -
           ];

     

       45
       45
       -
           

     

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

     

       47
       47
       -
         };

     

       48
       48
       -
       }

+39

pkgs/development/compilers/llvm/4/cmdline-help.patch

···

       1
       1
       +
       From c7a9aa3a697c81432786a5583bf973771c7be15e Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Don Hinton <hintonda@gmail.com>

     

       3
       3
       +
       Date: Wed, 12 Jul 2017 01:15:46 +0000

     

       4
       4
       +
       Subject: [PATCH] Fix minor typo introduced in r276404

     

       5
       5
       +
       

     

       6
       6
       +
       Summary:

     

       7
       7
       +
       A space was added between '-' and 'help' when emitting help output.

     

       8
       8
       +
       

     

       9
       9
       +
       See https://reviews.llvm.org/D22621 for details.

     

       10
       10
       +
       

     

       11
       11
       +
       Reviewers: MaggieYi, vsk

     

       12
       12
       +
       

     

       13
       13
       +
       Reviewed By: vsk

     

       14
       14
       +
       

     

       15
       15
       +
       Subscribers: llvm-commits

     

       16
       16
       +
       

     

       17
       17
       +
       Differential Revision: https://reviews.llvm.org/D35283

     

       18
       18
       +
       

     

       19
       19
       +
       git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307745 91177308-0d34-0410-b5e6-96231b3b80d8

     

       20
       20
       +
       ---

     

       21
       21
       +
        lib/Support/CommandLine.cpp | 2 +-

     

       22
       22
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       23
       23
       +
       

     

       24
       24
       +
       diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp

     

       25
       25
       +
       index 3889902eea5..79defa5c36c 100644

     

       26
       26
       +
       --- a/lib/Support/CommandLine.cpp

     

       27
       27
       +
       +++ b/lib/Support/CommandLine.cpp

     

       28
       28
       +
       @@ -1236,7 +1236,7 @@ bool CommandLineParser::ParseCommandLineOptions(int argc,

     

       29
       29
       +
                     << ": Not enough positional command line arguments specified!\n"

     

       30
       30
       +
                     << "Must specify at least " << NumPositionalRequired

     

       31
       31
       +
                     << " positional argument" << (NumPositionalRequired > 1 ? "s" : "")

     

       32
       32
       +
       -             << ": See: " << argv[0] << " - help\n";

     

       33
       33
       +
       +             << ": See: " << argv[0] << " -help\n";

     

       34
       34
       +
            }

     

       35
       35
       +
        

     

       36
       36
       +
            ErrorParsing = true;

     

       37
       37
       +
       -- 

     

       38
       38
       +
       2.14.0

     

       39
       39
       +

+3

pkgs/development/compilers/llvm/4/llvm.nix

···

       78
       78
        
             substituteInPlace lib/esan/esan_sideline_linux.cpp \

     

       79
       79
        
               --replace 'struct sigaltstack' 'stack_t'

     

       80
       80
        
           )

     

       81
       81
       +
         '' + # Fix extra space printed in commandline help sometimes, "- help"

     

       82
       82
       +
         ''

     

       83
       83
       +
           patch -p1 -i ${./cmdline-help.patch}

     

       81
       84
        
         '' + stdenv.lib.optionalString stdenv.isAarch64 ''

     

       82
       85
        
           patch -p0 < ${../aarch64.patch}

     

       83
       86
        
         '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

+4 -1

pkgs/development/compilers/llvm/6/llvm.nix

···

       16
       16
        
       , debugVersion ? false

     

       17
       17
        
       , enableManpages ? false

     

       18
       18
        
       , enableSharedLibraries ? true

     

       19
       19
       +
       , enableWasm ? true

     

       19
       20
        
       , darwin

     

       20
       21
        
       }:

     

       21
       22
        
       

     
···

       113
       114
        
           "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"

     

       114
       115
        
           "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"

     

       115
       116
        
           "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"

     

       116
       116
       -
         ];

     

       117
       117
       +
         ] ++ stdenv.lib.optional enableWasm

     

       118
       118
       +
          "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"

     

       119
       119
       +
         ;

     

       117
       120
        
       

     

       118
       121
        
         postBuild = ''

     

       119
       122
        
           rm -fR $out

+2 -2

pkgs/development/compilers/nasm/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "2.13.02";

     

       5
       5
       +
         version = "2.13.03";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "1gmvjckxvkmx1kbglgrakc98qhy55xlqlk5flrdihz5yhv92hc4d";

     

       9
       9
       +
           sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ perl ];

+2 -2

pkgs/development/compilers/openjdk/8.nix

···

       14
       14
        
          * The JRE libraries are in directories that depend on the CPU.

     

       15
       15
        
          */

     

       16
       16
        
         architecture =

     

       17
       17
       -
           if stdenv.system == "i686-linux" then

     

       17
       17
       +
           if stdenv.hostPlatform.system == "i686-linux" then

     

       18
       18
        
             "i386"

     

       19
       19
       -
           else if stdenv.system == "x86_64-linux" then

     

       19
       19
       +
           else if stdenv.hostPlatform.system == "x86_64-linux" then

     

       20
       20
        
             "amd64"

     

       21
       21
        
           else

     

       22
       22
        
             throw "openjdk requires i686-linux or x86_64 linux";

+14 -15

pkgs/development/compilers/openjdk/bootstrap.nix

···

       1
       1
       -
       { stdenv, runCommand, glibc, fetchurl, file

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , runCommand, fetchurl, file

     

       2
       3
        
       

     

       3
       4
        
       , version

     

       4
       5
        
       }:

     

       5
       6
        
       

     

       7
       7
       +
       assert stdenv.hostPlatform.libc == "glibc";

     

       8
       8
       +
       

     

       6
       9
        
       let

     

       7
       10
        
         # !!! These should be on nixos.org

     

       8
       8
       -
         src = if glibc.system == "x86_64-linux" then

     

       11
       11
       +
         src = if stdenv.hostPlatform.system == "x86_64-linux" then

     

       9
       12
        
           (if version == "8" then

     

       10
       13
        
             fetchurl {

     

       11
       14
        
               url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1";

     
···

       17
       20
        
               sha256 = "024gg2sgg4labxbc1nhn8lxls2p7d9h3b82hnsahwaja2pm1hbra";

     

       18
       21
        
             }

     

       19
       22
        
           else throw "No bootstrap for version")

     

       20
       20
       -
         else if glibc.system == "i686-linux" then

     

       23
       23
       +
         else if stdenv.hostPlatform.system == "i686-linux" then

     

       21
       24
        
           (if version == "8" then

     

       22
       25
        
             fetchurl {

     

       23
       26
        
               url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1";

     
···

       39
       42
        
       

     

       40
       43
        
           LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')"

     

       41
       44
        
       

     

       42
       42
       -
           for i in $out/bin/*; do

     

       43
       43
       -
             patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $i || true

     

       44
       44
       -
             patchelf --set-rpath "${glibc.out}/lib:$LIBDIRS" $i || true

     

       45
       45
       -
           done

     

       46
       46
       -
       

     

       47
       47
       -
           find $out -name \*.so\* | while read lib; do

     

       48
       48
       -
             patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $lib || true

     

       49
       49
       -
             patchelf --set-rpath "${glibc.out}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" $lib || true

     

       45
       45
       +
           find "$out" -type f -print0 | while IFS= read -r -d "" elf; do

     

       46
       46
       +
             isELF "$elf" || continue

     

       47
       47
       +
             patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true

     

       48
       48
       +
             patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" "$elf" || true

     

       50
       49
        
           done

     

       51
       50
        
       

     

       52
       51
        
           # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:

     

       53
       53
       -
           exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')

     

       54
       54
       -
           for file in $exes; do

     

       55
       55
       -
             paxmark m "$file"

     

       52
       52
       +
           find "$out/bin" -type f -print0 | while IFS= read -r -d "" elf; do

     

       53
       53
       +
             isELF "$elf" || continue

     

       54
       54
       +
             paxmark m "$elf"

     

       56
       55
        
             # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.

     

       57
       57
       -
             ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}

     

       56
       56
       +
             ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$elf"''}

     

       58
       57
        
           done

     

       59
       58
        
         '';

     

       60
       59
        
       in bootstrap

+22 -15

pkgs/development/interpreters/guile/1.8.nix

···

       1
       1
       -
       { fetchurl, stdenv, libtool, readline, gmp

     

       2
       2
       -
       , gawk, makeWrapper }:

     

       1
       1
       +
       { stdenv, buildPackages

     

       2
       2
       +
       , buildPlatform, hostPlatform

     

       3
       3
       +
       , fetchurl, makeWrapper, gawk, pkgconfig

     

       4
       4
       +
       , libtool, readline, gmp

     

       5
       5
       +
       }:

     

       3
       6
        
       

     

       4
       7
        
       stdenv.mkDerivation rec {

     

       5
       8
        
         name = "guile-1.8.8";

     

       6
       9
        
       

     

       7
       10
        
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://gnu/guile/" + name + ".tar.gz";

     

       11
       11
       +
           url = "mirror://gnu/guile/${name}.tar.gz";

     

       9
       12
        
           sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3";

     

       10
       13
        
         };

     

       11
       14
        
       

     

       12
       12
       -
         patches = [ ./cpp-4.5.patch ];

     

       13
       13
       -
       

     

       14
       15
        
         outputs = [ "out" "dev" "info" ];

     

       15
       16
        
         setOutputFlags = false; # $dev gets into the library otherwise

     

       16
       17
        
       

     

       17
       18
        
         # GCC 4.6 raises a number of set-but-unused warnings.

     

       18
       19
        
         configureFlags = [ "--disable-error-on-warning" ];

     

       19
       20
        
       

     

       20
       20
       -
         nativeBuildInputs = [ makeWrapper gawk ];

     

       21
       21
       -
         propagatedBuildInputs = [ readline gmp libtool ];

     

       22
       22
       -
         selfNativeBuildInput = true;

     

       21
       21
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ]

     

       22
       22
       +
           ++ stdenv.lib.optional (hostPlatform != buildPlatform)

     

       23
       23
       +
                                  buildPackages.buildPackages.guile_1_8;

     

       24
       24
       +
         nativeBuildInputs = [ makeWrapper gawk pkgconfig ];

     

       25
       25
       +
         buildInputs = [ readline libtool ];

     

       26
       26
       +
       

     

       27
       27
       +
         propagatedBuildInputs = [ gmp ];

     

       28
       28
       +
       

     

       29
       29
       +
         patches = [ ./cpp-4.5.patch ];

     

       30
       30
       +
       

     

       23
       31
        
       

     

       24
       32
        
         postInstall = ''

     

       25
       33
        
           wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"

     
···

       46
       54
        
         setupHook = ./setup-hook.sh;

     

       47
       55
        
       

     

       48
       56
        
         meta = {

     

       49
       49
       -
           description = "GNU Guile, an embeddable Scheme interpreter";

     

       57
       57
       +
           description = "Embeddable Scheme implementation";

     

       58
       58
       +
           homepage    = http://www.gnu.org/software/guile/;

     

       59
       59
       +
           license     = stdenv.lib.licenses.lgpl2Plus;

     

       60
       60
       +
           maintainers = [ stdenv.lib.maintainers.ludo ];

     

       61
       61
       +
           platforms   = stdenv.lib.platforms.unix;

     

       62
       62
       +
       

     

       50
       63
        
           longDescription = ''

     

       51
       64
        
             GNU Guile is an interpreter for the Scheme programming language,

     

       52
       65
        
             packaged as a library that can be embedded into programs to make

     

       53
       66
        
             them extensible.  It supports many SRFIs.

     

       54
       67
        
           '';

     

       55
       55
       -
       

     

       56
       56
       -
           homepage = http://www.gnu.org/software/guile/;

     

       57
       57
       -
           license = stdenv.lib.licenses.lgpl2Plus;

     

       58
       58
       -
       

     

       59
       59
       -
           maintainers = [ stdenv.lib.maintainers.ludo ];

     

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

     

       61
       68
        
         };

     

       62
       69
        
       }

+10 -7

pkgs/development/interpreters/guile/2.0.nix

···

       1
       1
       -
       { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring

     

       2
       2
       -
       , libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null

     

       3
       3
       -
       , hostPlatform

     

       1
       1
       +
       { stdenv, buildPackages

     

       2
       2
       +
       , buildPlatform, hostPlatform

     

       3
       3
       +
       , fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig

     

       4
       4
       +
       , libffi, libtool, readline, gmp, boehmgc, libunistring

     

       5
       5
       +
       , coverageAnalysis ? null, gnu ? null

     

       4
       6
        
       }:

     

       5
       7
        
       

     

       6
       8
        
       # Do either a coverage analysis build or a standard build.

     
···

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

     

       20
       22
        
         setOutputFlags = false; # $dev gets into the library otherwise

     

       21
       23
        
       

     

       24
       24
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ]

     

       25
       25
       +
           ++ stdenv.lib.optional (hostPlatform != buildPlatform)

     

       26
       26
       +
                                  buildPackages.buildPackages.guile_2_0;

     

       22
       27
        
         nativeBuildInputs = [ makeWrapper gawk pkgconfig ];

     

       23
       28
        
         buildInputs = [ readline libtool libunistring libffi ];

     

       24
       24
       -
         propagatedBuildInputs = [ gmp boehmgc ]

     

       25
       29
        
       

     

       30
       30
       +
         propagatedBuildInputs = [ gmp boehmgc ]

     

       26
       31
        
           # XXX: These ones aren't normally needed here, but since

     

       27
       32
        
           # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add

     

       28
       33
        
           # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,

     

       29
       34
        
           # see below.

     

       30
       35
        
           ++ [ libtool libunistring ];

     

       31
       36
        
       

     

       32
       32
       -
         # A native Guile 2.0 is needed to cross-build Guile.

     

       33
       33
       -
         selfNativeBuildInput = true;

     

       34
       34
       -
       

     

       35
       37
        
         enableParallelBuilding = true;

     

       36
       38
        
       

     

       37
       39
        
         patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch

     
···

       40
       42
        
             url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";

     

       41
       43
        
             sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";

     

       42
       44
        
           })

     

       45
       45
       +
           ./riscv.patch

     

       43
       46
        
         ] ++

     

       44
       47
        
           (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);

     

       45
       48

+9 -6

pkgs/development/interpreters/guile/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring

     

       2
       2
       -
       , libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null

     

       3
       3
       -
       , hostPlatform

     

       1
       1
       +
       { stdenv, buildPackages

     

       2
       2
       +
       , buildPlatform, hostPlatform

     

       3
       3
       +
       , fetchurl, makeWrapper, gawk, pkgconfig

     

       4
       4
       +
       , libffi, libtool, readline, gmp, boehmgc, libunistring

     

       5
       5
       +
       , coverageAnalysis ? null, gnu ? null

     

       4
       6
        
       }:

     

       5
       7
        
       

     

       6
       8
        
       # Do either a coverage analysis build or a standard build.

     
···

       20
       22
        
         outputs = [ "out" "dev" "info" ];

     

       21
       23
        
         setOutputFlags = false; # $dev gets into the library otherwise

     

       22
       24
        
       

     

       25
       25
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ]

     

       26
       26
       +
           ++ stdenv.lib.optional (hostPlatform != buildPlatform)

     

       27
       27
       +
                                  buildPackages.buildPackages.guile;

     

       23
       28
        
         nativeBuildInputs = [ makeWrapper gawk pkgconfig ];

     

       24
       29
        
         buildInputs = [ readline libtool libunistring libffi ];

     

       25
       30
        
       

     
···

       30
       35
        
           # see below.

     

       31
       36
        
           ++ [ libtool libunistring ];

     

       32
       37
        
       

     

       33
       33
       -
         # A native Guile 2.0 is needed to cross-build Guile.

     

       34
       34
       -
         selfNativeBuildInput = true;

     

       35
       35
       -
       

     

       36
       38
        
         enableParallelBuilding = true;

     

       37
       39
        
       

     

       38
       40
        
         patches = [

     

       39
       41
        
           ./eai_system.patch

     

       42
       42
       +
           ./riscv.patch

     

       40
       43
        
         ] ++

     

       41
       44
        
           (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);

     

       42
       45

+13

pkgs/development/interpreters/guile/riscv.patch

···

       1
       1
       +
       diff --git a/module/system/base/target.scm b/module/system/base/target.scm

     

       2
       2
       +
       index 95ab8d8c9..93616f4a3 100644

     

       3
       3
       +
       --- a/module/system/base/target.scm

     

       4
       4
       +
       +++ b/module/system/base/target.scm

     

       5
       5
       +
       @@ -86,6 +86,8 @@

     

       6
       6
       +
                     (endianness big))

     

       7
       7
       +
                    ((string=? "aarch64" cpu)

     

       8
       8
       +
                     (endianness little))

     

       9
       9
       +
       +            ((string-match "riscv[1-9][0-9]*" cpu)

     

       10
       10
       +
       +             (endianness little))

     

       11
       11
       +
                    (else

     

       12
       12
       +
                     (error "unknown CPU endianness" cpu)))))

     

       13
       13
       +

+17

pkgs/development/interpreters/perl/MakeMaker-cross.patch

···

       1
       1
       +
       diff -Naur a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm

     

       2
       2
       +
       --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm	2017-06-30 17:03:20.000000000 -0400

     

       3
       3
       +
       +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm	2018-02-28 10:06:37.031237946 -0500

     

       4
       4
       +
       @@ -1267,7 +1267,12 @@

     

       5
       5
       +
            my $value = shift;

     

       6
       6
       +
            return $value if $UNDER_CORE;

     

       7
       7
       +
            my $tvalue = '';

     

       8
       8
       +
       -    require B;

     

       9
       9
       +
       +    eval {

     

       10
       10
       +
       +        require B;

     

       11
       11
       +
       +    };

     

       12
       12
       +
       +    if ($@) {

     

       13
       13
       +
       +        return $tvalue;

     

       14
       14
       +
       +    }

     

       15
       15
       +
            my $sv = B::svref_2object(\$value);

     

       16
       16
       +
            my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;

     

       17
       17
       +
            while ( $magic ) {

+35 -4

pkgs/development/interpreters/perl/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc, fetchpatch }:

     

       1
       1
       +
       { lib, stdenv, fetchurlBoot, buildPackages

     

       2
       2
       +
       , enableThreading ? stdenv ? glibc, fetchpatch, makeWrapper

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       with lib;

     

       4
       6
        
       

     
···

       29
       31
        
           };

     

       30
       32
        
       

     

       31
       33
        
           # TODO: Add a "dev" output containing the header files.

     

       32
       32
       -
           outputs = [ "out" "man" "devdoc" ];

     

       34
       34
       +
           outputs = [ "out" "man" "devdoc" ] ++

     

       35
       35
       +
             stdenv.lib.optional crossCompiling "dev";

     

       33
       36
        
           setOutputFlags = false;

     

       34
       37
        
       

     

       35
       38
        
           patches =

     
···

       45
       48
        
               })

     

       46
       49
        
             ++ optional stdenv.isSunOS ./ld-shared.patch

     

       47
       50
        
             ++ optional stdenv.isDarwin ./cpp-precomp.patch

     

       48
       48
       -
             ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch;

     

       51
       51
       +
             ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch

     

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

     

       49
       53
        
       

     

       50
       54
        
           postPatch = ''

     

       51
       55
        
             pwd="$(type -P pwd)"

     
···

       117
       121
        
                     if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path"

     

       118
       122
        
                   }" /no-such-path \

     

       119
       123
        
                 --replace "$man" /no-such-path

     

       124
       124
       +
             '' + stdenv.lib.optionalString crossCompiling

     

       125
       125
       +
             ''

     

       126
       126
       +
               mkdir -p $dev/lib/perl5/cross_perl/${version}

     

       127
       127
       +
               for dir in cnf/{stub,cpan}; do

     

       128
       128
       +
                 cp -r $dir/* $dev/lib/perl5/cross_perl/${version}

     

       129
       129
       +
               done

     

       130
       130
       +
       

     

       131
       131
       +
               mkdir -p $dev/bin

     

       132
       132
       +
               install -m755 miniperl $dev/bin/perl

     

       133
       133
       +
       

     

       134
       134
       +
               export runtimeArch="$(ls $out/lib/perl5/site_perl/${version})"

     

       135
       135
       +
               # wrapProgram should use a runtime-native SHELL by default, but

     

       136
       136
       +
               # it actually uses a buildtime-native one. If we ever fix that,

     

       137
       137
       +
               # we'll need to fix this to use a buildtime-native one.

     

       138
       138
       +
               #

     

       139
       139
       +
               # Adding the arch-specific directory is morally incorrect, as

     

       140
       140
       +
               # miniperl can't load the native modules there. However, it can

     

       141
       141
       +
               # (and sometimes needs to) load and run some of the pure perl

     

       142
       142
       +
               # code there, so we add it anyway. When needed, stubs can be put

     

       143
       143
       +
               # into $dev/lib/perl5/cross_perl/${version}.

     

       144
       144
       +
               wrapProgram $dev/bin/perl --prefix PERL5LIB : \

     

       145
       145
       +
                 "$dev/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch"

     

       120
       146
        
             ''; # */

     

       121
       147
        
       

     

       122
       148
        
           meta = {

     
···

       139
       165
        
             sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810";

     

       140
       166
        
           };

     

       141
       167
        
       

     

       142
       142
       -
           depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       168
       168
       +
           depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];

     

       143
       169
        
       

     

       144
       170
        
           postUnpack = ''

     

       145
       171
        
             unpackFile ${perl-cross-src}

     
···

       150
       176
        
           '';

     

       151
       177
        
       

     

       152
       178
        
           configurePlatforms = [ "build" "host" "target" ];

     

       179
       179
       +
       

     

       180
       180
       +
           inherit version;

     

       181
       181
       +
       

     

       182
       182
       +
           # TODO merge setup hooks

     

       183
       183
       +
           setupHook = ./setup-hook-cross.sh;

     

       153
       184
        
         });

     

       154
       185
        
       in rec {

     

       155
       186
        
         perl = perl524;

+12

pkgs/development/interpreters/perl/setup-hook-cross.sh

···

       1
       1
       +
       addPerlLibPath () {

     

       2
       2
       +
           addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@

     

       3
       3
       +
           addToSearchPath PERL5LIB $1/lib/perl5/site_perl/cross_perl/@version@

     

       4
       4
       +
           # Adding the arch-specific directory is morally incorrect, as

     

       5
       5
       +
           # miniperl can't load the native modules there. However, it can

     

       6
       6
       +
           # (and sometimes needs to) load and run some of the pure perl

     

       7
       7
       +
           # code there, so we add it anyway. When needed, stubs can be put

     

       8
       8
       +
           # into $1/lib/perl5/site_perl/cross_perl/@version@

     

       9
       9
       +
           addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@/@runtimeArch@

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       12
       12
       +
       addEnvHooks "$targetOffset" addPerlLibPath

+2 -2

pkgs/development/libraries/atk/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "atk";

     

       5
       5
       -
         version = "2.26.1";

     

       5
       5
       +
         version = "2.28.1";

     

       6
       6
        
       in

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         name = "${pname}-${version}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";

     

       12
       12
       -
           sha256 = "1jwpx8az0iifw176dc2hl4mmg6gvxzxdkd1qvg4ds7c5hdmzy07g";

     

       12
       12
       +
           sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         enableParallelBuilding = true;

+2 -2

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

···

       1
       1
        
       { stdenv, fetchFromBitbucket, cmake }:

     

       2
       2
        
       let

     

       3
       3
       -
         version = "0.6.1";

     

       3
       3
       +
         version = "0.6.2";

     

       4
       4
        
       in stdenv.mkDerivation {

     

       5
       5
        
         name = "libgme-${version}";

     

       6
       6
        
       

     
···

       16
       16
        
           owner = "mpyne";

     

       17
       17
        
           repo = "game-music-emu";

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "04vwpv3pmjcil1jw5vcnlg45nch5awqs06y3xqdlp3ibx5i4k199";

     

       19
       19
       +
           sha256 = "00vlbfk5h99dq5rbwxk20dv72dig6wdwpgf83q451avsscky0jvk";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [ cmake ];

+2 -1

pkgs/development/libraries/boost/1.66.nix

···

       1
       1
       -
       { stdenv, callPackage, fetchurl, ... } @ args:

     

       1
       1
       +
       { stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       callPackage ./generic.nix (args // rec {

     

       4
       4
        
         version = "1.66_0";

     
···

       9
       9
        
           sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         toolset = if stdenv.cc.isClang then "clang" else null;

     

       12
       13
        
       })

+3 -2

pkgs/development/libraries/dbus/make-dbus-conf.nix

···

       24
       24
        
                 rewritePrefix="file://${dbus}/share/xml/dbus/"/>

     

       25
       25
        
             </catalog>

     

       26
       26
        
           '';

     

       27
       27
       +
           nativeBuildInputs = [ libxslt ];

     

       27
       28
        
         }

     

       28
       29
        
         ''

     

       29
       30
        
           mkdir -p $out

     

       30
       31
        
       

     

       31
       31
       -
           ${libxslt.bin}/bin/xsltproc --nonet \

     

       32
       32
       +
           xsltproc --nonet \

     

       32
       33
        
             --stringparam serviceDirectories "$serviceDirectories" \

     

       33
       34
        
             --stringparam suidHelper "$suidHelper" \

     

       34
       35
        
             ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \

     

       35
       36
        
             > $out/system.conf

     

       36
       36
       -
           ${libxslt.bin}/bin/xsltproc --nonet \

     

       37
       37
       +
           xsltproc --nonet \

     

       37
       38
        
             --stringparam serviceDirectories "$serviceDirectories" \

     

       38
       39
        
             ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \

     

       39
       40
        
             > $out/session.conf

+10 -5

pkgs/development/libraries/epoxy/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python

     

       2
       2
       -
       , libGLU_combined, libX11

     

       2
       2
       +
       , libGL, libX11

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

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

     

       7
       7
       -
         version = "1.3.1";

     

       7
       7
       +
         version = "1.5.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "anholt";

     

       11
       11
        
           repo = "libepoxy";

     

       12
       12
       -
           rev = "v${version}";

     

       13
       13
       -
           sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl";

     

       12
       12
       +
           rev = "${version}";

     

       13
       13
       +
           sha256 = "1ixpqb10pmdy3n9nxd5inflig9dal5502ggadcns5b58j6jr0yv0";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         outputs = [ "out" "dev" ];

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];

     

       19
       19
       -
         buildInputs = [ libGLU_combined libX11 ];

     

       19
       19
       +
         buildInputs = [ libGL libX11 ];

     

       20
       20
        
       

     

       21
       21
        
         preConfigure = stdenv.lib.optional stdenv.isDarwin ''

     

       22
       22
        
           substituteInPlace configure --replace build_glx=no build_glx=yes

     

       23
       23
        
           substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         # add libGL to rpath because libepoxy dlopen()s libEGL

     

       27
       27
       +
         postFixup = ''

     

       28
       28
       +
           patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libGL ]}:$(patchelf --print-rpath $out/lib/libepoxy.so.0.0.0)" $out/lib/libepoxy.so.0.0.0

     

       24
       29
        
         '';

     

       25
       30
        
       

     

       26
       31
        
         meta = with stdenv.lib; {

+2 -1

pkgs/development/libraries/fontconfig/default.nix

···

       39
       39
        
         # additionally required for the glibc-2.25 patch; avoid requiring gperf

     

       40
       40
        
         postPatch = ''

     

       41
       41
        
           sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf}

     

       42
       42
       -
           touch src/*

     

       42
       42
       +
           sleep 2

     

       43
       43
       +
           touch src/fcobjshash.h

     

       43
       44
        
         '';

     

       44
       45
        
       

     

       45
       46
        
         outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config

+2 -2

pkgs/development/libraries/gnutls/3.6.nix

···

       1
       1
        
       { callPackage, fetchurl, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       callPackage ./generic.nix (args // rec {

     

       4
       4
       -
         version = "3.6.1";

     

       4
       4
       +
         version = "3.6.2";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";

     

       8
       8
       -
           sha256 = "1vdsir53ddxyapnxh5fpnfyij3scx3818iri4hl07g4lk4n0vc90";

     

       8
       8
       +
           sha256 = "07wdffklwmxpa9i50sh5nwrc5ajb47skrldm6rzjc0jf4dxxpmdw";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         # Skip two tests introduced in 3.5.11.  Probable reasons of failure:

+3 -3

pkgs/development/libraries/gobject-introspection/default.nix

···

       1
       1
        
       { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python

     

       2
       2
        
       , libintlOrEmpty, cctools, cairo, gnome3

     

       3
       3
        
       , substituteAll, nixStoreDir ? builtins.storeDir

     

       4
       4
       +
       , x11Support ? true

     

       4
       5
        
       }:

     

       5
       6
        
       # now that gobjectIntrospection creates large .gir files (eg gtk3 case)

     

       6
       7
        
       # it may be worth thinking about using multiple derivation outputs

     
···

       43
       44
        
             src = ./absolute_shlib_path.patch;

     

       44
       45
        
             inherit nixStoreDir;

     

       45
       46
        
           })

     

       46
       46
       -
           # https://github.com/NixOS/nixpkgs/issues/34080

     

       47
       47
       +
         ] ++ stdenv.lib.optional x11Support # https://github.com/NixOS/nixpkgs/issues/34080

     

       47
       48
        
           (substituteAll {

     

       48
       49
        
             src = ./absolute_gir_path.patch;

     

       49
       50
        
             cairoLib = "${getLib cairo}/lib";

     

       50
       50
       -
           })

     

       51
       51
       -
         ];

     

       51
       51
       +
           });

     

       52
       52
        
       

     

       53
       53
        
         passthru = {

     

       54
       54
        
           updateScript = gnome3.updateScript {

+2 -4

pkgs/development/libraries/gtk+/3.x.nix

···

       11
       11
        
       

     

       12
       12
        
       with stdenv.lib;

     

       13
       13
        
       

     

       14
       14
       -
       let

     

       15
       15
       -
         version = "3.22.26";

     

       16
       16
       -
       in

     

       17
       14
        
       stdenv.mkDerivation rec {

     

       18
       15
        
         name = "gtk+3-${version}";

     

       16
       16
       +
         version = "3.22.28";

     

       19
       17
        
       

     

       20
       18
        
         src = fetchurl {

     

       21
       19
        
           url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz";

     

       22
       22
       -
           sha256 = "61eef0d320e541976e2dfe445729f12b5ade53050ee9de6184235cb60cd4b967";

     

       20
       20
       +
           sha256 = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f";

     

       23
       21
        
         };

     

       24
       22
        
       

     

       25
       23
        
         outputs = [ "out" "dev" ];

+2 -2

pkgs/development/libraries/harfbuzz/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
       -
         version = "1.7.1";

     

       8
       8
       +
         version = "1.7.5";

     

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

     

       10
       10
        
       in

     

       11
       11
        
       

     
···

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";

     

       17
       17
       -
           sha256 = "9645a6e83313b690602017f18d4eb2adf81f2e54c6fc4471e19331304965154e";

     

       17
       17
       +
           sha256 = "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         outputs = [ "out" "dev" ];

+2 -2

pkgs/development/libraries/http-parser/default.nix

···

       1
       1
        
       { stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "2.7.0";

     

       4
       4
       +
         version = "2.8.0";

     

       5
       5
        
       in stdenv.mkDerivation {

     

       6
       6
        
         name = "http-parser-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz";

     

       10
       10
       -
           sha256 = "0rqij6v6wv1giwx4prfa082kw1nka5d9vlb06zkc8mwszq1vzidh";

     

       10
       10
       +
           sha256 = "17a7k3nxv2p1sp2x5d89wr51vk770753vz6qnlp2gz7nkgwwcxvj";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         patches = [ ./build-shared.patch ];

+2 -2

pkgs/development/libraries/imlib2/default.nix

···

       5
       5
        
       with stdenv.lib;

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         name = "imlib2-1.4.10";

     

       8
       8
       +
         name = "imlib2-1.5.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";

     

       12
       12
       -
           sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z";

     

       12
       12
       +
           sha256 = "0kg28b5wp886hiy12v7abdybrvlymb7g3nvg0ysn2y8h883s5w8m";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ]

+2 -2

pkgs/development/libraries/jansson/default.nix

···

       1
       1
        
       {stdenv, fetchurl}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "jansson-2.10";

     

       4
       4
       +
         name = "jansson-2.11";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://www.digip.org/jansson/releases/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq";

     

       8
       8
       +
           sha256 = "1x5jllzzqamq6kahx9d9a5mrarm9m3f30vfxvcqpi6p4mcnz91bf";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         meta = with stdenv.lib; {

+2 -2

pkgs/development/libraries/lcms2/default.nix

···

       1
       1
        
       { stdenv, fetchurl, libtiff, libjpeg, zlib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "lcms2-2.8";

     

       4
       4
       +
         name = "lcms2-2.9";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://sourceforge/lcms/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "08pvl289g0mbznzx5l6ibhaldsgx41kwvdn2c974ga9fkli2pl36";

     

       8
       8
       +
           sha256 = "083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "bin" "dev" "out" ];

+2

pkgs/development/libraries/libatomic_ops/default.nix

···

       12
       12
        
           sha256 ="1rif2hjscq5mh639nsnjhb90c01gnmy1sbmj6x6hsn1xmpnj95r1";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       +
         outputs = [ "out" "dev" "doc" ];

     

       16
       16
       +
       

     

       15
       17
        
         # https://github.com/ivmai/libatomic_ops/pull/32

     

       16
       18
        
         patches = if hostPlatform.isRiscV then [ ./riscv.patch ] else null;

     

       17
       19

+2 -2

pkgs/development/libraries/libdrm/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libdrm-2.4.89";

     

       4
       4
       +
         name = "libdrm-2.4.90";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e";

     

       8
       8
       +
           sha256 = "db37ec8f1dbaa2c192ad9903c8d0988b858ae88031e96f169bf76aaf705db68b";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" "bin" ];

+2 -2

pkgs/development/libraries/libdvdcss/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "1.4.0";

     

       5
       5
       +
         version = "1.4.1";

     

       6
       6
        
       

     

       7
       7
        
         buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";

     

       11
       11
       -
           sha256 = "0nl45ifc4xcb196snv9d6hinfw614cqpzcqp92dg43c0hickg290";

     

       11
       11
       +
           sha256 = "1b7awvyahivglp7qmgx2g5005kc5npv257gw7wxdprjsnx93f1zb";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         meta = with stdenv.lib; {

+2 -2

pkgs/development/libraries/libevdev/default.nix

···

       1
       1
        
       { stdenv, fetchurl, python }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libevdev-1.5.7";

     

       4
       4
       +
         name = "libevdev-1.5.8";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "08nl3p6226k51zph52fhilxvi3b31spp6fz8szzrglzhl8vrxrd1";

     

       8
       8
       +
           sha256 = "0vac7n1miqdprikq4g63vsk681q8v416r0nbh2xai7b08qgdi0v0";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ python ];

+3 -3

pkgs/development/libraries/libgcrypt/default.nix

···

       21
       21
        
         # The build enables -O2 by default for everything else.

     

       22
       22
        
         hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";

     

       23
       23
        
       

     

       24
       24
       -
         depsBuildBuild = stdenv.lib.optional stdenv.isCross buildPackages.stdenv.cc;

     

       24
       24
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       25
       25
        
       

     

       26
       26
        
         buildInputs = [ libgpgerror ]

     

       27
       27
        
           ++ stdenv.lib.optional stdenv.isDarwin gettext

     

       28
       28
        
           ++ stdenv.lib.optional enableCapabilities libcap;

     

       29
       29
        
       

     

       30
       30
       -
         preConfigure = if stdenv.isCross then ''

     

       30
       30
       +
         preConfigure = stdenv.lib.optionalString stdenv.isCross ''

     

       31
       31
        
           # This is intentional: gpg-error-config is a shell script that will work during the build

     

       32
       32
        
           mkdir -p "$NIX_BUILD_TOP"/bin

     

       33
       33
        
           ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin"

     

       34
       34
        
           export PATH="$NIX_BUILD_TOP/bin:$PATH"

     

       35
       35
       -
         '' else null;

     

       35
       35
       +
         '';

     

       36
       36
        
       

     

       37
       37
        
         # Make sure libraries are correct for .pc and .la files

     

       38
       38
        
         # Also make sure includes are fixed for callers who don't use libgpgcrypt-config

+2 -2

pkgs/development/libraries/libgsf/default.nix

···

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

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "libgsf-1.14.41";

     

       7
       7
       +
         name = "libgsf-1.14.42";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "1lq87wnrsjbjafpk3c8xwd56gqx319fhck9xkg2da88hd9c9h2qm";

     

       11
       11
       +
           sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig intltool ];

+5 -3

pkgs/development/libraries/libidn2/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, libiconv, libunistring, help2man, ronn }:

     

       1
       1
       +
       { fetchurl, stdenv, libiconv, libunistring, help2man, ronn, buildPackages }:

     

       2
       2
        
       

     

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     
···

       15
       15
        
       

     

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

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ libunistring ronn ]

     

       19
       19
       -
           ++ optionals stdenv.isDarwin [ libiconv help2man ];

     

       18
       18
       +
         nativeBuildInputs = [ ronn ]

     

       19
       19
       +
           ++ optional stdenv.isDarwin help2man;

     

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

     

       21
       21
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       20
       22
        
       

     

       21
       23
        
         meta = {

     

       22
       24
        
           homepage = "https://www.gnu.org/software/libidn/#libidn2";

+2 -2

pkgs/development/libraries/libinput/default.nix

···

       16
       16
        
       with stdenv.lib;

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         name = "libinput-${version}";

     

       19
       19
       -
         version = "1.9.4";

     

       19
       19
       +
         version = "1.10.0";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchurl {

     

       22
       22
        
           url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";

     

       23
       23
       -
           sha256 = "142icwzpirwddl7ghfmynxpnsbjg53rjxpzv4arjsaiw9r6bvk8b";

     

       23
       23
       +
           sha256 = "0mrzsf0349d1g68lizkzxw7vaw459fl8xhl7v0s8njb31hp2riy2";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         outputs = [ "out" "dev" ];

+2 -2

pkgs/development/libraries/libkate/default.nix

···

       1
       1
        
       { stdenv, fetchurl, libogg, libpng }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libkate-0.3.8";

     

       4
       4
       +
         name = "libkate-0.4.1";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "00d6561g31la9bb8q99b7l4rvi67yiwm50ky8dhlsjd88h7rks2n";

     

       8
       8
       +
           sha256 = "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ libogg libpng ];

+2 -2

pkgs/development/libraries/libmbim/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libmbim-1.14.2";

     

       4
       4
       +
         name = "libmbim-1.16.0";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "1krirl9881dnx7l29zhvagk2qlhi26vpvkzdifjklhrjhimzxji2";

     

       8
       8
       +
           sha256 = "1hpsjc7bzmakzvj8z9fffvqknc38fa8ridpmklq46jyxxnz51jn8";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" "man" ];

+2 -2

pkgs/development/libraries/libmicrohttpd/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "0.9.58";

     

       5
       5
       +
         version = "0.9.59";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "1wq17qvizis7bsyvyw1gnfycvivssncngziddnyrbzv2dhvy24bs";

     

       9
       9
       +
           sha256 = "0g4jgnv43yddr9yxrqg11632rip0lg5c53gmy5wy3c0i1dywv74v";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         outputs = [ "out" "dev" "devdoc" "info" ];

+2 -2

pkgs/development/libraries/libmng/default.nix

···

       1
       1
        
       { stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libmng-2.0.2";

     

       4
       4
       +
         name = "libmng-2.0.3";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://sourceforge/libmng/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317";

     

       8
       8
       +
           sha256 = "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" "devdoc" ];

+2 -2

pkgs/development/libraries/libmodplug/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "0.8.8.5";

     

       4
       4
       +
         version = "0.8.9.0";

     

       5
       5
        
       in stdenv.mkDerivation rec {

     

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

     

       7
       7
        
       

     
···

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz";

     

       18
       18
       -
           sha256 = "1bfsladg7h6vnii47dd66f5vh1ir7qv12mfb8n36qiwrxq92sikp";

     

       18
       18
       +
           sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25";

     

       19
       19
        
         };

     

       20
       20
        
       }

+2 -2

pkgs/development/libraries/libqmi/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libqmi-1.18.0";

     

       4
       4
       +
         name = "libqmi-1.20.0";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "1v4cz3nsmh7nn3smhlhwzrb7yh6l1f270bwf40qacxayjdajr950";

     

       8
       8
       +
           sha256 = "1d3fca477sdwbv4bsq1cl98qc8sixrzp0gqjcmjj8mlwfk9qqhi1";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" "devdoc" ];

+2 -2

pkgs/development/libraries/libraw1394/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libraw1394-2.1.1";

     

       4
       4
       +
         name = "libraw1394-2.1.2";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "0x6az154wr7wv3945485grjvpk604khv34dbaph6vmc1zdasqq59";

     

       8
       8
       +
           sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         meta = with stdenv.lib; {

+2

pkgs/development/libraries/libseccomp/default.nix

···

       9
       9
        
           sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         outputs = [ "out" "lib" "dev" "man" ];

     

       13
       13
       +
       

     

       12
       14
        
         buildInputs = [ getopt makeWrapper ];

     

       13
       15
        
       

     

       14
       16
        
         patchPhase = ''

+2 -2

pkgs/development/libraries/libspatialite/default.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "libspatialite-4.2.0";

     

       6
       6
       +
         name = "libspatialite-4.3.0a";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz";

     

       10
       10
       -
           sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz";

     

       10
       10
       +
           sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/development/libraries/libunistring/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "0.9.8";

     

       5
       5
       +
         version = "0.9.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://gnu/libunistring/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "1x9wnpzg7vxyjpnzab6vw0afbcijfbd57qrrkqrppynh0nyz54mp";

     

       9
       9
       +
           sha256 = "0jm8pr469y7ybb90ll8k1585rciqm8ckzif0laipqhp5z440rsgm";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         outputs = [ "out" "dev" "info" "doc" ];

+2

pkgs/development/libraries/libunwind/default.nix

···

       33
       33
        
           platforms = platforms.linux;

     

       34
       34
        
           license = licenses.mit;

     

       35
       35
        
         };

     

       36
       36
       +
       

     

       37
       37
       +
         passthru.supportsHost = !stdenv.hostPlatform.isRiscV;

     

       36
       38
        
       }

+2 -2

pkgs/development/libraries/libuv/default.nix

···

       2
       2
        
       , ApplicationServices, CoreServices }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         version = "1.19.1";

     

       5
       5
       +
         version = "1.19.2";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "libuv";

     

       10
       10
        
           repo = "libuv";

     

       11
       11
        
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "020jap4xvjns1rgb2kvpf1nib3f2d5fyqh04afgkk32hiag0kn66";

     

       12
       12
       +
           sha256 = "118r8wigm65107fm7kzfz7gc4awy8xxg0knvwnshx1j40ks08x9z";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         postPatch = let

+1 -1

pkgs/development/libraries/libva-utils/default.nix

···

       10
       10
        
           owner  = "01org";

     

       11
       11
        
           repo   = "libva-utils";

     

       12
       12
        
           rev    = version;

     

       13
       13
       -
           sha256 = "02n51cvp8bzzjk4fargwvgh7z71y8spg24hqgaawbp3p3ahh7xxi";

     

       13
       13
       +
           sha256 = "113wdmi4r0qligizj9zmd4a8ml1996x9g2zp2i4pmhb8frv9m8j2";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

+3 -2

pkgs/development/libraries/libva/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         name = "libva-${lib.optionalString (!minimal) "full-"}${version}";

     

       9
       9
       -
         version = "2.0.0";

     

       9
       9
       +
         version = "2.1.0";

     

       10
       10
        
       

     

       11
       11
       +
         # update libva-utils and vaapiIntel as well

     

       11
       12
        
         src = fetchFromGitHub {

     

       12
       13
        
           owner  = "01org";

     

       13
       14
        
           repo   = "libva";

     

       14
       15
        
           rev    = version;

     

       15
       15
       -
           sha256 = "1x8rlmv5wfqjz3j87byrxb4d9vp5b4lrrin2fx254nwl3aqy15hy";

     

       16
       16
       +
           sha256 = "1a60lrgr65hx9b2qp0gjky1298c4d4zp3ap6vnmmz850sxx5rm8w";

     

       16
       17
        
         };

     

       17
       18
        
       

     

       18
       19
        
         outputs = [ "dev" "out" ];

+2 -2

pkgs/development/libraries/libwacom/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "0.26";

     

       5
       5
       +
         version = "0.28";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63";

     

       9
       9
       +
           sha256 = "1vv768870597rvwxdb59v6pjn1pxaxg4r6znbb5j3cl828q35mp7";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

+19 -14

pkgs/development/libraries/libxkbcommon/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libxkbcommon-0.7.2";

     

       4
       4
       +
         name = "libxkbcommon-0.8.0";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
       -
           url = "http://xkbcommon.org/download/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918";

     

       7
       7
       +
           url = "https://xkbcommon.org/download/${name}.tar.xz";

     

       8
       8
       +
           sha256 = "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         outputs = [ "out" "dev" ];

     

       11
       11
       +
         outputs = [ "out" "dev" "doc" ];

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
       -
         buildInputs = [ yacc flex xkeyboard_config libxcb ];

     

       13
       13
       +
         nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ];

     

       14
       14
       +
         buildInputs = [ xkeyboard_config libxcb ];

     

       15
       15
        
       

     

       16
       16
       -
         configureFlags = [

     

       17
       17
       -
           "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb"

     

       18
       18
       -
           "--with-x-locale-root=${libX11.out}/share/X11/locale"

     

       16
       16
       +
         patches = [

     

       17
       17
       +
           # darwin compatibility

     

       18
       18
       +
           (fetchpatch {

     

       19
       19
       +
             url = https://github.com/xkbcommon/libxkbcommon/commit/edb1c662394578a54b7bbed231d918925e5d8150.patch;

     

       20
       20
       +
             sha256 = "0ydjlir32r3xfsbqhnsx1bz6ags2m908yhf9i09i1s7sgcimbcx5";

     

       21
       21
       +
           })

     

       19
       22
        
         ];

     

       20
       23
        
       

     

       21
       21
       -
         preBuild = stdenv.lib.optionalString stdenv.isDarwin ''

     

       22
       22
       -
           sed -i 's/,--version-script=.*$//' Makefile

     

       23
       23
       -
         '';

     

       24
       24
       +
         mesonFlags = [

     

       25
       25
       +
           "-Denable-wayland=false"

     

       26
       26
       +
           "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"

     

       27
       27
       +
           "-Dx-locale-root=${libX11.out}/share/X11/locale"

     

       28
       28
       +
         ];

     

       24
       29
        
       

     

       25
       30
        
         meta = with stdenv.lib; {

     

       26
       31
        
           description = "A library to handle keyboard descriptions";

     

       27
       27
       -
           homepage = http://xkbcommon.org;

     

       32
       32
       +
           homepage = https://xkbcommon.org;

     

       28
       33
        
           license = licenses.mit;

     

       29
       34
        
           maintainers = with maintainers; [ garbas ttuegel ];

     

       30
       35
        
           platforms = with platforms; unix;

+2 -2

pkgs/development/libraries/mesa/default.nix

···

       66
       66
        
       in

     

       67
       67
        
       

     

       68
       68
        
       let

     

       69
       69
       -
         version = "17.3.3";

     

       69
       69
       +
         version = "17.3.6";

     

       70
       70
        
         branch  = head (splitString "." version);

     

       71
       71
        
         driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";

     

       72
       72
        
       in

     
···

       81
       81
        
             "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"

     

       82
       82
        
             "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"

     

       83
       83
        
           ];

     

       84
       84
       -
           sha256 = "16rpm4rwmzd4kdgipa1gw262jqg3346gih0y3bsc3bgn1vgcbfj1";

     

       84
       84
       +
           sha256 = "e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8";

     

       85
       85
        
         };

     

       86
       86
        
       

     

       87
       87
        
         prePatch = "patchShebangs .";

+5 -9

pkgs/development/libraries/ncurses/default.nix

···

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation rec {

     

       16
       16
       -
         version = "6.0-20171125";

     

       16
       16
       +
         version = "6.1";

     

       17
       17
        
         name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchurl {

     

       20
       20
       -
           urls = [

     

       21
       21
       -
             # Remove this mirror on next upgrade, it's only needed because upstream took ncurses-6.0-20171125.tgz down!

     

       22
       22
       -
             "http://bld1.alpinelinux.org/distfiles/v3.5/ncurses-${version}.tgz"

     

       23
       23
       -
       

     

       24
       24
       -
             "ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz"

     

       25
       25
       -
             "https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz"

     

       26
       26
       -
           ];

     

       27
       27
       -
           sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92";

     

       20
       20
       +
           url = "mirror://gnu/ncurses/ncurses-${version}.tar.gz";

     

       21
       21
       +
           sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da";

     

       28
       22
        
         };

     

       29
       23
        
       

     

       30
       24
        
         patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;

     
···

       127
       121
        
           moveToOutput "bin/tic" "$out"

     

       128
       122
        
           moveToOutput "bin/tput" "$out"

     

       129
       123
        
           moveToOutput "bin/tset" "$out"

     

       124
       124
       +
           moveToOutput "bin/captoinfo" "$out"

     

       125
       125
       +
           moveToOutput "bin/infotocap" "$out"

     

       130
       126
        
         '';

     

       131
       127
        
       

     

       132
       128
        
         preFixup = lib.optionalString (!hostPlatform.isCygwin) ''

+2 -2

pkgs/development/libraries/newt/default.nix

···

       1
       1
        
       { fetchurl, stdenv, slang, popt }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "newt-0.52.15";

     

       4
       4
       +
         name = "newt-0.52.20";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "0hg2l0siriq6qrz6mmzr6l7rpl40ay56c8cak87rb2ks7s952qbs";

     

       8
       8
       +
           sha256 = "1g3dpfnvaw7vljbr7nzq1rl88d6r8cmrvvng9inphgzwxxmvlrld";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         patchPhase = ''

+2 -2

pkgs/development/libraries/nspr/default.nix

···

       1
       1
        
       { stdenv, fetchurl

     

       2
       2
        
       , CoreServices ? null }:

     

       3
       3
        
       

     

       4
       4
       -
       let version = "4.17"; in

     

       4
       4
       +
       let version = "4.18"; in

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         name = "nspr-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "158hdn285dsb5rys8wl1wi32dd1axwhqq0r8fwny4aj157m0l2jr";

     

       11
       11
       +
           sha256 = "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         outputs = [ "out" "dev" ];

+2 -2

pkgs/development/libraries/p11-kit/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "p11-kit-${version}";

     

       6
       6
       -
         version = "0.23.9";

     

       6
       6
       +
         version = "0.23.10";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "p11-glue";

     

       10
       10
        
           repo = "p11-kit";

     

       11
       11
        
           rev = version;

     

       12
       12
       -
           sha256 = "0lyv6m2jflvs23m0i6l64d470p5a315lz6vs4bflsqv8i1zrrcsh";

     

       12
       12
       +
           sha256 = "0n0wqv028flzvnxllqv8i6x9nv705csl7ddzi0fzvppc9fp2yinp";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         outputs = [ "out" "dev"];

+2 -2

pkgs/development/libraries/pixman/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, libpng, glib /*just passthru*/ }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, autoreconfHook, pkgconfig, libpng, glib /*just passthru*/ }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkgconfig ]

     

       21
       21
       -
           ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool ];

     

       21
       21
       +
           ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool autoreconfHook ];

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = stdenv.lib.optional doCheck libpng;

     

       24
       24

+13 -32

pkgs/development/libraries/poppler/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty

     

       1
       1
       +
       { stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty

     

       2
       2
        
       , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg

     

       3
       3
        
       , withData ? true, poppler_data

     

       4
       4
       -
       , qt4Support ? false, qt4 ? null

     

       5
       4
        
       , qt5Support ? false, qtbase ? null

     

       6
       5
        
       , introspectionSupport ? false, gobjectIntrospection ? null

     

       7
       6
        
       , utils ? false

     

       8
       7
        
       , minimal ? false, suffix ? "glib"

     

       9
       9
       -
       , hostPlatform

     

       10
       8
        
       }:

     

       11
       9
        
       

     

       12
       10
        
       let # beware: updates often break cups-filters build

     

       13
       13
       -
         version = "0.56.0";

     

       14
       14
       -
         sha256 = "0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6";

     

       11
       11
       +
         version = "0.62.0";

     

       12
       12
       +
         mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";

     

       15
       13
        
       in

     

       16
       14
        
       stdenv.mkDerivation rec {

     

       17
       15
        
         name = "poppler-${suffix}-${version}";

     

       18
       16
        
       

     

       19
       17
        
         src = fetchurl {

     

       20
       18
        
           url = "${meta.homepage}/poppler-${version}.tar.xz";

     

       21
       21
       -
           inherit sha256;

     

       19
       19
       +
           sha256 = "1ii9ly1pngyvs0aiq2wxpya08hidpl54y7nsb8b1vxnnskgp76jv";

     

       22
       20
        
         };

     

       23
       21
        
       

     

       24
       22
        
         outputs = [ "out" "dev" ];

     
···

       29
       27
        
         propagatedBuildInputs = with lib;

     

       30
       28
        
           [ zlib freetype fontconfig libjpeg openjpeg ]

     

       31
       29
        
           ++ optionals (!minimal) [ cairo lcms curl ]

     

       32
       32
       -
           ++ optional qt4Support qt4

     

       33
       30
        
           ++ optional qt5Support qtbase

     

       34
       31
        
           ++ optional introspectionSupport gobjectIntrospection;

     

       35
       32
        
       

     

       36
       36
       -
         nativeBuildInputs = [ pkgconfig ];

     

       33
       33
       +
         nativeBuildInputs = [ cmake ninja pkgconfig ];

     

       37
       34
        
       

     

       38
       38
       -
         NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];

     

       39
       39
       -
       

     

       40
       40
       -
         CXXFLAGS = lib.optional qt5Support "-std=c++11";

     

       41
       41
       -
       

     

       42
       42
       -
         configureFlags = with lib;

     

       43
       43
       -
           [

     

       44
       44
       -
             "--enable-xpdf-headers"

     

       45
       45
       -
             "--enable-libcurl"

     

       46
       46
       -
             "--enable-zlib"

     

       47
       47
       -
             "--enable-build-type=release"

     

       48
       48
       -
           ]

     

       49
       49
       -
           ++ optionals minimal [

     

       50
       50
       -
             "--disable-poppler-glib" "--disable-poppler-cpp"

     

       51
       51
       -
             "--disable-libcurl"

     

       52
       52
       -
           ]

     

       53
       53
       -
           ++ optional (!utils) "--disable-utils"

     

       54
       54
       -
           ++ optional introspectionSupport "--enable-introspection";

     

       55
       55
       -
       

     

       56
       56
       -
         enableParallelBuilding = true;

     

       57
       57
       -
       

     

       58
       58
       -
         crossAttrs.postPatch =

     

       59
       59
       -
           # there are tests using `strXXX_s` functions that are missing apparently

     

       60
       60
       -
           stdenv.lib.optionalString (hostPlatform.libc or null == "msvcrt")

     

       61
       61
       -
             "sed '/^SUBDIRS =/s/ test / /' -i Makefile.in";

     

       35
       35
       +
         cmakeFlags = [

     

       36
       36
       +
           (mkFlag true "XPDF_HEADERS")

     

       37
       37
       +
           (mkFlag (!minimal) "GLIB")

     

       38
       38
       +
           (mkFlag (!minimal) "CPP")

     

       39
       39
       +
           (mkFlag (!minimal) "LIBCURL")

     

       40
       40
       +
           (mkFlag utils "UTILS")

     

       41
       41
       +
           (mkFlag qt5Support "QT5")

     

       42
       42
       +
         ];

     

       62
       43
        
       

     

       63
       44
        
         meta = with lib; {

     

       64
       45
        
           homepage = https://poppler.freedesktop.org/;

+44

pkgs/development/libraries/poppler/qt4.nix

···

       1
       1
       +
       # TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883)

     

       2
       2
       +
       { stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty

     

       3
       3
       +
       , zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg

     

       4
       4
       +
       , poppler_data, qt4

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         # Last version supporting QT4

     

       9
       9
       +
         version = "0.61.1";

     

       10
       10
       +
       in

     

       11
       11
       +
       stdenv.mkDerivation rec {

     

       12
       12
       +
         name = "poppler-qt4-${version}";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchurl {

     

       15
       15
       +
           url = "${meta.homepage}/poppler-${version}.tar.xz";

     

       16
       16
       +
           sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         outputs = [ "out" "dev" ];

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty;

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ];

     

       24
       24
       +
       

     

       25
       25
       +
         nativeBuildInputs = [ cmake ninja pkgconfig ];

     

       26
       26
       +
       

     

       27
       27
       +
         cmakeFlags = [

     

       28
       28
       +
           "-DENABLE_XPDF_HEADERS=on"

     

       29
       29
       +
           "-DENABLE_UTILS=off"

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         meta = with lib; {

     

       33
       33
       +
           homepage = https://poppler.freedesktop.org/;

     

       34
       34
       +
           description = "A PDF rendering library";

     

       35
       35
       +
       

     

       36
       36
       +
           longDescription = ''

     

       37
       37
       +
             Poppler is a PDF rendering library based on the xpdf-3.0 code base.

     

       38
       38
       +
           '';

     

       39
       39
       +
       

     

       40
       40
       +
           license = licenses.gpl2;

     

       41
       41
       +
           platforms = platforms.all;

     

       42
       42
       +
           maintainers = with maintainers; [ ttuegel ];

     

       43
       43
       +
         };

     

       44
       44
       +
       }

+2 -2

pkgs/development/libraries/protobuf/3.4.nix

···

       1
       1
        
       { callPackage, lib, ... }:

     

       2
       2
        
       

     

       3
       3
        
       lib.overrideDerivation (callPackage ./generic-v3.nix {

     

       4
       4
       -
         version = "3.4.0";

     

       5
       5
       -
         sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx";

     

       4
       4
       +
         version = "3.4.1";

     

       5
       5
       +
         sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";

     

       6
       6
        
       }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })

+6

pkgs/development/libraries/protobuf/3.5.nix

···

       1
       1
       +
       { callPackage, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       lib.overrideDerivation (callPackage ./generic-v3.nix {

     

       4
       4
       +
         version = "3.5.1.1";

     

       5
       5
       +
         sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";

     

       6
       6
       +
       }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })

+3 -1

pkgs/development/libraries/qt-5/5.10/default.nix

···

       37
       37
        
         srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };

     

       38
       38
        
       

     

       39
       39
        
         patches = {

     

       40
       40
       -
           qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;

     

       40
       40
       +
           qtbase = [ ./qtbase.patch ] ++

     

       41
       41
       +
             optionals stdenv.isDarwin [ ./qtbase-darwin.patch

     

       42
       42
       +
                                         ./restore-pc-files.patch ];

     

       41
       43
        
           qtdeclarative = [ ./qtdeclarative.patch ];

     

       42
       44
        
           qtscript = [ ./qtscript.patch ];

     

       43
       45
        
           qtserialport = [ ./qtserialport.patch ];

+27

pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch

···

       1
       1
       +
       diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf

     

       2
       2
       +
       index e6a0d97f1a..b50ce77d51 100644

     

       3
       3
       +
       --- a/mkspecs/features/qt_module.prf

     

       4
       4
       +
       +++ b/mkspecs/features/qt_module.prf

     

       5
       5
       +
       @@ -266,7 +266,7 @@ load(qt_installs)

     

       6
       6
       +
        load(qt_targets)

     

       7
       7
       +
        

     

       8
       8
       +
        # this builds on top of qt_common

     

       9
       9
       +
       -!internal_module:!lib_bundle:if(unix|mingw) {

     

       10
       10
       +
       +!internal_module:if(unix|mingw) {

     

       11
       11
       +
            CONFIG += create_pc

     

       12
       12
       +
            QMAKE_PKGCONFIG_DESTDIR = pkgconfig

     

       13
       13
       +
            host_build: \

     

       14
       14
       +
       diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf

     

       15
       15
       +
       index 62b88c6fe2..f302f1e202 100644

     

       16
       16
       +
       --- a/mkspecs/features/qt_module_headers.prf

     

       17
       17
       +
       +++ b/mkspecs/features/qt_module_headers.prf

     

       18
       18
       +
       @@ -102,8 +102,7 @@ git_build: \

     

       19
       19
       +
        else: \

     

       20
       20
       +
            INC_PATH = $$MODULE_BASE_INDIR

     

       21
       21
       +
        include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)

     

       22
       22
       +
       -!lib_bundle: \  # Headers are embedded into the bundle, so don't install them separately.

     

       23
       23
       +
       -    CONFIG += qt_install_headers

     

       24
       24
       +
       +CONFIG += qt_install_headers

     

       25
       25
       +
        

     

       26
       26
       +
        alien_syncqt: return()

     

       27
       27
       +

+5 -3

pkgs/development/libraries/sqlite/default.nix

···

       3
       3
        
       assert interactive -> readline != null && ncurses != null;

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation {

     

       6
       6
       -
         name = "sqlite-3.21.0";

     

       6
       6
       +
         name = "sqlite-3.22.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = "http://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz";

     

       10
       10
       -
           sha256 = "1qxvzdjwzw6k0kqjfabj86rnq87xdbwbca7laxxdhnh0fmkm3pfp";

     

       9
       9
       +
           url = "http://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz";

     

       10
       10
       +
           sha256 = "04n6hnw2g818d7r92cp2608kd5mhzyysy83k29kbq1mp709an918";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         outputs = [ "bin" "dev" "out" ];

     
···

       31
       31
        
           "-DSQLITE_ENABLE_UNLOCK_NOTIFY"

     

       32
       32
        
           "-DSQLITE_SOUNDEX"

     

       33
       33
        
           "-DSQLITE_SECURE_DELETE"

     

       34
       34
       +
           "-DSQLITE_MAX_VARIABLE_NUMBER=250000"

     

       35
       35
       +
           "-DSQLITE_MAX_EXPR_DEPTH=10000"

     

       34
       36
        
         ];

     

       35
       37
        
       

     

       36
       38
        
         # Test for features which may not be available at compile time

+3 -3

pkgs/development/libraries/sqlite/sqlite3_analyzer.nix

···

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

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "sqlite3_analyzer-3.20.1";

     

       4
       4
       +
         name = "sqlite3_analyzer-3.22.0";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
       -
           url = "https://www.sqlite.org/2017/sqlite-src-3200100.zip";

     

       8
       8
       -
           sha256 = "0aicmapa99141hjncyxwg66ndhr16nwpbqy27x79fg1ikzhwlnv6";

     

       7
       7
       +
           url = "https://www.sqlite.org/2018/sqlite-src-3220000.zip";

     

       8
       8
       +
           sha256 = "04w97jj1659vl84rr73wg1mhj6by8r5075rzpn2xp42n537a7ibv";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ unzip ];

+1 -1

pkgs/development/libraries/vaapi-intel/default.nix

···

       10
       10
        
           owner  = "01org";

     

       11
       11
        
           repo   = "libva-intel-driver";

     

       12
       12
        
           rev    = version;

     

       13
       13
       -
           sha256 = "1832nnva3d33wv52bj59bv62q7a807sdxjqqq0my7l9x7a4qdkzz";

     

       13
       13
       +
           sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         patchPhase = ''

+2 -2

pkgs/development/libraries/wayland/protocols.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "wayland-protocols-${version}";

     

       7
       7
       -
         version = "1.11";

     

       7
       7
       +
         version = "1.13";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "0138psvx6fv8z5x2p6xi4iij6m5k62c0qyfsb45xgcf5a4fyxz1s";

     

       11
       11
       +
           sha256 = "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

+11 -6

pkgs/development/libraries/zziplib/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, perl, python2, zip, xmlto, zlib }:

     

       1
       1
       +
       { docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "0.13.67";

     

       5
       5
       +
         version = "0.13.68";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz";

     

       9
       9
       -
           sha256 = "0802kdxwxx9zanpwb4w4wfi3blwhv0ri05mzdgd35j5sva5ify0j";

     

       9
       9
       +
           sha256 = "0chhl6m02562z6c4hjy568mh11pbq2qngw6g2x924ajr8sdr2q4l";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         patchPhase = ''

     

       12
       12
       +
         postPatch = ''

     

       13
       13
        
           sed -i -e s,--export-dynamic,, configure

     

       14
       14
        
         '';

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ perl python2 zip xmlto zlib ];

     

       16
       16
       +
         # TODO: still an issue: https://github.com/gdraheim/zziplib/issues/27

     

       17
       17
        
       

     

       18
       18
       -
         doCheck = true;

     

       18
       18
       +
         buildInputs = [ docbook_xml_dtd_412 perl python2 zip xmlto zlib ];

     

       19
       19
       +
       

     

       20
       20
       +
         # tests are broken (https://github.com/gdraheim/zziplib/issues/20),

     

       21
       21
       +
         # and test/zziptests.py requires network access

     

       22
       22
       +
         # (https://github.com/gdraheim/zziplib/issues/24)

     

       23
       23
       +
         doCheck = false;

     

       19
       24
        
       

     

       20
       25
        
         meta = with stdenv.lib; {

     

       21
       26
        
           description = "Library to extract data from files archived in a zip file";

+1 -1

pkgs/development/perl-modules/generic/builder.sh

···

       22
       22
        
               fi

     

       23
       23
        
           done

     

       24
       24
        
       

     

       25
       25
       -
           perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags

     

       25
       25
       +
           perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=$perl/bin/perl

     

       26
       26
        
       }

     

       27
       27
        
       

     

       28
       28

+3 -2

pkgs/development/perl-modules/generic/default.nix

···

       1
       1
        
       perl:

     

       2
       2
        
       

     

       3
       3
       -
       { buildInputs ? [], name, ... } @ attrs:

     

       3
       3
       +
       { nativeBuildInputs ? [], name, ... } @ attrs:

     

       4
       4
        
       

     

       5
       5
        
       perl.stdenv.mkDerivation (

     

       6
       6
        
         {

     
···

       27
       27
        
         {

     

       28
       28
        
           name = "perl-" + name;

     

       29
       29
        
           builder = ./builder.sh;

     

       30
       30
       -
           buildInputs = buildInputs ++ [ perl ];

     

       30
       30
       +
           nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];

     

       31
       31
       +
           inherit perl;

     

       31
       32
        
         }

     

       32
       33
        
       )

+2 -4

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

···

       3
       3
        
       , pytestrunner, requests-mock, pytestcov, pytest

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       

     

       7
       6
        
       buildPythonPackage rec {

     

       8
       8
       -
         name = "${pname}-${version}";

     

       9
       7
        
         pname = "MechanicalSoup";

     

       10
       10
       -
         version = "0.9.0.post4";

     

       8
       8
       +
         version = "0.10.0";

     

       11
       9
        
       

     

       12
       10
        
         src = fetchPypi {

     

       13
       11
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "ce8f822afbc9bef1499be417e8d5deecd0cd32606420165700e89477955f03ab";

     

       12
       12
       +
           sha256 = "22423efd025c3eedb06f41d3ff1127174a59f40dc560e82dce143956976195bf";

     

       15
       13
        
         };

     

       16
       14
        
       

     

       17
       15
        
         checkInputs = [ pytest pytestrunner requests-mock pytestcov ];

+2 -3

pkgs/development/python-modules/absl-py/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "absl-py";

     

       9
       9
       -
         version = "0.1.9";

     

       10
       10
       -
         name = "${pname}-${version}";

     

       9
       9
       +
         version = "0.1.10";

     

       11
       10
        
       

     

       12
       11
        
         src = fetchPypi {

     

       13
       12
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "1c787e3bc7ef8fea7a8a79cf36b0c550b4bd66e13c05d1352fbc5786488befb0";

     

       13
       13
       +
           sha256 = "908eba9a96a37c10f10074aba57d685070b814906b02a1ea2cf54bb10a6b8c74";

     

       15
       14
        
         };

     

       16
       15
        
       

     

       17
       16
        
         propagatedBuildInputs = [ six ];

+6 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy3k }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

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

     

       5
       4
        
         pname = "affinity";

     

       6
       5
        
         version = "0.1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         # syntax error

     

       8
       8
       +
         disabled = isPy3k;

     

       9
       9
       +
       

     

       7
       10
        
         src = fetchPypi {

     

       8
       11
        
           inherit pname version;

     

       9
       12
        
           sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6";

     

       10
       13
        
         };

     

       14
       14
       +
       

     

       11
       15
        
         meta = {

     

       12
       16
        
           description = "control processor affinity on windows and linux";

     

       13
       17
        
           homepage    = http://cheeseshop.python.org/pypi/affinity;

+26

pkgs/development/python-modules/aiohttp-jinja2/default.nix

···

       1
       1
       +
       { lib, stdenv, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "aiohttp-jinja2";

     

       5
       5
       +
         version = "0.16.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "1ps182yrc5g9ph55927a7ssqx6m9kx0bivfxpaj8sa3znrdkl94d";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         propagatedBuildInputs = [ aiohttp jinja2 ];

     

       13
       13
       +
       

     

       14
       14
       +
         checkInputs = [ pytest pytest-aiohttp ];

     

       15
       15
       +
       

     

       16
       16
       +
         checkPhase = ''

     

       17
       17
       +
           py.test

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with lib; {

     

       21
       21
       +
           description = "Jinja2 support for aiohttp";

     

       22
       22
       +
           homepage = https://github.com/aio-libs/aiohttp_jinja2;

     

       23
       23
       +
           license = licenses.asl20;

     

       24
       24
       +
           maintainers = with maintainers; [ peterhoeg ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "aniso8601";

     

       6
       6
       -
         version = "2.0.0";

     

       6
       6
       +
         version = "2.0.1";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
        
         meta = with stdenv.lib; {

     
···

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "085786415d3550e89785ffbedaa9bb37d41de0707a1268bdbba11249064b71d1";

     

       19
       19
       +
           sha256 = "b7215a41e5194a829dc87d1ea5039315be85a6158ba15c8157a284c29fa6808b";

     

       20
       20
        
         };

     

       21
       21
        
       }

+6 -7

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

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchurl

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi

     

       2
       2
        
       , sqlite, isPyPy }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "apsw";

     

       6
       6
       -
         version = "3.7.6.2-r1";

     

       7
       7
       -
         name = "${pname}-${version}";

     

       6
       6
       +
         version = "3.9.2-r1";

     

       8
       7
        
       

     

       9
       8
        
         disabled = isPyPy;

     

       10
       9
        
       

     

       11
       11
       -
         src = fetchurl {

     

       12
       12
       -
           url = "http://apsw.googlecode.com/files/${name}.zip";

     

       13
       13
       -
           sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb";

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "dab96fd164dde9e59f7f27228291498217fa0e74048e2c08c7059d7e39589270";

     

       14
       13
        
         };

     

       15
       14
        
       

     

       16
       15
        
         buildInputs = [ sqlite ];

     

       17
       16
        
       

     

       18
       17
        
         # python: double free or corruption (fasttop): 0x0000000002fd4660 ***

     

       19
       19
       -
         doCheck = false;

     

       18
       18
       +
       #   doCheck = false;

     

       20
       19
        
       

     

       21
       20
        
         meta = with stdenv.lib; {

     

       22
       21
        
           description = "A Python wrapper for the SQLite embedded relational database engine";

+14 -6

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

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchurl, six, async-timeout }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:

     

       2
       2
        
       buildPythonPackage rec {

     

       3
       3
        
         version = "2.2.0";

     

       4
       4
        
         pname = "asgiref";

     

       5
       5
       -
         name = "${pname}-${version}";

     

       6
       5
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://pypi/a/asgiref/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "1fmrd749hqxwicnivvgrcw812gbj2zm49zcnkghh9yxbkjfcvxcv";

     

       6
       6
       +
         # PyPI tarball doesn't include tests directory

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "django";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "0jsdkgwzswm1jbfm6d100yfvfzpic8v6ysydcnn798bbpwclj8ip";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ six async-timeout ];

     

       14
       14
       +
         propagatedBuildInputs = [ async-timeout ];

     

       15
       15
       +
       

     

       16
       16
       +
         checkInputs = [ pytest pytest-asyncio ];

     

       17
       17
       +
       

     

       18
       18
       +
         checkPhase = ''

     

       19
       19
       +
           py.test

     

       20
       20
       +
         '';

     

       13
       21
        
       

     

       14
       22
        
         meta = with stdenv.lib; {

     

       15
       23
        
           description = "Reference ASGI adapters and channel layers";

+7 -5

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

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchPypi, pytz, pytest }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi, pytz, requests, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "astral";

     

       5
       5
       -
         version = "1.5";

     

       5
       5
       +
         version = "1.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6";

     

       9
       9
       +
           sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ pytz ];

     

       12
       12
       +
         propagatedBuildInputs = [ pytz requests ];

     

       13
       13
        
       

     

       14
       14
        
         checkInputs = [ pytest ];

     

       15
       15
        
         checkPhase = ''

     

       16
       16
       -
           py.test -k "not test_GoogleLocator"

     

       16
       16
       +
           # https://github.com/sffjunkie/astral/pull/13

     

       17
       17
       +
           touch src/test/.api_key

     

       18
       18
       +
           py.test -m "not webtest"

     

       17
       19
        
         '';

     

       18
       20
        
       

     

       19
       21
        
         meta = with stdenv.lib; {

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "asynctest";

     

       5
       5
       -
         version = "0.11.1";

     

       5
       5
       +
         version = "0.12.0";

     

       6
       6
        
       

     

       7
       7
        
         disabled = pythonOlder "3.4";

     

       8
       8
        
       

     
···

       11
       11
        
           owner = "Martiusweb";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "1vvh5vbq2fbz6426figs85z8779r7svb4dp2v3xynhhv05nh2y6v";

     

       14
       14
       +
           sha256 = "0rcb3kz2m0iwvgxpx2avfz9cqsd9xbaq93zykr2fki3ikmnp3vyg";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         postPatch = ''

+2 -2

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

···

       5
       5
        
       }:

     

       6
       6
        
       buildPythonApplication rec {

     

       7
       7
        
         pname = "behave";

     

       8
       8
       -
         version = "1.2.5";

     

       8
       8
       +
         version = "1.2.6";

     

       9
       9
        
         name = "${pname}-${version}";

     

       10
       10
        
       

     

       11
       11
        
         disabled = pythonAtLeast "3.6";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "81b731ac5187e31e4aad2594944fa914943683a9818320846d037c5ebd6d5d0b";

     

       15
       15
       +
           sha256 = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         checkInputs = [ mock nose pyhamcrest ];

+18 -7

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pyparsing

     

       5
       5
       +
       , future

     

       6
       6
       +
       , nose

     

       7
       7
       +
       , glibcLocales

     

       4
       8
        
       }:

     

       5
       9
        
       

     

       6
       10
        
       buildPythonPackage rec {

     

       7
       11
        
         pname = "bibtexparser";

     

       8
       12
        
         version = "1.0.1";

     

       9
       9
       -
         name = "${pname}-${version}";

     

       10
       13
        
       

     

       11
       11
       -
         src = fetchPypi {

     

       12
       12
       -
           inherit pname version;

     

       13
       13
       -
           sha256 = "cc41cdd8332c2bf44b97daf1f135f4f267c3b744c33976655cd270b66f964c0a";

     

       14
       14
       +
         # PyPI tarball does not ship tests

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "sciunto-org";

     

       17
       17
       +
           repo = "python-${pname}";

     

       18
       18
       +
           rev = "v${version}";

     

       19
       19
       +
           sha256 = "0lmlarkfbq2hp1wa04a62245jr2mqizqsdlgilj5aq6vy92gr6ai";

     

       14
       20
        
         };

     

       15
       21
        
       

     

       16
       16
       -
         # No tests in archive

     

       17
       17
       -
         doCheck = false;

     

       22
       22
       +
         propagatedBuildInputs = [ pyparsing future ];

     

       23
       23
       +
       

     

       24
       24
       +
         checkInputs = [ nose glibcLocales ];

     

       25
       25
       +
       

     

       26
       26
       +
         checkPhase = ''

     

       27
       27
       +
           LC_ALL="en_US.UTF-8" nosetests

     

       28
       28
       +
         '';

     

       18
       29
        
       

     

       19
       30
        
         meta = {

     

       20
       31
        
           description = "Bibtex parser for python 2.7 and 3.3 and newer";

+27

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, chardet, hypothesis }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "binaryornot";

     

       5
       5
       +
         version = "0.4.4";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         prePatch = ''

     

       13
       13
       +
           # See https://github.com/audreyr/binaryornot/issues/40

     

       14
       14
       +
           substituteInPlace tests/test_check.py \

     

       15
       15
       +
             --replace "average_size=512" "average_size=128"

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         propagatedBuildInputs = [ chardet ];

     

       19
       19
       +
       

     

       20
       20
       +
         checkInputs = [ hypothesis ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           homepage = https://github.com/audreyr/binaryornot;

     

       24
       24
       +
           description = "Ultra-lightweight pure Python package to check if a file is binary or text";

     

       25
       25
       +
           license = licenses.bsd3;

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+6 -4

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , fetchurl

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
        
       , pytest

     

       5
       5
        
       , contextlib2

     

       6
       6
        
       , cytoolz

     
···

       27
       27
        
         pname = "blaze";

     

       28
       28
        
         version = "0.11.3";

     

       29
       29
        
       

     

       30
       30
       -
         src = fetchurl {

     

       31
       31
       -
           url = "https://github.com/blaze/blaze/archive/${version}.tar.gz";

     

       32
       32
       -
           sha256 = "075gqc9d7g284z4nfwv5zbq99ln22w25l4lcndjg3v10kmsjadww";

     

       30
       30
       +
         src = fetchFromGitHub {

     

       31
       31
       +
           owner = pname;

     

       32
       32
       +
           repo = pname;

     

       33
       33
       +
           rev = version;

     

       34
       34
       +
           sha256 = "0w916k125058p40cf7i090f75pgv3cqdb8vwjzqhb9r482fa6717";

     

       33
       35
        
         };

     

       34
       36
        
       

     

       35
       37
        
         checkInputs = [ pytest ];

+31

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, fetchpatch, pyusb }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "BlinkStick";

     

       5
       5
       +
         version = "1.1.8";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         patches = [

     

       13
       13
       +
           (fetchpatch {

     

       14
       14
       +
             url = https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch;

     

       15
       15
       +
             sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f";

     

       16
       16
       +
           })

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             url = https://github.com/arvydas/blinkstick-python/pull/54.patch;

     

       19
       19
       +
             sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl";

     

       20
       20
       +
           })

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [ pyusb ];

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with lib; {

     

       26
       26
       +
           description = "Python package to control BlinkStick USB devices";

     

       27
       27
       +
           homepage = https://pypi.python.org/pypi/BlinkStick/;

     

       28
       28
       +
           license = licenses.bsd3;

     

       29
       29
       +
           maintainers = with maintainers; [ np ];

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+2 -2

pkgs/development/python-modules/bootstrapped-pip/default.nix

···

       9
       9
        
         };

     

       10
       10
        
         setuptools_source = fetchPypi {

     

       11
       11
        
           pname = "setuptools";

     

       12
       12
       -
           version = "38.4.0";

     

       12
       12
       +
           version = "38.4.1";

     

       13
       13
        
           format = "wheel";

     

       14
       14
       -
           sha256 = "155c2ec9fdcc00c3973d966b416e1cf3a1e7ce75f4c09fb760b23f94b935926e";

     

       14
       14
       +
           sha256 = "22f8bcff5ce7fd1867785701769eaba42b79331d0abf890974a9288787dc015b";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         # TODO: Shouldn't be necessary anymore for pip > 9.0.1!

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname =  "boto3";

     

       16
       16
       -
         version = "1.4.8";

     

       16
       16
       +
         version = "1.6.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "boto";

     

       20
       20
        
           repo  = "boto3";

     

       21
       21
        
           rev   = version;

     

       22
       22
       -
           sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi";

     

       22
       22
       +
           sha256 = "14d60wc5kff2gjkrm0yfz0179s0qg3f1qqldv8hnf37ny6yvfwn3";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

+2 -2

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

···

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         name = "${pname}-${version}";

     

       14
       14
        
         pname = "botocore";

     

       15
       15
       -
         version = "1.8.45";

     

       15
       15
       +
         version = "1.9.3";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "8f91b648a216dc945783d1539c013fc08a9e65ecc4fc5aae017bdd5961fd3468";

     

       19
       19
       +
           sha256 = "d5b892ab86cd3e8d6cb570dd5275bf1c600cbbf9f07a40a22bcdd9023c0e844f";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "zc.buildout";

     

       5
       5
       -
         version = "2.11.0";

     

       5
       5
       +
         version = "2.11.1";

     

       6
       6
        
         name = "${pname}-nix-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "092b0a147d5fb4e79ee0afde665570f85738e714463854f9e4f7f38d0b27ea82";

     

       10
       10
       +
           sha256 = "08017dcd8f4b60b48b7d830da835a9350c07e7f383fa56d45925ab5144400281";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         patches = [ ./nix.patch ];

+16 -7

pkgs/development/python-modules/cached-property/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pytest

     

       4
       5
        
       , freezegun

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       buildPythonPackage rec {

     

       8
       9
        
         pname = "cached-property";

     

       9
       9
       -
         version = "1.3.1";

     

       10
       10
       +
         version = "1.4.0";

     

       10
       11
        
       

     

       11
       11
       -
         src = fetchPypi {

     

       12
       12
       -
           inherit pname version;

     

       13
       13
       -
           sha256 = "6562f0be134957547421dda11640e8cadfa7c23238fc4e0821ab69efdb1095f3";

     

       12
       12
       +
         # conftest.py is missing in PyPI tarball

     

       13
       13
       +
         # https://github.com/pydanny/cached-property/pull/87

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "pydanny";

     

       16
       16
       +
           repo = pname;

     

       17
       17
       +
           rev = version;

     

       18
       18
       +
           sha256 = "0w7709grs4yqhfbnn7lva2fgyphvh43xcfqhi95lhh8sjad3xwkw";

     

       14
       19
        
         };

     

       15
       20
        
       

     

       16
       16
       -
         checkInputs = [ freezegun ];

     

       21
       21
       +
         checkInputs = [ pytest freezegun ];

     

       22
       22
       +
       

     

       23
       23
       +
         checkPhase = ''

     

       24
       24
       +
           py.test

     

       25
       25
       +
         '';

     

       17
       26
        
       

     

       18
       27
        
         meta = {

     

       19
       28
        
           description = "A decorator for caching properties in classes";

     
···

       22
       31
        
           platforms = lib.platforms.unix;

     

       23
       32
        
           maintainers = with lib.maintainers; [ ericsagnes ];

     

       24
       33
        
         };

     

       25
       25
       -
       }
     

       34
       34
       +
       }

+2 -2

pkgs/development/python-modules/cachetools/1.nix

···

       3
       3
        
       buildPythonPackage rec {

     

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

     

       5
       5
        
         pname = "cachetools";

     

       6
       6
       -
         version = "1.1.3";

     

       6
       6
       +
         version = "2.0.1";

     

       7
       7
        
         disabled = isPyPy;  # a test fails

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "0js7qx5pa8ibr8487lcf0x3a7w0xml0wa17snd6hjs0857kqhn20";

     

       11
       11
       +
           sha256 = "ede01f2d3cbd6ddc9e35e16c2b0ce011d8bb70ce0dbaf282f5b4df24b213bc5d";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         meta = with stdenv.lib; {

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "python-can";

     

       11
       11
       -
         version = "2.0.0";

     

       11
       11
       +
         version = "2.1.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "1c6zfd29ck9ffdklfb5xgxvfl52xdaqd89isykkypm1ll97yk2fs";

     

       15
       15
       +
           sha256 = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ pyserial ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       if isPyPy then null else buildPythonPackage rec {

     

       4
       4
        
         pname = "cffi";

     

       5
       5
       -
         version = "1.11.4";

     

       5
       5
       +
         version = "1.11.5";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d";

     

       10
       10
       +
           sha256 = "e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         outputs = [ "out" "dev" ];

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "chainer";

     

       9
       9
       -
         version = "3.3.0";

     

       9
       9
       +
         version = "3.4.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "0669375e5b09d687781a37d6c025ee0a6015f575b4d2c70a2ad09c33b8228f86";

     

       13
       13
       +
           sha256 = "b7bcd8fc1a39b3602b4a78a0be6012721ba6c8792c4d14773496a4c6d038f886";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkInputs = [

+6 -4

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "codecov";

     

       5
       5
       -
         version = "2.0.9";

     

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

     

       5
       5
       +
         version = "2.0.15";

     

       7
       6
        
       

     

       8
       7
        
         src = fetchPypi {

     

       9
       8
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "037h4dcl8xshlq3rj8409p11rpgnyqrhlhfq8j34s94nm0n1h76v";

     

       9
       9
       +
           sha256 = "8ed8b7c6791010d359baed66f84f061bba5bd41174bf324c31311e8737602788";

     

       11
       10
        
         };

     

       12
       11
        
       

     

       13
       13
       -
         buildInputs = [ unittest2 ]; # Tests only

     

       12
       12
       +
         checkInputs = [ unittest2 ]; # Tests only

     

       14
       13
        
       

     

       15
       14
        
         propagatedBuildInputs = [ requests coverage ];

     

       16
       15
        
       

     

       17
       16
        
         postPatch = ''

     

       18
       17
        
           sed -i 's/, "argparse"//' setup.py

     

       19
       18
        
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         # No tests in archive

     

       21
       21
       +
         doCheck = false;

     

       20
       22
        
       

     

       21
       23
        
         meta = {

     

       22
       24
        
           description = "Python report uploader for Codecov";

+4 -12

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

···

       1
       1
       -
       {stdenv, lib, buildPythonPackage, fetchPypi, coverage, bash, which, writeText}:

     

       1
       1
       +
       {stdenv, lib, buildPythonPackage, fetchPypi, bash, which, writeText}:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

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

     

       5
       4
        
         version = "0.7";

     

       6
       5
        
         pname = "cram";

     

       7
       6
        
       

     

       8
       8
       -
         buildInputs = [ coverage which ];

     

       7
       7
       +
         checkInputs = [ which ];

     

       9
       8
        
       

     

       10
       9
        
         src = fetchPypi {

     

       11
       10
        
           inherit pname version;

     
···

       13
       12
        
         };

     

       14
       13
        
       

     

       15
       14
        
         postPatch = ''

     

       15
       15
       +
           patchShebangs scripts/cram

     

       16
       16
        
           substituteInPlace tests/test.t \

     

       17
       17
        
             --replace "/bin/bash" "${bash}/bin/bash"

     

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
       -
         # This testing is copied from Makefile. Simply using `make test` doesn't work

     

       21
       21
       -
         # because it uses the unpatched `scripts/cram` executable which has a bad

     

       22
       22
       -
         # shebang. Also, for some reason, coverage fails on one file so let's just

     

       23
       23
       -
         # ignore that one.

     

       24
       20
        
         checkPhase = ''

     

       25
       25
       -
           # scripts/cram tests

     

       26
       26
       -
           #COVERAGE=${coverage}/bin/coverage $out/bin/cram tests

     

       27
       27
       -
           #${coverage}/bin/coverage report --fail-under=100

     

       28
       28
       -
           COVERAGE=coverage $out/bin/cram tests

     

       29
       29
       -
           coverage report --fail-under=100 --omit="*/_encoding.py,*/__main__.py"

     

       21
       21
       +
           scripts/cram tests

     

       30
       22
        
         '';

     

       31
       23
        
       

     

       32
       24
        
         meta = {

+31 -21

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

···

       1
       1
       -
       { stdenv, fetchPypi, buildPythonPackage,

     

       2
       2
       -
         dateutil, dbf, xlrd, sqlalchemy, openpyxl,

     

       3
       3
       -
        agate-excel, agate-dbf, agate-sql, isPy3k }:

     

       1
       1
       +
       { lib, fetchPypi, buildPythonPackage, isPy3k

     

       2
       2
       +
       , agate, agate-excel, agate-dbf, agate-sql, six

     

       3
       3
       +
       , argparse, ordereddict, simplejson

     

       4
       4
       +
       , glibcLocales, nose, mock, unittest2

     

       5
       5
       +
       }:

     

       4
       6
        
       

     

       5
       7
        
       buildPythonPackage rec {

     

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

     

       7
       7
       -
           pname = "csvkit";

     

       8
       8
       -
           version = "1.0.2";

     

       8
       8
       +
         pname = "csvkit";

     

       9
       9
       +
         version = "1.0.2";

     

       9
       10
        
       

     

       10
       10
       -
           src = fetchPypi {

     

       11
       11
       -
             inherit pname version;

     

       12
       12
       -
             sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";

     

       13
       13
       -
           };

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";

     

       14
       14
       +
         };

     

       14
       15
        
       

     

       15
       15
       -
           propagatedBuildInputs = [ dateutil dbf xlrd sqlalchemy openpyxl

     

       16
       16
       -
             agate-excel agate-dbf agate-sql ];

     

       16
       16
       +
         propagatedBuildInputs = [

     

       17
       17
       +
           agate agate-excel agate-dbf agate-sql six

     

       18
       18
       +
         ] ++ lib.optionals (!isPy3k) [

     

       19
       19
       +
           argparse ordereddict simplejson

     

       20
       20
       +
         ];

     

       17
       21
        
       

     

       18
       18
       -
           doCheck = !isPy3k;

     

       19
       19
       -
           # (only) python 3 we had 9 failures and 57 errors out of a much larger

     

       20
       20
       -
           # number of tests.

     

       22
       22
       +
         checkInputs = [

     

       23
       23
       +
           glibcLocales nose

     

       24
       24
       +
         ] ++ lib.optionals (!isPy3k) [

     

       25
       25
       +
           mock unittest2

     

       26
       26
       +
         ];

     

       21
       27
        
       

     

       22
       22
       -
           meta = with stdenv.lib; {

     

       23
       23
       -
             description = "A library of utilities for working with CSV, the king of tabular file formats";

     

       24
       24
       -
             maintainers = with maintainers; [ vrthra ];

     

       25
       25
       -
             license = with licenses; [ mit ];

     

       26
       26
       -
             homepage = https://github.com/wireservice/csvkit;

     

       27
       27
       -
           };

     

       28
       28
       +
         checkPhase = ''

     

       29
       29
       +
           LC_ALL="en_US.UTF-8" nosetests -e test_csvsql

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         meta = with lib; {

     

       33
       33
       +
           description = "A library of utilities for working with CSV, the king of tabular file formats";

     

       34
       34
       +
           maintainers = with maintainers; [ vrthra ];

     

       35
       35
       +
           license = with licenses; [ mit ];

     

       36
       36
       +
           homepage = https://github.com/wireservice/csvkit;

     

       37
       37
       +
         };

     

       28
       38
        
       }

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "cupy";

     

       9
       9
       -
         version = "2.3.0";

     

       9
       9
       +
         version = "2.4.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "7426f6332cb01513d2a6a687792dfa17c678ff64dd1b19b04559ddd5672c833f";

     

       13
       13
       +
           sha256 = "96ac44dface1a73673e9c0549fc897f8fa31a7648ff9963dff799ddabd67fde2";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkInputs = [

+4 -4

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

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, pytest, wcwidth }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, wcwidth, typing }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "curtsies";

     
···

       8
       8
        
           sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         propagatedBuildInputs = [ blessings wcwidth pyte ];

     

       11
       11
       +
         propagatedBuildInputs = [ blessings wcwidth typing ];

     

       12
       12
        
       

     

       13
       13
       -
         checkInputs = [ nose mock pytest ];

     

       13
       13
       +
         checkInputs = [ mock pyte nose ];

     

       14
       14
        
       

     

       15
       15
        
         checkPhase = ''

     

       16
       16
       -
           py.test

     

       16
       16
       +
           nosetests tests

     

       17
       17
        
         '';

     

       18
       18
        
       

     

       19
       19
        
         meta = with stdenv.lib; {

+19 -7

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

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchPypi,

     

       2
       2
       -
         asgiref, autobahn, twisted, hypothesis

     

       1
       1
       +
       { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub

     

       2
       2
       +
       , asgiref, autobahn, twisted, pytestrunner

     

       3
       3
       +
       , hypothesis, pytest, pytest-asyncio

     

       3
       4
        
       }:

     

       4
       5
        
       buildPythonPackage rec {

     

       5
       6
        
         pname = "daphne";

     

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

     

       7
       7
        
         version = "2.1.0";

     

       8
       8
        
       

     

       9
       9
       -
         src = fetchPypi {

     

       10
       10
       -
           inherit pname version;

     

       11
       11
       -
           sha256 = "13jv8jn8nf522smwpqdy4lq6cpd06fcgwvgl67i622rid51fj5gb";

     

       9
       9
       +
         disabled = !isPy3k;

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "django";

     

       13
       13
       +
           repo = pname;

     

       14
       14
       +
           rev = version;

     

       15
       15
       +
           sha256 = "1lbpn0l796ar77amqy8dap30zxmsn6as8y2lbmp4lk8m9awscwi8";

     

       12
       16
        
         };

     

       13
       17
        
       

     

       14
       14
       -
         buildInputs = [ hypothesis ];

     

       18
       18
       +
         nativeBuildInputs = [ pytestrunner ];

     

       19
       19
       +
       

     

       15
       20
        
         propagatedBuildInputs = [ asgiref autobahn twisted ];

     

       21
       21
       +
       

     

       22
       22
       +
         checkInputs = [ hypothesis pytest pytest-asyncio ];

     

       23
       23
       +
       

     

       24
       24
       +
         checkPhase = ''

     

       25
       25
       +
           # Other tests fail, seems to be due to filesystem access

     

       26
       26
       +
           py.test -k "test_cli or test_utils"

     

       27
       27
       +
         '';

     

       16
       28
        
       

     

       17
       29
        
         meta = with stdenv.lib; {

     

       18
       30
        
           description = "Django ASGI (HTTP/WebSocket) server";

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "dask";

     

       15
       15
       -
         version = "0.17.0";

     

       15
       15
       +
         version = "0.17.1";

     

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

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "4d2b0754d16ddc3f87026c1fc4fa3b589d7604a41d3f6510268f172abc1d0a5e";

     

       20
       20
       +
           sha256 = "0a6aec8b3489419c97486afd46e30b63caafc642205726a884b7fe488906d359";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = [ pytest ];

+6 -3

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

···

       1
       1
       -
       { stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k }:

     

       1
       1
       +
       { stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
           pname = "dbf";

     

       5
       5
        
           version = "0.96.8";

     

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

     

       7
       6
        
       

     

       8
       7
        
           src = fetchPypi {

     

       9
       8
        
             inherit pname version;

     

       10
       9
        
             sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1";

     

       11
       10
        
           };

     

       12
       11
        
       

     

       13
       13
       -
           propagatedBuildInputs = [ aenum ];

     

       12
       12
       +
           propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];

     

       14
       13
        
       

     

       15
       14
        
           doCheck = !isPy3k;

     

       16
       15
        
           # tests are not yet ported.

     

       17
       16
        
           # https://groups.google.com/forum/#!topic/python-dbase/96rx2xmCG4w

     

       17
       17
       +
       

     

       18
       18
       +
           checkPhase = ''

     

       19
       19
       +
             ${python.interpreter} dbf/test.py

     

       20
       20
       +
           '';

     

       18
       21
        
       

     

       19
       22
        
           meta = with stdenv.lib; {

     

       20
       23
        
             description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";

+21

pkgs/development/python-modules/deluge-client/default.nix

···

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "deluge-client";

     

       5
       5
       +
         version = "1.2.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "048zfidv08sr4hivdd3xxf1pywhqbnszj5qcn51h2f4y1588fhpf";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         # it will try to connect to a running instance

     

       13
       13
       +
         doCheck = false;

     

       14
       14
       +
       

     

       15
       15
       +
         meta = with stdenv.lib; {

     

       16
       16
       +
           description = "Lightweight pure-python rpc client for deluge";

     

       17
       17
       +
           homepage = https://github.com/JohnDoee/deluge-client;

     

       18
       18
       +
           license = licenses.mit;

     

       19
       19
       +
           maintainers = with maintainers; [ peterhoeg ];

     

       20
       20
       +
         };

     

       21
       21
       +
       }

+20

pkgs/development/python-modules/dj-database-url/default.nix

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "dj-database-url";

     

       5
       5
       +
         version = "0.5.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         # Tests access a DB via network

     

       13
       13
       +
         doCheck = false;

     

       14
       14
       +
       

     

       15
       15
       +
         meta = with lib; {

     

       16
       16
       +
           description = "Use Database URLs in your Django Application";

     

       17
       17
       +
           homepage = https://github.com/kennethreitz/dj-database-url;

     

       18
       18
       +
           license = licenses.bsd2;

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+12 -6

pkgs/development/python-modules/django-polymorphic/default.nix

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchPypi, django }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "django-polymorphic";

     

       5
       5
        
         version = "2.0.2";

     

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

     

       7
       6
        
       

     

       8
       8
       -
         src = fetchPypi {

     

       9
       9
       -
           inherit pname version;

     

       10
       10
       -
           sha256 = "e1821d7b5874509a158a0f22bebf544330e0944c481c5a3e6da6cac8887e4e88";

     

       7
       7
       +
         # PyPI tarball is missing some test files

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = pname;

     

       10
       10
       +
           repo = pname;

     

       11
       11
       +
           rev = "v${version}";

     

       12
       12
       +
           sha256 = "18p84kdwpfp423vb2n38h840mj3bq0j57jx3cry7c8dznpi0vfi2";

     

       11
       13
        
         };

     

       12
       14
        
       

     

       13
       13
       -
         checkInputs = [ django ];

     

       15
       15
       +
         checkInputs = [ dj-database-url ];

     

       14
       16
        
         propagatedBuildInputs = [ django ];

     

       17
       17
       +
       

     

       18
       18
       +
         checkPhase = ''

     

       19
       19
       +
           ${python.interpreter} runtests.py

     

       20
       20
       +
         '';

     

       15
       21
        
       

     

       16
       22
        
         meta = {

     

       17
       23
        
           homepage = https://github.com/django-polymorphic/django-polymorphic;

+2 -2

pkgs/development/python-modules/django/2_0.nix

···

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "Django";

     

       9
       9
        
         name = "${pname}-${version}";

     

       10
       10
       -
         version = "2.0.1";

     

       10
       10
       +
         version = "2.0.2";

     

       11
       11
        
       

     

       12
       12
        
         disabled = !isPy3k;

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "0by1gswkrzxn594fa26llkzsc410999fq8s0b5d1598jwi5q0syr";

     

       16
       16
       +
           sha256 = "dc3b61d054f1bced64628c62025d480f655303aea9f408e5996c339a543b45f0";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         patches = stdenv.lib.optionals withGdal [

+3 -2

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

···

       1
       1
       -
       { stdenv, fetchPypi, buildPythonPackage, hidapi

     

       1
       1
       +
       { stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi

     

       2
       2
        
       , pycrypto, pillow, protobuf, future, ecpy

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

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

     

       7
       6
        
         pname = "ECPy";

     

       8
       7
        
         version = "0.8.3";

     

       8
       8
       +
       

     

       9
       9
       +
         disabled = !isPy3k;

     

       9
       10
        
       

     

       10
       11
        
         src = fetchPypi {

     

       11
       12
        
           inherit pname version;

+4 -4

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, pythonOlder,

     

       2
       2
        
         # Build inputs

     

       3
       3
       -
         dateutil, six, ipaddress ? null,

     

       3
       3
       +
         dateutil, six, text-unidecode, ipaddress ? null,

     

       4
       4
        
         # Test inputs

     

       5
       5
        
         email_validator, nose, mock, ukpostcodeparser }:

     

       6
       6
        
       

     
···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "Faker";

     

       11
       11
       -
         version = "0.8.8";

     

       12
       12
       -
         name = "${pname}-${version}";

     

       11
       11
       +
         version = "0.8.11";

     

       13
       12
        
       

     

       14
       13
        
         src = fetchPypi {

     

       15
       14
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "e928cf853ef69d7471421f2a3716a1239e43de0fa9855f4016ee0c9f1057328a";

     

       15
       15
       +
           sha256 = "126kdy6lj10rwgchzz0lzjabx0zcyskamhn0qib67k69fcksjmq8";

     

       17
       16
        
         };

     

       18
       17
        
       

     

       19
       18
        
         checkInputs = [

     
···

       26
       25
        
         propagatedBuildInputs = [

     

       27
       26
        
           dateutil

     

       28
       27
        
           six

     

       28
       28
       +
           text-unidecode

     

       29
       29
        
         ] ++ lib.optional (pythonOlder "3.3") ipaddress;

     

       30
       30
        
       

     

       31
       31
        
         meta = with lib; {

+7 -4

pkgs/development/python-modules/flask-script/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchurl, flask, pytest }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, flask, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         name = "Flask-Script-${version}";

     

       4
       4
       +
         pname = "Flask-Script";

     

       5
       5
        
         version = "2.0.6";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://pypi/F/Flask-Script/${name}.tar.gz";

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
        
           sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ flask ];

     

       13
       13
        
         checkInputs = [ pytest ];

     

       14
       14
       +
       

     

       15
       15
       +
         # No tests in archive

     

       16
       16
       +
         doCheck = false;

     

       14
       17
        
       

     

       15
       18
        
         meta = with lib; {

     

       16
       19
        
           homepage = http://github.com/smurfix/flask-script;

+8 -3

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

···

       3
       3
        
       , numpy

     

       4
       4
        
       , pytest

     

       5
       5
        
       , pytestrunner

     

       6
       6
       +
       , glibcLocales

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       buildPythonPackage rec {

     

       9
       10
        
         pname = "fonttools";

     

       10
       10
       -
         version = "3.22.0";

     

       11
       11
       -
         name = "${pname}-${version}";

     

       11
       11
       +
         version = "3.24.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "01640dfbc0ba752181b21fe74240b8a7bbf7af75581737245836ada5565bd549";

     

       15
       15
       +
           sha256 = "d09126f443bc8797d1b7e76274e65f4c169c04722745953ecf536451b1d9a15f";

     

       16
       16
        
           extension = "zip";

     

       17
       17
        
         };

     

       18
       18
        
       

     
···

       23
       23
        
         checkInputs = [

     

       24
       24
        
           pytest

     

       25
       25
        
           pytestrunner

     

       26
       26
       +
           glibcLocales

     

       26
       27
        
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         preCheck = ''

     

       30
       30
       +
           export LC_ALL="en_US.UTF-8"

     

       31
       31
       +
         '';

     

       27
       32
        
       

     

       28
       33
        
         meta = {

     

       29
       34
        
           homepage = https://github.com/fonttools/fonttools;

+27

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, pytest }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         version = "3.4";

     

       5
       5
       +
         pname = "ftputil";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "374b01e174079e91babe2a462fbd6f6c00dbfbfa299dec04239ca4229fbf8762";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         checkInputs = [ pytest ];

     

       13
       13
       +
       

     

       14
       14
       +
         checkPhase = ''

     

       15
       15
       +
           touch Makefile

     

       16
       16
       +
           # Disable tests that require network access or access /home

     

       17
       17
       +
           py.test test \

     

       18
       18
       +
             -k "not test_public_servers and not test_real_ftp \

     

       19
       19
       +
                 and not test_set_parser and not test_repr"

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description = "High-level FTP client library (virtual file system and more)";

     

       24
       24
       +
           homepage    = http://ftputil.sschwarzer.net/;

     

       25
       25
       +
           license     = licenses.bsd2; # "Modified BSD license, says pypi"

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "google-cloud-core";

     

       6
       6
       -
         version = "0.28.0";

     

       6
       6
       +
         version = "0.28.1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "1h8bx99ksla48zkb7bhkqy66b8prg49dp15alh851vzi9ii2zii7";

     

       10
       10
       +
           sha256 = "89e8140a288acec20c5e56159461d3afa4073570c9758c05d4e6cb7f2f8cc440";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ google_api_core grpcio ];

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "google-cloud-speech";

     

       6
       6
       -
         version = "0.32.0";

     

       6
       6
       +
         version = "0.32.1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "2513725e693c3a2fdf22cb3065f3fcb39de2ab962a0cbc5de11a3889834189e1";

     

       10
       10
       +
           sha256 = "4f9a8ab3eb6630d0c0ca6ac15230dceba7d55d6707d162a84f255139ff780ee9";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ];

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "GPy";

     

       6
       6
       -
         version = "1.8.5";

     

       6
       6
       +
         version = "1.9.2";

     

       7
       7
        
         name  = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "1562e34629192f209273f454e41614a127c6ef04144cd0eb5992d484721d55d3";

     

       11
       11
       +
           sha256 = "372e43d41df5c90e0958d3073070994b351a7409c2e5fbd349cffe13bc24c10a";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # running tests produces "ImportError: cannot import name 'linalg_cython'"

+21

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy3k, colorama, coverage, termstyle, unidecode, mock, backports_shutil_get_terminal_size }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "green";

     

       5
       5
       +
         version = "2.12.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "4c0c163bd2ce2da1f201eb69fd92fc24aaeab884f9e5c5a8c23d507a53336fa8";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         propagatedBuildInputs = [

     

       13
       13
       +
           colorama coverage termstyle unidecode

     

       14
       14
       +
         ] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ];

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with lib; {

     

       17
       17
       +
           description = "Python test runner";

     

       18
       18
       +
           homepage = https://github.com/CleanCut/green;

     

       19
       19
       +
           license = licenses.mit;

     

       20
       20
       +
         };

     

       21
       21
       +
       }

+2 -2

pkgs/development/python-modules/guessit/2.0.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "guessit";

     

       12
       12
       -
         version = "2.0.4";

     

       12
       12
       +
         version = "2.1.4";

     

       13
       13
        
         name = "${pname}-${version}";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "1cfcgb0px6i9jl8nwkx8j06j4y6p5975a9pfmd8lcacwr8gy4wjg";

     

       17
       17
       +
           sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         # Tests require more packages.

+28

pkgs/development/python-modules/ha-ffmpeg/default.nix

···

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi, isPy3k

     

       2
       2
       +
       , ffmpeg, async-timeout }:

     

       3
       3
       +
       

     

       4
       4
       +
       buildPythonPackage rec {

     

       5
       5
       +
         pname = "ha-ffmpeg";

     

       6
       6
       +
         version = "1.9";

     

       7
       7
       +
       

     

       8
       8
       +
         disabled = !isPy3k;

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [ ffmpeg ];

     

       16
       16
       +
       

     

       17
       17
       +
         propagatedBuildInputs = [ async-timeout ];

     

       18
       18
       +
       

     

       19
       19
       +
         # only manual tests

     

       20
       20
       +
         doCheck = false;

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with stdenv.lib; {

     

       23
       23
       +
           homepage = https://github.com/pvizeli/ha-ffmpeg;

     

       24
       24
       +
           description = "Library for home-assistant to handle ffmpeg";

     

       25
       25
       +
           license = licenses.bsd3;

     

       26
       26
       +
           maintainers = with maintainers; [ peterhoeg ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+7 -6

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

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchurl, pytest }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi, idna, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "hyperlink";

     

       5
       5
       -
         version = "17.3.1";

     

       6
       6
       -
         name = pname + "-" + version;

     

       5
       5
       +
         version = "18.0.0";

     

       7
       6
        
       

     

       8
       8
       -
         src = fetchurl {

     

       9
       9
       -
           url = "mirror://pypi/h/hyperlink/${name}.tar.gz";

     

       10
       10
       -
           sha256 = "bc4ffdbde9bdad204d507bd8f554f16bba82dd356f6130cb16f41422909c33bc";

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306";

     

       11
       10
        
         };

     

       11
       11
       +
       

     

       12
       12
       +
         propagatedBuildInputs = [ idna ];

     

       12
       13
        
       

     

       13
       14
        
         checkInputs = [ pytest ];

     

       14
       15

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "ipykernel";

     

       16
       16
       -
         version = "4.8.1";

     

       16
       16
       +
         version = "4.8.2";

     

       17
       17
        
         name = "${pname}-${version}";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "fe2837622a4121cbe42b354db1e2ab46c91e807ffcb92f4c2cfd323a75f8737f";

     

       21
       21
       +
           sha256 = "c091449dd0fad7710ddd9c4a06e8b9e15277da306590bc07a3a1afa6b4453c8f";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [ nose ] ++ lib.optional isPy27 mock;

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

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

     

       5
       5
       -
         version = "1.3.5";

     

       5
       5
       +
         version = "1.4.1";

     

       6
       6
        
         pname = "kafka-python";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "19m9fdckxqngrgh0www7g8rgi7z0kq13wkhcqy1r8aa4sxad0f5j";

     

       10
       10
       +
           sha256 = "596e9b4e302a0dc04d35be159cf23d31c4cba73a218e16fc8cd1be0ad57f8c22";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         checkInputs = [ pytest six mock ];

+48

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchFromGitHub, isPy3k, writeText, configparser, six, pytest, glibcLocales }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "konfig";

     

       5
       5
       +
         version = "1.1";

     

       6
       6
       +
       

     

       7
       7
       +
         # konfig unconditionaly depend on configparser, even if it is part of

     

       8
       8
       +
         # the standard library in python 3.2 or above.

     

       9
       9
       +
         disabled = isPy3k;

     

       10
       10
       +
       

     

       11
       11
       +
         # PyPI tarball is missing utf8.ini, required for tests

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "mozilla-services";

     

       14
       14
       +
           repo = pname;

     

       15
       15
       +
           rev = version;

     

       16
       16
       +
           sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         propagatedBuildInputs = [ configparser six ];

     

       20
       20
       +
       

     

       21
       21
       +
         patches = [ (writeText "konfig.patch" ''

     

       22
       22
       +
           diff --git a/setup.py b/setup.py

     

       23
       23
       +
           index 96fd858..bb4db06 100644

     

       24
       24
       +
           --- a/setup.py

     

       25
       25
       +
           +++ b/setup.py

     

       26
       26
       +
           @@ -20,7 +20,7 @@ setup(name='konfig',

     

       27
       27
       +
                  author_email="tarek@mozilla.com",

     

       28
       28
       +
                  include_package_data=True,

     

       29
       29
       +
                  install_requires = [

     

       30
       30
       +
           -        'configparser', 'argparse', 'six'

     

       31
       31
       +
           +        'configparser', 'six'

     

       32
       32
       +
                  ],

     

       33
       33
       +
                  zip_safe=False,

     

       34
       34
       +
                  classifiers=classifiers,

     

       35
       35
       +
         '') ];

     

       36
       36
       +
       

     

       37
       37
       +
         checkInputs = [ pytest glibcLocales ];

     

       38
       38
       +
       

     

       39
       39
       +
         checkPhase = ''

     

       40
       40
       +
           LC_ALL=en_US.utf8 pytest -v konfig/tests

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       43
       43
       +
         meta = with lib; {

     

       44
       44
       +
           description = "Yet Another Config Parser";

     

       45
       45
       +
           homepage    = "https://github.com/mozilla-services/konfig";

     

       46
       46
       +
           license     = licenses.mpl20;

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+25

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy3k

     

       2
       2
       +
       , pbr, ldap, fixtures, testresources, testtools }:

     

       3
       3
       +
       

     

       4
       4
       +
       buildPythonPackage rec {

     

       5
       5
       +
         name = "ldappool-${version}";

     

       6
       6
       +
         version = "2.2.0";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchPypi {

     

       9
       9
       +
           pname = "ldappool";

     

       10
       10
       +
           inherit version;

     

       11
       11
       +
           sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ pbr ];

     

       15
       15
       +
       

     

       16
       16
       +
         propagatedBuildInputs = [ ldap ];

     

       17
       17
       +
       

     

       18
       18
       +
         checkInputs = [ fixtures testresources testtools ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with lib; {

     

       21
       21
       +
           description = "A simple connector pool for python-ldap";

     

       22
       22
       +
           homepage = https://git.openstack.org/cgit/openstack/ldappool;

     

       23
       23
       +
           license = licenses.mpl20;

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "llvmlite";

     

       13
       13
       -
         version = "0.21.0";

     

       13
       13
       +
         version = "0.22.0";

     

       14
       14
        
       

     

       15
       15
        
         disabled = isPyPy;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "3a5dd0695fdfb9fd47464cd71791b84935bf9642e11f4811d57aa1f2da8cdaa8";

     

       19
       19
       +
           sha256 = "a0a875f3d502f41f4a24444aa98fbf076a6bf36e2a0b3b4481b22e1c4a3acdc2";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;

+2 -2

pkgs/development/python-modules/marionette-harness/mozdevice.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "mozdevice";

     

       11
       11
       -
         version = "0.50";

     

       11
       11
       +
         version = "0.52";

     

       12
       12
        
         name = "${pname}-${version}";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "0cfxzhfxdphlzj80vkd3h7m0mg5w7zhb8h6f5lmybliqdiv9vz20";

     

       16
       16
       +
           sha256 = "5b6fcbc7179c0f09bd99f7f7c42b614bce5f39543fb18b190e408488f987d6b5";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [ moznetwork mozprocess ];

+7 -4

pkgs/development/python-modules/marionette-harness/mozlog.nix

···

       4
       4
        
       , fetchPypi

     

       5
       5
        
       , isPy3k

     

       6
       6
        
       , blessings

     

       7
       7
       +
       , mozterm

     

       8
       8
       +
       , six

     

       7
       9
        
       , mozfile

     

       8
       10
        
       }:

     

       9
       11
        
       

     

       10
       12
        
       buildPythonPackage rec {

     

       11
       13
        
         pname = "mozlog";

     

       12
       12
       -
         version = "3.4";

     

       13
       13
       -
         name = "${pname}-${version}";

     

       14
       14
       +
         version = "3.7";

     

       14
       15
        
       

     

       15
       16
        
         disabled = isPy3k;

     

       16
       17
        
       

     

       17
       18
        
         src = fetchPypi {

     

       18
       19
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "1m4d9i1kzcmkhipfd5czv05f2s84j1byx3cv4y2irjmwq5v6cyiq";

     

       20
       20
       +
           sha256 = "414141131c4f5e7242e69a939d2b74f4ed8dbac12bef93eee4e7125cd1a131e9";

     

       20
       21
        
         };

     

       21
       22
        
       

     

       22
       22
       -
         propagatedBuildInputs = [ blessings mozfile ];

     

       23
       23
       +
         propagatedBuildInputs = [ blessings mozterm six ];

     

       24
       24
       +
       

     

       25
       25
       +
         checkInputs = [ mozfile ];

     

       23
       26
        
       

     

       24
       27
        
         meta = {

     

       25
       28
        
           description = "Mozilla logging library";

+2 -2

pkgs/development/python-modules/marionette-harness/mozprocess.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "mozprocess";

     

       10
       10
       -
         version = "0.25";

     

       10
       10
       +
         version = "0.26";

     

       11
       11
        
         name = "${pname}-${version}";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "0lfflwjkwvc8bqvsgdib3b78w2pms8nharh3sc3zgsrmqb1mbzks";

     

       15
       15
       +
           sha256 = "9f471c45bee9ff14e936c6ee216a6cc4941223659c01fa626bce628001d8485c";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ mozinfo ];

+2 -2

pkgs/development/python-modules/marionette-harness/mozprofile.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "mozprofile";

     

       12
       12
       -
         version = "0.28";

     

       12
       12
       +
         version = "0.29";

     

       13
       13
        
         name = "${pname}-${version}";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "15xsdhrpbg7hlr6nvb3k3ci33h786hrv12az8j2k7aa9gzjcf8nh";

     

       17
       17
       +
           sha256 = "92af4b9f527a18997dccb60e846e1844b2428668dadf3ccb1a8cd30c706b25c1";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ mozlog mozfile mozhttpd ];

+2 -2

pkgs/development/python-modules/marionette-harness/mozrunner.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "mozrunner";

     

       16
       16
       -
         version = "6.13";

     

       16
       16
       +
         version = "6.14";

     

       17
       17
        
         name = "${pname}-${version}";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "1d5k3a0w1iyyk6l28l65j47grq87zd207h369x4vahq02nrx2g6l";

     

       21
       21
       +
           sha256 = "a401ea5141cdd15d8f047f19a30ccbeabeb0aea079674b684121acddc5dcf810";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess

+2 -2

pkgs/development/python-modules/marionette-harness/mozversion.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "mozversion";

     

       11
       11
       -
         version = "1.4";

     

       11
       11
       +
         version = "1.5";

     

       12
       12
        
         name = "${pname}-${version}";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "15ipddn6bpqxl590cy37fj52vgpa4faw2dax1mwvdxj7b18s3pwh";

     

       16
       16
       +
           sha256 = "e9b11e4a46bf7a4a11469ea4589c75f3ba50b34b7801e7edf1a09147af8bf70f";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [ mozlog mozdevice ];

+18

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

···

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "miniupnpc";

     

       5
       5
       +
         version = "2.0.2";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "0ca94zz7sr2x57j218aypxqcwkr23n8js30f3yrvvqbg929nr93y";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         meta = with stdenv.lib; {

     

       13
       13
       +
           description = "miniUPnP client";

     

       14
       14
       +
           homepage = http://miniupnp.free.fr/;

     

       15
       15
       +
           license = licenses.mit;

     

       16
       16
       +
           maintainers = with maintainers; [ peterhoeg ];

     

       17
       17
       +
         };

     

       18
       18
       +
       }

+16

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "mozterm";

     

       5
       5
       +
         version = "0.1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "4ebf8bd772d97c0f557184173f0f96cfca0abfc07e1ae975fbcfa76be50b5561";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         meta = with lib; {

     

       13
       13
       +
           description = "Terminal abstractions built around the blessings module";

     

       14
       14
       +
           license = licenses.mpl20;

     

       15
       15
       +
         };

     

       16
       16
       +
       }

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "msgpack";

     

       9
       9
       -
         version = "0.5.4";

     

       9
       9
       +
         version = "0.5.6";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "13ckbs2qc4dww7fddnm9cw116j4spgxqab49ijmj6jr178ypwl80";

     

       13
       13
       +
           sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkPhase = ''

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "neovim";

     

       14
       14
       -
         version = "0.2.1";

     

       14
       14
       +
         version = "0.2.3";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "16vzxmp7f6dl20n30j5cwwvrjj5h3c2ch8ldbss31anf36nirsdp";

     

       18
       18
       +
           sha256 = "989d720dc7636aa4260aa7774fa79aa524f51515b262eb8d7e9ba4336f758a99";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         checkInputs = [ nose ];

+8 -2

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

···

       1
       1
       -
       { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, requests, zeroconf, netifaces, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "netdisco";

     
···

       14
       14
        
           sha256 = "170s9py8rw07cfgwvv7mf69g8jjg32m2rgw8x3kbvjqlmrdijxmm";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       +
         # Allow newer zeroconf versions

     

       18
       18
       +
         patches = fetchpatch {

     

       19
       19
       +
           url = "${meta.homepage}/commit/78f83046a2a0d77527274c8be9c3fd75737c19d0.patch";

     

       20
       20
       +
           sha256 = "098zkwqg9181vavw97yhi9rsdsf023gnapg4gkr1n0awz3f3l9nm";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       17
       23
        
         propagatedBuildInputs = [ requests zeroconf netifaces ];

     

       18
       24
        
       

     

       19
       25
        
         checkInputs = [ pytest ];

     
···

       24
       30
        
       

     

       25
       31
        
         meta = with stdenv.lib; {

     

       26
       32
        
           description = "Python library to scan local network for services and devices";

     

       27
       27
       -
           homepage = https://github.com/home-assistant/netdisco/;

     

       33
       33
       +
           homepage = https://github.com/home-assistant/netdisco;

     

       28
       34
        
           license = licenses.asl20;

     

       29
       35
        
           platforms = platforms.unix;

     

       30
       36
        
           maintainers = with maintainers; [ dotlambda ];

+4 -12

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

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , nose

     

       5
       5
        
       , decorator

     

       6
       6
       -
       , isPy36

     

       7
       7
       -
       , isPyPy

     

       8
       6
        
       }:

     

       9
       7
        
       

     

       10
       8
        
       buildPythonPackage rec {

     

       11
       9
        
         pname = "networkx";

     

       12
       12
       -
         version = "1.11";

     

       13
       13
       -
       

     

       14
       14
       -
         # Currently broken on PyPy.

     

       15
       15
       -
         # https://github.com/networkx/networkx/pull/1361

     

       16
       16
       -
         disabled = isPyPy;

     

       10
       10
       +
         version = "2.1";

     

       17
       11
        
       

     

       18
       12
        
         src = fetchPypi {

     

       19
       13
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd";

     

       14
       14
       +
           extension = "zip";

     

       15
       15
       +
           sha256 = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1";

     

       21
       16
        
         };

     

       22
       17
        
       

     

       23
       18
        
         checkInputs = [ nose ];

     

       24
       19
        
         propagatedBuildInputs = [ decorator ];

     

       25
       20
        
       

     

       26
       26
       -
         # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299

     

       27
       27
       -
         doCheck = !(isPy36);

     

       28
       28
       -
       

     

       29
       21
        
         meta = {

     

       30
       22
        
           homepage = "https://networkx.github.io/";

     

       31
       23
        
           description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks";

     

       32
       24
        
           license = lib.licenses.bsd3;

     

       33
       25
        
         };

     

       34
       34
       -
       }
     

       26
       26
       +
       }

+2 -2

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

···

       29
       29
        
       

     

       30
       30
        
       buildPythonPackage rec {

     

       31
       31
        
         pname = "nipype";

     

       32
       32
       -
         version = "1.0.0";

     

       32
       32
       +
         version = "1.0.1";

     

       33
       33
        
       

     

       34
       34
        
         src = fetchPypi {

     

       35
       35
        
           inherit pname version;

     

       36
       36
       -
           sha256 = "4c14c6cae1f530f89d76fa8136d52488b1daf3a02179da65121b76eaf4a6f0ea";

     

       36
       36
       +
           sha256 = "47f62fda3d6b9a37aa407a6b78c80e91240aa71e61191ed00da68b02839fe258";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         doCheck = false;  # fails with TypeError: None is not callable

+2 -2

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

···

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
       -
         version = "0.36.2";

     

       17
       17
       +
         version = "0.37.0";

     

       18
       18
        
         pname = "numba";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           sha256 = "d61597808ce511e81b64e32da664f52beb7d947bf834dde8b8b60b29d205e5c2";

     

       22
       22
       +
           sha256 = "c62121b2d384d8b4d244ef26c1cf8bb5cb819278a80b893bf41918ad6d391258";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "numpy";

     

       5
       5
       -
         version = "1.14.0";

     

       5
       5
       +
         version = "1.14.1";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
        
           extension = "zip";

     

       11
       11
       -
           sha256 = "3de643935b212307b420248018323a44ec51987a336d1d747c1322afc3c099fb";

     

       11
       11
       +
           sha256 = "fa0944650d5d3fb95869eaacd8eedbd2d83610c85e271bd9d3495ffa9bc4dc9c";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         disabled = isPyPy;

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "paramz";

     

       5
       5
       -
         version = "0.8.5";

     

       5
       5
       +
         version = "0.9.1";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "297e59b48e57e78e15f547b1af8b21ddfd19a6312d70b9dc07c7262711adfed9";

     

       10
       10
       +
           sha256 = "8a5a2fe5cdb033eb869c49e81fde2a9d0055fadb53a8af1665a7f48f320179cf";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ numpy scipy six decorator ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pendulum";

     

       5
       5
       -
         version = "1.4.1";

     

       5
       5
       +
         version = "1.4.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "3f16fb759e6126dd89d49886f8100caa72e5ab36563bc148b4f7eddfa0099c0f";

     

       9
       9
       +
           sha256 = "39a255776528afe11ea0d57814f9bf3729c1e0b99063af2e5c6cfd750c3e1f7f";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ dateutil pytzdata tzlocal ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "phonenumbers";

     

       5
       5
       -
         version = "8.8.9";

     

       5
       5
       +
         version = "8.9.0";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "d819299c3aa8f85f248295ab8559e202af429b4017301b122a0b4c387aed10d2";

     

       10
       10
       +
           sha256 = "2cb4822ba895200b06f46a788e852d6ae8200fdc97e1d7c86b0ee10c99d4ff3a";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         meta = {

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "plotly";

     

       13
       13
       -
         version = "2.4.0";

     

       13
       13
       +
         version = "2.4.1";

     

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

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "8e7ee039231fec52b0b38d45e7470f70b117f6527b08cc922d74992f4d082858";

     

       18
       18
       +
           sha256 = "f588991dce15437debd825eca935c8cfbabf438cdc0dcd2ce7a88f429d982f69";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

+4 -1

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

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pomegranate";

     

       5
       5
        
         version = "0.8.1";

     

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

     

       7
       6
        
         

     

       8
       7
        
         src = fetchFromGitHub {

     

       9
       8
        
           repo = pname;

     
···

       21
       20
        
           homepage = https://github.com/jmschrei/pomegranate;

     

       22
       21
        
           license = licenses.mit;

     

       23
       22
        
           maintainers = with maintainers; [ rybern ];

     

       23
       23
       +
       

     

       24
       24
       +
           # "pomegranate does not yet work with networkx 2.0"

     

       25
       25
       +
           # see https://github.com/jmschrei/pomegranate/issues/209

     

       26
       26
       +
           broken = true; 

     

       24
       27
        
         };

     

       25
       28
        
       }

+15 -1

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

···

       7
       7
        
       , six

     

       8
       8
        
       , pydotplus

     

       9
       9
        
       , rdflib

     

       10
       10
       +
       , pydot

     

       11
       11
       +
       , glibcLocales

     

       10
       12
        
       }:

     

       11
       13
        
       

     

       12
       14
        
       buildPythonPackage rec {

     
···

       18
       20
        
           sha256 = "640dc158d931403bc6c1a0ad80702caae71f810bac21f90ec605865c8444b7bb";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       23
       23
       +
         prePatch = ''

     

       24
       24
       +
           substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       21
       27
        
         propagatedBuildInputs = [

     

       22
       28
        
           lxml

     

       23
       29
        
           networkx

     
···

       26
       32
        
           pydotplus

     

       27
       33
        
           rdflib

     

       28
       34
        
         ];

     

       29
       29
       -
         doCheck = false; # takes ~60 mins

     

       35
       35
       +
       

     

       36
       36
       +
         checkInputs = [

     

       37
       37
       +
           pydot

     

       38
       38
       +
           glibcLocales

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         preCheck = ''

     

       42
       42
       +
           export LC_ALL="en_US.utf-8"

     

       43
       43
       +
         '';

     

       30
       44
        
       

     

       31
       45
        
         meta = with stdenv.lib; {

     

       32
       46
        
           description = "A Python library for W3C Provenance Data Model (PROV)";

+2 -1

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

···

       1
       1
        
       { lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         name = "pybfd-0.1.1.2017-12-31";

     

       4
       4
       +
         pname = "pybfd";

     

       5
       5
       +
         version = "-0.1.1.2017-12-31";

     

       5
       6
        
       

     

       6
       7
        
         disabled = isPyPy || isPy3k;

     

       7
       8

+22

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

···

       1
       1
       +
       { stdenv, lib, buildPythonPackage, fetchurl, cups, libiconv }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "pycups";

     

       5
       5
       +
         version = "1.9.73";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2";

     

       9
       9
       +
           sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ cups ] ++ lib.optional stdenv.isDarwin libiconv;

     

       13
       13
       +
       

     

       14
       14
       +
         # Wants to connect to CUPS

     

       15
       15
       +
         doCheck = false;

     

       16
       16
       +
       

     

       17
       17
       +
         meta = with lib; {

     

       18
       18
       +
           description = "Python bindings for libcups";

     

       19
       19
       +
           homepage = http://cyberelk.net/tim/software/pycups/;

     

       20
       20
       +
           license = with licenses; [ gpl2Plus ];

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+2 -2

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

···

       3
       3
        
       buildPythonPackage rec {

     

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

     

       5
       5
        
         pname = "pydub";

     

       6
       6
       -
         version = "0.20.0";

     

       6
       6
       +
         version = "0.21.0";

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0hqsvvph6ks4kxj0m2q1xvl5bllqmpk78rlqpqhh79schl344xkv";

     

       9
       9
       +
           sha256 = "27acc5977b0f5220682175d44fda737bbf818143b0832c0c3863b5dde38e197a";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         patches = [

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pymongo";

     

       5
       5
       -
         version = "3.6.0";

     

       5
       5
       +
         version = "3.6.1";

     

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

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "c6de26d1e171cdc449745b82f1addbc873d105b8e7335097da991c0fc664a4a8";

     

       10
       10
       +
           sha256 = "f7ebcb846962ee40374db2d9014a89bea9c983ae63c1877957c3a0a756974796";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         doCheck = false;

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "pyopencl";

     

       18
       18
       -
         version = "2018.1";

     

       18
       18
       +
         version = "2018.1.1";

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [ pytest ];

     

       21
       21
        
         buildInputs = [ opencl-headers ocl-icd ];

     
···

       24
       24
        
       

     

       25
       25
        
         src = fetchPypi {

     

       26
       26
        
           inherit pname version;

     

       27
       27
       -
           sha256 = "b692966bbaaa65ef8949ee25660d6b0cc7cbadc7f4a35eb9c5139dfa4dde6d4a";

     

       27
       27
       +
           sha256 = "29683b47ec729c77a1be4d6fae2bd3718ca4cfcbe14655261a3a14d5bf55530a";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         # py.test is not needed during runtime, so remove it from `install_requires`

+1 -1

pkgs/development/python-modules/pytest-mock/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pytest-mock";

+2 -2

pkgs/development/python-modules/pytest-xdist/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pytest-xdist";

     

       5
       5
       -
         version = "1.22.0";

     

       5
       5
       +
         version = "1.22.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "65228a859191f2c74ee68c127317eefe35eedd3d43fc1431f19240663b0cafcd";

     

       9
       9
       +
           sha256 = "e8f5744acc270b3e7d915bdb4d5f471670f049b6fbd163d4cbd52203b075d30f";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ setuptools_scm ];

+2 -2

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

···

       2
       2
        
       , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k

     

       3
       3
        
       }:

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
       -
         version = "3.4.0";

     

       5
       5
       +
         version = "3.4.1";

     

       6
       6
        
         pname = "pytest";

     

       7
       7
        
       

     

       8
       8
        
         preCheck = ''

     
···

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "6074ea3b9c999bd6d0df5fa9d12dd95ccd23550df2a582f5f5b848331d2e82ca";

     

       15
       15
       +
           sha256 = "9ddcb879c8cc859d2540204b5399011f842e5e8823674bf429f70ada281b3cc6";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         checkInputs = [ hypothesis ];

+23

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, mock, testscenarios, docutils, lockfile }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "python-daemon";

     

       5
       5
       +
         version = "2.1.2";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "261c859be5c12ae7d4286dc6951e87e9e1a70a882a8b41fd926efc1ec4214f73";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         # A test fail within chroot builds.

     

       13
       13
       +
         doCheck = false;

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [ mock testscenarios ];

     

       16
       16
       +
         propagatedBuildInputs = [ docutils lockfile ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           description = "Library to implement a well-behaved Unix daemon process";

     

       20
       20
       +
           homepage = https://alioth.debian.org/projects/python-daemon/;

     

       21
       21
       +
           license = [ licenses.gpl3Plus licenses.asl20 ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "python-oauth2";

     

       9
       9
       -
         version = "1.0.1";

     

       9
       9
       +
         version = "1.1.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "0a1d0qnlgm07wq9r9bbm5jqkqry73w34m87p0141bk76lg7bb0sm";

     

       13
       13
       +
           sha256 = "b24da812837c19183df1924e80a22ba0a1869582dea8b04a9ecd807b04dbc525";

     

       14
       14
        
         };

     

       15
       15
        
         # attempts to run mysql

     

       16
       16
        
         doCheck = false;

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "pytools";

     

       13
       13
       -
         version = "2017.6";

     

       13
       13
       +
         version = "2018.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "80f1bba4469d473c1b3969bc8e188c03bcc94d35807a889ceebbfc78e3208115";

     

       17
       17
       +
           sha256 = "0063b87285cb1172e3602a996bfd7342bf407361cf67b562cb6d806f70422e71";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [ pytest ];

+24

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, nose, six, colorama, termstyle }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "rednose";

     

       5
       5
       +
         version = "1.3.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "6da77917788be277b70259edc0bb92fc6f28fe268b765b4ea88206cc3543a3e1";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         prePatch = ''

     

       13
       13
       +
           substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"

     

       14
       14
       +
         '';

     

       15
       15
       +
       

     

       16
       16
       +
         checkInputs = [ six ];

     

       17
       17
       +
         propagatedBuildInputs = [ nose colorama termstyle ];

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "A python nose plugin adding color to console results";

     

       21
       21
       +
           homepage = https://github.com/JBKahn/rednose;

     

       22
       22
       +
           license = licenses.mit;

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "regex";

     

       10
       10
       -
         version = "2018.02.08";

     

       10
       10
       +
         version = "2018.02.21";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "2353c0e983c4029caf32016f1dddef623c3117ac282a818468c6d2f5d541698d";

     

       14
       14
       +
           sha256 = "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         postCheck = ''

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "restructuredtext_lint";

     

       14
       14
       -
         version = "1.1.2";

     

       14
       14
       +
         version = "1.1.3";

     

       15
       15
        
         name = "${pname}-${version}";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "9201d354e22c27be61cf6d8212da6e10c875eec7ec8d1bdb1067b2a5ba931637";

     

       19
       19
       +
           sha256 = "c48ca9a84c312b262809f041fe47dcfaedc9ee4879b3e1f9532f745c182b4037";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         checkInputs = [ nose flake8 pyyaml testtools ];

+2 -2

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

···

       8
       8
        
       # Should use buildPythonPackage here somehow

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "setuptools";

     

       11
       11
       -
         version = "38.4.0";

     

       11
       11
       +
         version = "38.4.1";

     

       12
       12
        
         name = "${python.libPrefix}-${pname}-${version}";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
        
           extension = "zip";

     

       17
       17
       -
           sha256 = "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75";

     

       17
       17
       +
           sha256 = "3b5f74bd33b046a121f052632f248b580f5e83848bb4cebda9e38741a445a969";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ unzip wrapPython ];

+2 -2

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

···

       27
       27
        
       buildPythonPackage rec {

     

       28
       28
        
         name = "${pname}-${version}";

     

       29
       29
        
         pname = "Sphinx";

     

       30
       30
       -
         version = "1.7.0";

     

       30
       30
       +
         version = "1.7.1";

     

       31
       31
        
         src = fetchPypi {

     

       32
       32
        
           inherit pname version;

     

       33
       33
       -
           sha256 = "278b7923f3f4ed2a1d1359f0ae94d89ac90ddd4189e8362f4b4d3baa2afe6b4a";

     

       33
       33
       +
           sha256 = "da987de5fcca21a4acc7f67a86a363039e67ac3e8827161e61b91deb131c0ee8";

     

       34
       34
        
         };

     

       35
       35
        
         LC_ALL = "en_US.UTF-8";

     

       36
       36

+2 -2

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

···

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "SQLAlchemy";

     

       13
       13
        
         name = "${pname}-${version}";

     

       14
       14
       -
         version = "1.2.3";

     

       14
       14
       +
         version = "1.2.4";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "9e9ec143e2e246f385cfb2de8daa89d2fa466279addcb7be9e102988fdf33d24";

     

       18
       18
       +
           sha256 = "6997507af46b10630e13b605ac278b78885fd683d038896dbee0e7ec41d809d2";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         checkInputs = [

+2 -2

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

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "sqlmap";

     

       8
       8
       -
         version = "1.2.2";

     

       8
       8
       +
         version = "1.2.3";

     

       9
       9
        
         name = "${pname}-${version}";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "6256e0d5ab6d465152c8a8a21bdb97b50e155255d6bedd586ce214ed7a1fb9d7";

     

       13
       13
       +
           sha256 = "0db9d1dd2e9624befff25f7e1a356f32366e4f05fd7e1a1783499816416ae28e";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # No tests in archive

+24

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

···

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       +
       , requests, six

     

       3
       3
       +
       , backports_unittest-mock, pluggy, pytest, pytestrunner }:

     

       4
       4
       +
       

     

       5
       5
       +
       buildPythonPackage rec {

     

       6
       6
       +
         pname = "sseclient";

     

       7
       7
       +
         version = "0.0.19";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchPypi {

     

       10
       10
       +
           inherit pname version;

     

       11
       11
       +
           sha256 = "7a2ea3f4c8525ae9a677bc8193df5db88e23bcaafcc34938a1ee665975703a9f";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         propagatedBuildInputs = [ requests six ];

     

       15
       15
       +
       

     

       16
       16
       +
         checkInputs = [ backports_unittest-mock pytest pytestrunner ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with stdenv.lib; {

     

       19
       19
       +
           description = "Client library for reading Server Sent Event streams";

     

       20
       20
       +
           homepage = https://github.com/btubbs/sseclient;

     

       21
       21
       +
           license = licenses.mit;

     

       22
       22
       +
           maintainers = with maintainers; [ peterhoeg ];

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+7 -8

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

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , unittest2, mock, requests }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy3k

     

       2
       2
       +
       , unittest2, mock, requests, simplejson }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "stripe";

     

       6
       6
       -
         version = "1.77.2";

     

       7
       7
       -
         name = "${pname}-${version}";

     

       6
       6
       +
         version = "1.79.1";

     

       8
       7
        
       

     

       9
       8
        
         # Tests require network connectivity and there's no easy way to disable

     

       10
       9
        
         # them. ~ C.

     
···

       12
       11
        
       

     

       13
       12
        
         src = fetchPypi {

     

       14
       13
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "3bcd55108dd2c0e853a91147ee843bc375f35767e64d0f7680e5bd82ddb7fbf1";

     

       14
       14
       +
           sha256 = "2ec19bf8ad588ec04b36c35f359196fa1991f9ad911b1686ac2a12651a154947";

     

       16
       15
        
         };

     

       17
       16
        
       

     

       18
       18
       -
         buildInputs = [ unittest2 mock ];

     

       17
       17
       +
         checkInputs = [ unittest2 mock ];

     

       19
       18
        
       

     

       20
       20
       -
         propagatedBuildInputs = [ requests ];

     

       19
       19
       +
         propagatedBuildInputs = [ requests ] ++ lib.optional (!isPy3k) simplejson;

     

       21
       20
        
       

     

       22
       22
       -
         meta = with stdenv.lib; {

     

       21
       21
       +
         meta = with lib; {

     

       23
       22
        
           description = "Stripe Python bindings";

     

       24
       23
        
           homepage = https://github.com/stripe/stripe-python;

     

       25
       24
        
           license = licenses.mit;

+20

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "termstyle";

     

       5
       5
       +
         version = "0.1.11";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "ef74b83698ea014112040cf32b1a093c1ab3d91c4dd18ecc03ec178fd99c9f9f";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         # Only manual tests

     

       13
       13
       +
         doCheck = false;

     

       14
       14
       +
       

     

       15
       15
       +
         meta = with lib; {

     

       16
       16
       +
           description = "Console colouring for python";

     

       17
       17
       +
           homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10";

     

       18
       18
       +
           license = licenses.bsdOriginal;

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+23

pkgs/development/python-modules/text-unidecode/default.nix

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, pytest }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "text-unidecode";

     

       5
       5
       +
         version = "1.2";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "5a1375bb2ba7968740508ae38d92e1f889a0832913cb1c447d5e2046061a396d";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         checkInputs = [ pytest ];

     

       13
       13
       +
       

     

       14
       14
       +
         checkPhase = ''

     

       15
       15
       +
           py.test

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           description = "The most basic Text::Unidecode port";

     

       20
       20
       +
           homepage = https://github.com/kmike/text-unidecode;

     

       21
       21
       +
           license = licenses.artistic1;

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+2 -2

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

···

       25
       25
        
       buildPythonPackage rec {

     

       26
       26
        
         name = "${pname}-${version}";

     

       27
       27
        
         pname = "textacy";

     

       28
       28
       -
         version = "0.5.0";

     

       28
       28
       +
         version = "0.6.0";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchPypi {

     

       31
       31
        
           inherit pname version;

     

       32
       32
       -
           sha256 = "6fc4603fd52c386081b063ef7aa15ca77e5e937a3064b197359659fccfdeb406";

     

       32
       32
       +
           sha256 = "70ebd8f6536c1536132c997988a4f27731a2db5a7ca7bab29fb33746b444959f";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         disabled = isPy27; # 2.7 requires backports.csv

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "tifffile";

     

       6
       6
       -
         version = "0.13.5";

     

       6
       6
       +
         version = "0.14.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "bca0fc9eaf609a27ebd99d8466e05d5a6e79389957f17582b70643dbca65e3d8";

     

       10
       10
       +
           sha256 = "eff44f71782dce38c604921a1b29ddad0d007ac9871d66e9c872fd6fc311334e";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         checkInputs = [ nose ];

+20

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "tmdb3";

     

       5
       5
       +
         version = "0.7.2";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "9b6e043b8a65d159e7fc8f720badc7ffee5109296e38676c107454e03a895983";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         # no tests implemented

     

       13
       13
       +
         doCheck = false;

     

       14
       14
       +
       

     

       15
       15
       +
         meta = with lib; {

     

       16
       16
       +
           description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";

     

       17
       17
       +
           homepage = https://pypi.python.org/pypi/tmdb3;

     

       18
       18
       +
           license = licenses.bsd3;

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "tqdm";

     

       14
       14
       -
         version = "4.19.5";

     

       14
       14
       +
         version = "4.19.6";

     

       15
       15
        
         name = "${pname}-${version}";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "df32e6f127dc0ccbc675eadb33f749abbcb8f174c5cb9ec49c0cdb73aa737377";

     

       19
       19
       +
           sha256 = "5ec0d4442358e55cdb4a0471d04c6c831518fd8837f259db5537d90feab380df";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [ nose coverage glibcLocales flake8 ];

+27

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchFromGitHub, requests, mock, responses, pytest }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "tunigo";

     

       5
       5
       +
         version = "1.0.0";

     

       6
       6
       +
       

     

       7
       7
       +
         propagatedBuildInputs = [ requests ];

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "trygveaa";

     

       11
       11
       +
           repo = "python-tunigo";

     

       12
       12
       +
           rev = "v${version}";

     

       13
       13
       +
           sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         checkInputs = [ mock responses pytest ];

     

       17
       17
       +
       

     

       18
       18
       +
         checkPhase = ''

     

       19
       19
       +
           py.test

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description = "Python API for the browse feature of Spotify";

     

       24
       24
       +
           homepage = https://github.com/trygveaa/python-tunigo;

     

       25
       25
       +
           license = licenses.asl20;

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -10

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

···

       3
       3
        
       , GeoIP}:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

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

     

       7
       6
        
         pname = "txtorcon";

     

       8
       8
       -
         version = "0.19.3";

     

       7
       7
       +
         version = "0.20.0";

     

       9
       8
        
       

     

       10
       9
        
         checkInputs = [ pytest mock lsof GeoIP ];

     

       11
       10
        
         propagatedBuildInputs = [

     
···

       16
       15
        
       

     

       17
       16
        
         src = fetchPypi {

     

       18
       17
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "1za4qag4g2lbw695v4ssxqc2aspdyknnbn2diylwg8q9g5k9cczp";

     

       18
       18
       +
           sha256 = "dc80cb76b3ddacef6d671c0a088cb1a45274c0858554c32ce55d0f41421c740e";

     

       20
       19
        
         };

     

       21
       21
       -
       

     

       22
       22
       -
         # ipaddress isn't required for Python 3 although it's in requirements.txt.

     

       23
       23
       -
         # Because ipaddress doesn't install on Python 3, remove the requirement so the

     

       24
       24
       -
         # installation of this package doesn't fail on Python 3.

     

       25
       25
       -
         postPatch = "" + lib.optionalString isPy3k ''

     

       26
       26
       -
           substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" ""

     

       27
       27
       -
         '';

     

       28
       20
        
       

     

       29
       21
        
         # Skip a failing test until fixed upstream:

     

       30
       22
        
         # https://github.com/meejah/txtorcon/issues/250

+23

pkgs/development/python-modules/virtual-display/default.nix

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, EasyProcess }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "PyVirtualDisplay";

     

       5
       5
       +
         version = "0.2.1";

     

       6
       6
       +
       

     

       7
       7
       +
         propagatedBuildInputs = [ EasyProcess ];

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchPypi {

     

       10
       10
       +
           inherit pname version;

     

       11
       11
       +
           sha256 = "012883851a992f9c53f0dc6a512765a95cf241bdb734af79e6bdfef95c6e9982";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         # requires X server

     

       15
       15
       +
         doCheck = false;

     

       16
       16
       +
       

     

       17
       17
       +
         meta = with lib; {

     

       18
       18
       +
           description = "Python wrapper for Xvfb, Xephyr and Xvnc";

     

       19
       19
       +
           homepage = "https://github.com/ponty/pyvirtualdisplay";

     

       20
       20
       +
           license = licenses.bsdOriginal;

     

       21
       21
       +
           maintainers = with maintainers; [ layus ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+23

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "wrapt";

     

       8
       8
       +
         version = "1.10.11";

     

       9
       9
       +
       

     

       10
       10
       +
         # No tests in archive

     

       11
       11
       +
         doCheck = false;

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           sha256 = "d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         meta = {

     

       19
       19
       +
           description = "Module for decorators, wrappers and monkey patching";

     

       20
       20
       +
           license = lib.licenses.bsd2;

     

       21
       21
       +
           homepage = https://github.com/GrahamDumpleton/wrapt;

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "xarray";

     

       13
       13
       -
         version = "0.10.0";

     

       13
       13
       +
         version = "0.10.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "af1449e8df84a6eb09eb1d56c1dc5ac7f24a9563d4f2b9391ff364dc0c62344c";

     

       17
       17
       +
           sha256 = "cc183c2d7b1788cdaeb895102b1b6c2b6a3544182ff714e92f404c29db93cc9d";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [ pytest ];

+21

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       +
       , wrapGAppsHook, gobjectIntrospection, pygobject3, graphviz, gnome3 }:

     

       3
       3
       +
       

     

       4
       4
       +
       buildPythonPackage rec {

     

       5
       5
       +
         pname = "xdot";

     

       6
       6
       +
         version = "0.9";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchPypi {

     

       9
       9
       +
           inherit pname version;

     

       10
       10
       +
           sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         nativeBuildInputs = [ wrapGAppsHook ];

     

       14
       14
       +
         propagatedBuildInputs = [ gobjectIntrospection pygobject3 graphviz gnome3.gtk ];

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with lib; {

     

       17
       17
       +
           description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";

     

       18
       18
       +
           homepage = https://github.com/jrfonseca/xdot.py;

     

       19
       19
       +
           license = licenses.lgpl3Plus;

     

       20
       20
       +
         };

     

       21
       21
       +
       }

+23

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

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy3k }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "yahooweather";

     

       5
       5
       +
         version = "0.10";

     

       6
       6
       +
       

     

       7
       7
       +
         disabled = !isPy3k;

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchPypi {

     

       10
       10
       +
           inherit pname version;

     

       11
       11
       +
           sha256 = "0bsxmngkpzvqm50i2cnxjzhpbdhb8s10ly8h5q08696cjihqdkpa";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         # Tests require network access

     

       15
       15
       +
         doCheck = false;

     

       16
       16
       +
       

     

       17
       17
       +
         meta = with lib; {

     

       18
       18
       +
           description = "Provide an interface to the Yahoo! Weather RSS feed";

     

       19
       19
       +
           homepage = https://github.com/pvizeli/yahooweather;

     

       20
       20
       +
           license = licenses.bsd2;

     

       21
       21
       +
           maintainers = with maintainers; [ peterhoeg ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "zeroconf";

     

       6
       6
       -
         version = "0.19.1";

     

       6
       6
       +
         version = "0.20.0";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";

     

       11
       11
       +
           sha256 = "6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ netifaces six enum-compat ];

+2 -2

pkgs/development/tools/analysis/autoflake/default.nix

···

       3
       3
        
       with python3Packages;

     

       4
       4
        
       buildPythonApplication rec {

     

       5
       5
        
         pname = "autoflake";

     

       6
       6
       -
         version = "1.0";

     

       6
       6
       +
         version = "1.1";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "12k4v8w7awqp83j727y0iwcbjqj3ccvbai7c9m0wgbmq5xkvav8a";

     

       11
       11
       +
           sha256 = "a74d684a7a02654f74582addc24a3016c06809316cc140457a4fe93a1e6ed131";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ pyflakes ];

+24 -2

pkgs/development/tools/build-managers/meson/default.nix

···

       1
       1
       -
       { lib, python3Packages }:

     

       2
       2
       -
       python3Packages.buildPythonApplication rec {

     

       1
       1
       +
       { lib, python3Packages, stdenv, targetPlatform, writeTextDir, m4 }: let

     

       2
       2
       +
         targetPrefix = lib.optionalString stdenv.isCross

     

       3
       3
       +
                          (targetPlatform.config + "-");

     

       4
       4
       +
       in python3Packages.buildPythonApplication rec {

     

       3
       5
        
         version = "0.44.0";

     

       4
       6
        
         pname = "meson";

     

       5
       7
        
         name = "${pname}-${version}";

     
···

       32
       34
        
         '';

     

       33
       35
        
       

     

       34
       36
        
         setupHook = ./setup-hook.sh;

     

       37
       37
       +
       

     

       38
       38
       +
         crossFile = writeTextDir "cross-file.conf" ''

     

       39
       39
       +
           [binaries]

     

       40
       40
       +
           c = '${targetPrefix}cc'

     

       41
       41
       +
           cpp = '${targetPrefix}c++'

     

       42
       42
       +
           ar = '${targetPrefix}ar'

     

       43
       43
       +
           strip = '${targetPrefix}strip'

     

       44
       44
       +
           pkgconfig = 'pkg-config'

     

       45
       45
       +
       

     

       46
       46
       +
           [properties]

     

       47
       47
       +
           needs_exe_wrapper = true

     

       48
       48
       +
       

     

       49
       49
       +
           [host_machine]

     

       50
       50
       +
           system = '${targetPlatform.parsed.kernel.name}'

     

       51
       51
       +
           cpu_family = '${targetPlatform.parsed.cpu.family}'

     

       52
       52
       +
           cpu = '${targetPlatform.parsed.cpu.name}'

     

       53
       53
       +
           endian = ${if targetPlatform.isLittleEndian then "'little'" else "'big'"}

     

       54
       54
       +
         '';

     

       55
       55
       +
       

     

       56
       56
       +
         inherit (stdenv) cc isCross;

     

       35
       57
        
       

     

       36
       58
        
         meta = with lib; {

     

       37
       59
        
           homepage = http://mesonbuild.com;

+7 -3

pkgs/development/tools/build-managers/meson/setup-hook.sh

···

       6
       6
        
           fi

     

       7
       7
        
       

     

       8
       8
        
           # Build release by default.

     

       9
       9
       -
           mesonFlags="--buildtype=${mesonBuildType:-release} $mesonFlags"

     

       9
       9
       +
           if [ -n "@isCross@" ]; then

     

       10
       10
       +
             crossMesonFlags="--cross-file=@crossFile@/cross-file.conf"

     

       11
       11
       +
           fi

     

       12
       12
       +
       

     

       13
       13
       +
           mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"

     

       10
       14
        
       

     

       11
       15
        
           echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"

     

       12
       16
        
       

     

       13
       13
       -
           meson build $mesonFlags "${mesonFlagsArray[@]}"

     

       17
       17
       +
           CC=@cc@/bin/cc CXX=@cc@/bin/c++ meson build $mesonFlags "${mesonFlagsArray[@]}"

     

       14
       18
        
           cd build

     

       15
       19
        
       

     

       16
       20
        
           if ! [[ -v enableParallelBuilding ]]; then

     
···

       29
       33
        
       mesonCheckPhase() {

     

       30
       34
        
           runHook preCheck

     

       31
       35
        
       

     

       32
       32
       -
           meson test

     

       36
       36
       +
           meson test --print-errorlogs

     

       33
       37
        
       

     

       34
       38
        
           runHook postCheck

     

       35
       39
        
       }

+1 -1

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

···

       14
       14
        
         nativeBuildInputs = [ which pkgconfig perl ]

     

       15
       15
        
           # autogen needs a build autogen when cross-compiling

     

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

     

       17
       17
       -
             buildPackages.autogen buildPackages.texinfo ];

     

       17
       17
       +
             buildPackages.buildPackages.autogen buildPackages.texinfo ];

     

       18
       18
        
         buildInputs = [

     

       19
       19
        
           guile libxml2

     

       20
       20
        
         ];

+2 -2

pkgs/development/tools/misc/automake/automake-1.15.x.nix pkgs/development/tools/misc/automake/automake-1.16.x.nix

···

       1
       1
        
       { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "automake-1.15.1";

     

       4
       4
       +
         name = "automake-1.16";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://gnu/automake/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg";

     

       8
       8
       +
           sha256 = "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ autoconf perl ];

+4 -3

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

···

       1
       1
       -
       { stdenv, fetchurl, perl, libunwind }:

     

       1
       1
       +
       { stdenv, fetchurl, perl, libunwind, buildPackages }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       9
       9
        
           sha256 = "0dsw6xcfrmygidp1dj2ch8cl8icrar7789snkb2r8gh78kdqhxjw";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       12
       13
        
         nativeBuildInputs = [ perl ];

     

       13
       14
        
       

     

       14
       14
       -
         buildInputs = [ libunwind ]; # support -k

     

       15
       15
       +
         buildInputs = stdenv.lib.optional libunwind.supportsHost [ libunwind ]; # support -k

     

       15
       16
        
       

     

       16
       16
       -
         configureFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 "--enable-mpers=check";

     

       17
       17
       +
         configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";

     

       17
       18
        
       

     

       18
       19
        
         meta = with stdenv.lib; {

     

       19
       20
        
           homepage = http://strace.io/;

+2 -2

pkgs/development/tools/parsing/re2c/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "0.16";

     

       5
       5
       +
         version = "1.0.3";

     

       6
       6
        
       

     

       7
       7
        
         sourceRoot = "${src.name}/re2c";

     

       8
       8
        
       

     
···

       10
       10
        
           owner  = "skvadrik";

     

       11
       11
        
           repo   = "re2c";

     

       12
       12
        
           rev    = version;

     

       13
       13
       -
           sha256 = "0cijgmbyx34nwl2jmsswggkgvzy364871rkbxz8biq9x8xrhhjw5";

     

       13
       13
       +
           sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ autoreconfHook ];

+1 -1

pkgs/development/tools/pew/default.nix

···

       29
       29
        
             platforms = platforms.all;

     

       30
       30
        
             maintainers = with maintainers; [ berdario ];

     

       31
       31
        
           };

     

       32
       32
       -
         }
     

       32
       32
       +
         }

+2 -2

pkgs/development/tools/pipenv/default.nix

···

       2
       2
        
       with python3Packages; buildPythonApplication rec {

     

       3
       3
        
           name = "${pname}-${version}";

     

       4
       4
        
           pname = "pipenv";

     

       5
       5
       -
           version = "10.1.0";

     

       5
       5
       +
           version = "10.1.2";

     

       6
       6
        
       

     

       7
       7
        
           src = fetchPypi {

     

       8
       8
        
             inherit pname version;

     

       9
       9
       -
             sha256 = "3732350e3cd8cc033d66748c418bab4b018dc0a4fcf1687f17a103ac44eac0c6";

     

       9
       9
       +
             sha256 = "ce6dbb305fb1f262dba0dcb50c06591e4d146f7bfe079cc9f0ce3f89c7516ae9";

     

       10
       10
        
           };

     

       11
       11
        
       

     

       12
       12
        
           LC_ALL = "en_US.UTF-8";

+2 -2

pkgs/development/tools/vcstool/default.nix

···

       6
       6
        
       buildPythonApplication rec {

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
         pname = "vcstool";

     

       9
       9
       -
         version = "0.1.31";

     

       9
       9
       +
         version = "0.1.33";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "0n2zkvy2km9ky9lljf1mq5nqyqi5qqzfy2a6sgkjg2grvsk7abxc";

     

       13
       13
       +
           sha256 = "1140d3ecafb2c42c2c1a309950c7f327b09b548c00fbf6e37c8f44b8a610dfbc";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ pyyaml ];

+5 -7

pkgs/development/tools/yq/default.nix

···

       1
       1
       -
       { stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, jq }:

     

       1
       1
       +
       { stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonApplication rec {

     

       4
       4
       -
       

     

       5
       4
        
         pname = "yq";

     

       6
       6
       -
         version = "2.3.4";

     

       5
       5
       +
         version = "2.4.1";

     

       7
       6
        
       

     

       8
       8
       -
         propagatedBuildInputs = [ pyyaml jq ];

     

       7
       7
       +
         propagatedBuildInputs = [ pyyaml xmltodict jq ];

     

       9
       8
        
       

     

       10
       9
        
         # ValueError: underlying buffer has been detached

     

       11
       10
        
         doCheck = false;

     

       12
       11
        
       

     

       13
       12
        
         src = fetchPypi {

     

       14
       13
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "04ckrlmin8m176iicyfhddp4r0yry5hx306vhfglf8mcp1jkga78";

     

       14
       14
       +
           sha256 = "4833d4055b0f1c1f1a2fd292421b3472da39c7dc2727d7819efd11065a5fd310";

     

       16
       15
        
         };

     

       17
       16
        
       

     

       18
       17
        
         meta = with lib; {

     

       19
       18
        
           description = "Command-line YAML processor - jq wrapper for YAML documents.";

     

       20
       20
       -
           homepage = https://pypi.python.org/pypi/yq;

     

       19
       19
       +
           homepage = https://github.com/kislyuk/yq;

     

       21
       20
        
           license = [ licenses.asl20 ];

     

       22
       21
        
           maintainers = [ maintainers.womfoo ];

     

       23
       22
        
         };

     

       24
       24
       -
       

     

       25
       23
        
       }

+13

pkgs/misc/cups/cups-clean-dirty.patch

···

       1
       1
       +
       diff --git a/scheduler/main.c b/scheduler/main.c

     

       2
       2
       +
       index 8925c8373..acf031684 100644

     

       3
       3
       +
       --- a/scheduler/main.c

     

       4
       4
       +
       +++ b/scheduler/main.c

     

       5
       5
       +
       @@ -893,7 +893,7 @@ main(int  argc,				/* I - Number of command-line args */

     

       6
       6
       +
            * Write dirty config/state files...

     

       7
       7
       +
            */

     

       8
       8
       +
        

     

       9
       9
       +
       -    if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0)

     

       10
       10
       +
       +    if (DirtyCleanTime && current_time >= DirtyCleanTime)

     

       11
       11
       +
              cupsdCleanDirty();

     

       12
       12
       +
        

     

       13
       13
       +
        #ifdef __APPLE__

+1 -1

pkgs/misc/cups/default.nix

···

       25
       25
        
             url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups";

     

       26
       26
        
             sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5";

     

       27
       27
        
           })

     

       28
       28
       +
           ./cups-clean-dirty.patch

     

       28
       29
        
         ];

     

       29
       30
        
       

     

       30
       31
        
         nativeBuildInputs = [ pkgconfig removeReferencesTo ];

     
···

       40
       41
        
         configureFlags = [

     

       41
       42
        
           "--localstatedir=/var"

     

       42
       43
        
           "--sysconfdir=/etc"

     

       43
       43
       -
           "--with-rundir=/run"

     

       44
       44
        
           "--enable-raw-printing"

     

       45
       45
        
           "--enable-threads"

     

       46
       46
        
         ] ++ optionals stdenv.isLinux [

+9 -6

pkgs/os-specific/linux/apparmor/default.nix

···

       8
       8
        
       , swig

     

       9
       9
        
       , ncurses

     

       10
       10
        
       , pam

     

       11
       11
       +
       , buildPackages

     

       11
       12
        
       }:

     

       12
       13
        
       

     

       13
       14
        
       let

     
···

       29
       30
        
         };

     

       30
       31
        
       

     

       31
       32
        
         prePatchCommon = ''

     

       32
       32
       -
           substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"

     

       33
       33
       -
           substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"

     

       33
       33
       +
           substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man"

     

       34
       34
       +
           substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html"

     

       34
       35
        
           substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"

     

       35
       36
        
           substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"

     

       36
       37
        
         '';

     
···

       70
       71
        
             swig

     

       71
       72
        
             ncurses

     

       72
       73
        
             which

     

       74
       74
       +
             perl

     

       73
       75
        
           ];

     

       74
       76
        
       

     

       75
       75
       -
           buildInputs = [

     

       77
       77
       +
           buildInputs = stdenv.lib.optionals (!stdenv.isCross) [

     

       76
       78
        
             perl

     

       77
       79
        
             python

     

       78
       80
        
           ];

     
···

       87
       89
        
           inherit patches;

     

       88
       90
        
       

     

       89
       91
        
           postPatch = "cd ./libraries/libapparmor";

     

       90
       90
       -
           configureFlags = "--with-python --with-perl";

     

       92
       92
       +
           # https://gitlab.com/apparmor/apparmor/issues/1

     

       93
       93
       +
           configureFlags = stdenv.lib.optionalString (!stdenv.isCross) "--with-python --with-perl";

     

       91
       94
        
       

     

       92
       92
       -
           outputs = [ "out" "python" ];

     

       95
       95
       +
           outputs = if stdenv.isCross then [ "out" ] else [ "out" "python" ];

     

       93
       96
        
       

     

       94
       94
       -
           postInstall = ''

     

       97
       97
       +
           postInstall = stdenv.lib.optionalString (!stdenv.isCross) ''

     

       95
       98
        
             mkdir -p $python/lib

     

       96
       99
        
             mv $out/lib/python* $python/lib/

     

       97
       100
        
           '';

+4 -2

pkgs/os-specific/linux/fuse/common.nix

···

       4
       4
        
       , fusePackages, utillinux, gettext

     

       5
       5
        
       , autoconf, automake, libtool

     

       6
       6
        
       , meson, ninja, pkgconfig

     

       7
       7
       +
       , autoreconfHook

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       10
        
       let

     
···

       17
       18
        
           rev = name;

     

       18
       19
        
           sha256 = sha256Hash;

     

       19
       20
        
         };

     

       21
       21
       +
       

     

       22
       22
       +
         preAutoreconf = "touch config.rpath";

     

       20
       23
        
       

     

       21
       24
        
         patches =

     

       22
       25
        
           stdenv.lib.optional

     
···

       30
       33
        
       

     

       31
       34
        
         nativeBuildInputs = if isFuse3

     

       32
       35
        
           then [ meson ninja pkgconfig ]

     

       33
       33
       -
           else [ autoconf automake libtool ];

     

       34
       34
       -
         buildInputs = stdenv.lib.optional (!isFuse3) gettext;

     

       36
       36
       +
           else [ autoreconfHook gettext ];

     

       35
       37
        
       

     

       36
       38
        
         outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";

     

       37
       39

+8 -3

pkgs/os-specific/linux/iputils/default.nix

···

       24
       24
        
         # Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111

     

       25
       25
        
         makeFlags = [ "USE_GNUTLS=no" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "USE_IDN=no";

     

       26
       26
        
       

     

       27
       27
       +
         depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ];

     

       27
       28
        
         buildInputs = [

     

       28
       28
       -
           libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt nettle

     

       29
       29
       +
           libsysfs openssl libcap libgcrypt nettle

     

       29
       30
        
         ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn;

     

       30
       31
        
       

     

       31
       31
       -
         buildFlags = "man all ninfod";

     

       32
       32
       +
         # ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure...

     

       33
       33
       +
         buildFlags = "man all" + stdenv.lib.optionalString (!stdenv.isCross) " ninfod";

     

       32
       34
        
       

     

       33
       35
        
         installPhase =

     

       34
       36
        
           ''

     

       35
       37
        
             mkdir -p $out/bin

     

       36
       36
       -
             cp -p ping tracepath clockdiff arping rdisc ninfod/ninfod $out/bin/

     

       38
       38
       +
             cp -p ping tracepath clockdiff arping rdisc $out/bin/

     

       39
       39
       +
             if [ -x ninfod/ninfod ]; then

     

       40
       40
       +
               cp -p ninfod/ninfod $out/bin

     

       41
       41
       +
             fi

     

       37
       42
        
       

     

       38
       43
        
             mkdir -p $out/share/man/man8

     

       39
       44
        
             cp -p \

-8

pkgs/os-specific/linux/kernel-headers/default.nix

···

       39
       39
        
             echo "${version}-default" > $out/include/config/kernel.release

     

       40
       40
        
           '';

     

       41
       41
        
       

     

       42
       42
       -
           # !!! hacky

     

       43
       43
       -
           fixupPhase = ''

     

       44
       44
       -
             ln -s asm $out/include/asm-$platform

     

       45
       45
       -
             if test "$platform" = "i386" -o "$platform" = "x86_64"; then

     

       46
       46
       -
               ln -s asm $out/include/asm-x86

     

       47
       47
       -
             fi

     

       48
       48
       -
           '';

     

       49
       49
       -
       

     

       50
       42
        
           meta = with lib; {

     

       51
       43
        
             description = "Header files and scripts for Linux kernel";

     

       52
       44
        
             license = licenses.gpl2;

+6 -1

pkgs/os-specific/linux/libaio/default.nix

···

       1
       1
       -
       { stdenv, fetchurl }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "0.3.110";

     
···

       8
       8
        
           url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz";

     

       9
       9
        
           sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0";

     

       10
       10
        
         };

     

       11
       11
       +
       

     

       12
       12
       +
         patches = [ (fetchpatch {

     

       13
       13
       +
           url = https://pagure.io/libaio/c/da47c32b2ff39e52fbed1622c34b86bc88d7c217.patch;

     

       14
       14
       +
           sha256 = "1kqpiswjn549s3w3m89bw5qkl7bw5pvq6gp5cdzd926ymlgivj5c";

     

       15
       15
       +
         }) ];

     

       11
       16
        
       

     

       12
       17
        
         makeFlags = "prefix=$(out)";

     

       13
       18

+14 -5

pkgs/os-specific/linux/systemd/default.nix

···

       9
       9
        
       , patchelf

     

       10
       10
        
       , getent

     

       11
       11
        
       , hostPlatform

     

       12
       12
       +
       , buildPackages

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       assert stdenv.isLinux;

     

       15
       16
        
       

     

       16
       17
        
       let

     

       17
       17
       -
         pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);

     

       18
       18
       +
         pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);

     

       18
       19
        
       

     

       19
       20
        
       in stdenv.mkDerivation rec {

     

       20
       21
        
         version = "237";

     
···

       33
       34
        
           [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45

     

       34
       35
        
             ninja meson

     

       35
       36
        
             coreutils # meson calls date, stat etc.

     

       36
       36
       -
             pythonLxmlEnv glibcLocales

     

       37
       37
       -
             patchelf getent

     

       37
       37
       +
             glibcLocales

     

       38
       38
       +
             patchelf getent m4

     

       38
       39
        
           ];

     

       39
       40
        
         buildInputs =

     

       40
       41
        
           [ linuxHeaders libcap kmod xz pam acl

     

       41
       41
       -
             /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2

     

       42
       42
       +
             /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2

     

       42
       43
        
             libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor

     

       43
       44
        
             iptables gnu-efi

     

       45
       45
       +
             # This is actually native, but we already pull it from buildPackages

     

       46
       46
       +
             pythonLxmlEnv

     

       44
       47
        
           ];

     

       45
       48
        
       

     

       46
       49
        
         #dontAddPrefix = true;

     
···

       77
       80
        
       

     

       78
       81
        
           "-Dsysvinit-path="

     

       79
       82
        
           "-Dsysvrcnd-path="

     

       83
       83
       +
       

     

       84
       84
       +
           "-Dkill-path=${coreutils}/bin/kill"

     

       85
       85
       +
           "-Dkmod-path=${kmod}/bin/kmod"

     

       86
       86
       +
           "-Dsulogin-path=${utillinux}/bin/sulogin"

     

       87
       87
       +
           "-Dmount-path=${utillinux}/bin/mount"

     

       88
       88
       +
           "-Dumount-path=${utillinux}/bin/umount"

     

       80
       89
        
         ];

     

       81
       90
        
       

     

       82
       91
        
         preConfigure = ''

     
···

       124
       133
        
       

     

       125
       134
        
           for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do

     

       126
       135
        
             substituteInPlace $i \

     

       127
       127
       -
               --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python"

     

       136
       136
       +
               --replace "#!/usr/bin/env python" "#!${buildPackages.python3Packages.python}/bin/python"

     

       128
       137
        
           done

     

       129
       138
        
       

     

       130
       139
        
           substituteInPlace src/journal/catalog.c \

+2 -1

pkgs/os-specific/linux/util-linux/default.nix

···

       30
       30
        
       

     

       31
       31
        
         crossAttrs = {

     

       32
       32
        
           # Work around use of `AC_RUN_IFELSE'.

     

       33
       33
       -
           preConfigure = "export scanf_cv_type_modifier=ms";

     

       33
       33
       +
           preConfigure = "export scanf_cv_type_modifier=ms" + lib.optionalString (systemd != null)

     

       34
       34
       +
             "\nconfigureFlags+=\" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/\"";

     

       34
       35
        
         };

     

       35
       36
        
       

     

       36
       37
        
         preConfigure = lib.optionalString (systemd != null) ''

+9 -1

pkgs/servers/dns/bind/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2

     

       2
       2
       -
       , enableSeccomp ? false, libseccomp ? null }:

     

       2
       2
       +
       , enableSeccomp ? false, libseccomp ? null, buildPackages

     

       3
       3
       +
       }:

     

       3
       4
        
       

     

       4
       5
        
       assert enableSeccomp -> libseccomp != null;

     

       5
       6
        
       

     
···

       24
       25
        
       

     

       25
       26
        
         STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase

     

       26
       27
        
       

     

       28
       28
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       29
       29
       +
       

     

       27
       30
        
         configureFlags = [

     

       28
       31
        
           "--localstatedir=/var"

     

       29
       32
        
           "--with-libtool"

     
···

       39
       42
        
           "--without-pkcs11"

     

       40
       43
        
           "--without-purify"

     

       41
       44
        
           "--without-python"

     

       45
       45
       +
           "--with-randomdev=/dev/random"

     

       46
       46
       +
           "--with-ecdsa"

     

       47
       47
       +
           "--with-gost"

     

       48
       48
       +
           "--without-eddsa"

     

       49
       49
       +
           "--with-aes"

     

       42
       50
        
         ] ++ lib.optional enableSeccomp "--enable-seccomp";

     

       43
       51
        
       

     

       44
       52
        
         postInstall = ''

+62

pkgs/servers/home-assistant/appdaemon.nix

···

       1
       1
       +
       { lib, python3, fetchpatch }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         python = python3.override {

     

       5
       5
       +
           packageOverrides = self: super: {

     

       6
       6
       +
       

     

       7
       7
       +
             aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {

     

       8
       8
       +
               version = "2.3.10";

     

       9
       9
       +
               src = oldAttrs.src.override {

     

       10
       10
       +
                 inherit version;

     

       11
       11
       +
                 sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";

     

       12
       12
       +
               };

     

       13
       13
       +
             });

     

       14
       14
       +
       

     

       15
       15
       +
             yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {

     

       16
       16
       +
               version = "1.1.0";

     

       17
       17
       +
               src = oldAttrs.src.override {

     

       18
       18
       +
                 inherit version;

     

       19
       19
       +
                 sha256 = "6af895b45bd49254cc309ac0fe6e1595636a024953d710e01114257736184698";

     

       20
       20
       +
               };

     

       21
       21
       +
             });

     

       22
       22
       +
       

     

       23
       23
       +
             aiohttp-jinja2 = super.aiohttp-jinja2.overridePythonAttrs (oldAttrs: rec {

     

       24
       24
       +
               version = "0.15.0";

     

       25
       25
       +
               src = oldAttrs.src.override {

     

       26
       26
       +
                 inherit version;

     

       27
       27
       +
                 sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83";

     

       28
       28
       +
               };

     

       29
       29
       +
             });

     

       30
       30
       +
       

     

       31
       31
       +
           };

     

       32
       32
       +
         };

     

       33
       33
       +
       

     

       34
       34
       +
       in python.pkgs.buildPythonApplication rec {

     

       35
       35
       +
         pname = "appdaemon";

     

       36
       36
       +
         version = "3.0.0b4";

     

       37
       37
       +
       

     

       38
       38
       +
         src = python.pkgs.fetchPypi {

     

       39
       39
       +
           inherit pname version;

     

       40
       40
       +
           sha256 = "0dfc37ecd8e1344001d4970d32813c581aba1385cf3b82c69f8b7df2eca6c019";

     

       41
       41
       +
         };

     

       42
       42
       +
       

     

       43
       43
       +
         patches = fetchpatch {

     

       44
       44
       +
           url = "${meta.homepage}/pull/252.patch";

     

       45
       45
       +
           sha256 = "164qvgdibd2645yxm4n16bhnan13wrchfi70jp2ff806fwdg9mg0";

     

       46
       46
       +
         };

     

       47
       47
       +
       

     

       48
       48
       +
         propagatedBuildInputs = with python.pkgs; [

     

       49
       49
       +
           aiohttp aiohttp-jinja2 astral bcrypt daemonize feedparser iso8601

     

       50
       50
       +
           jinja2 pyyaml requests sseclient voluptuous websocket_client yarl

     

       51
       51
       +
         ];

     

       52
       52
       +
       

     

       53
       53
       +
         # no tests implemented

     

       54
       54
       +
         doCheck = false;

     

       55
       55
       +
       

     

       56
       56
       +
         meta = with lib; {

     

       57
       57
       +
           description = "Sandboxed python execution environment for writing automation apps for Home Assistant";

     

       58
       58
       +
           homepage = https://github.com/home-assistant/appdaemon;

     

       59
       59
       +
           license = licenses.mit;

     

       60
       60
       +
           maintainers = with maintainers; [ peterhoeg dotlambda ];

     

       61
       61
       +
         };

     

       62
       62
       +
       }

+7 -7

pkgs/servers/home-assistant/component-packages.nix

···

       99
       99
        
           "envisalink" = ps: with ps; [  ];

     

       100
       100
        
           "fan.xiaomi_miio" = ps: with ps; [  ];

     

       101
       101
        
           "feedreader" = ps: with ps; [ feedparser ];

     

       102
       102
       -
           "ffmpeg" = ps: with ps; [  ];

     

       103
       103
       -
           "frontend" = ps: with ps; [  ];

     

       102
       102
       +
           "ffmpeg" = ps: with ps; [ ha-ffmpeg ];

     

       103
       103
       +
           "frontend" = ps: with ps; [ user-agents ];

     

       104
       104
        
           "gc100" = ps: with ps; [  ];

     

       105
       105
        
           "goalfeed" = ps: with ps; [  ];

     

       106
       106
        
           "google" = ps: with ps; [ google_api_python_client oauth2client ];

     
···

       280
       280
        
           "sensor.crimereports" = ps: with ps; [  ];

     

       281
       281
        
           "sensor.cups" = ps: with ps; [  ];

     

       282
       282
        
           "sensor.darksky" = ps: with ps; [  ];

     

       283
       283
       -
           "sensor.deluge" = ps: with ps; [  ];

     

       283
       283
       +
           "sensor.deluge" = ps: with ps; [ deluge-client ];

     

       284
       284
        
           "sensor.deutsche_bahn" = ps: with ps; [  ];

     

       285
       285
        
           "sensor.dht" = ps: with ps; [  ];

     

       286
       286
        
           "sensor.discogs" = ps: with ps; [ discogs_client ];

     
···

       376
       376
        
           "sensor.xbox_live" = ps: with ps; [  ];

     

       377
       377
        
           "sensor.yahoo_finance" = ps: with ps; [  ];

     

       378
       378
        
           "sensor.yr" = ps: with ps; [ xmltodict ];

     

       379
       379
       -
           "sensor.yweather" = ps: with ps; [  ];

     

       379
       379
       +
           "sensor.yweather" = ps: with ps; [ yahooweather ];

     

       380
       380
        
           "sensor.zestimate" = ps: with ps; [ xmltodict ];

     

       381
       381
        
           "shiftr" = ps: with ps; [ paho-mqtt ];

     

       382
       382
        
           "skybell" = ps: with ps; [  ];

     
···

       387
       387
        
           "switch.acer_projector" = ps: with ps; [ pyserial ];

     

       388
       388
        
           "switch.anel_pwrctrl" = ps: with ps; [  ];

     

       389
       389
        
           "switch.broadlink" = ps: with ps; [  ];

     

       390
       390
       -
           "switch.deluge" = ps: with ps; [  ];

     

       390
       390
       +
           "switch.deluge" = ps: with ps; [ deluge-client ];

     

       391
       391
        
           "switch.digitalloggers" = ps: with ps; [  ];

     

       392
       392
        
           "switch.dlink" = ps: with ps; [  ];

     

       393
       393
        
           "switch.edimax" = ps: with ps; [  ];

     
···

       423
       423
        
           "twilio" = ps: with ps; [ twilio ];

     

       424
       424
        
           "upcloud" = ps: with ps; [  ];

     

       425
       425
        
           "updater" = ps: with ps; [ distro ];

     

       426
       426
       -
           "upnp" = ps: with ps; [  ];

     

       426
       426
       +
           "upnp" = ps: with ps; [ miniupnpc ];

     

       427
       427
        
           "usps" = ps: with ps; [  ];

     

       428
       428
        
           "vacuum.roomba" = ps: with ps; [  ];

     

       429
       429
        
           "vacuum.xiaomi_miio" = ps: with ps; [  ];

     
···

       439
       439
        
           "weather.darksky" = ps: with ps; [  ];

     

       440
       440
        
           "weather.metoffice" = ps: with ps; [  ];

     

       441
       441
        
           "weather.openweathermap" = ps: with ps; [  ];

     

       442
       442
       -
           "weather.yweather" = ps: with ps; [  ];

     

       442
       442
       +
           "weather.yweather" = ps: with ps; [ yahooweather ];

     

       443
       443
        
           "wemo" = ps: with ps; [  ];

     

       444
       444
        
           "wink" = ps: with ps; [  ];

     

       445
       445
        
           "xiaomi_aqara" = ps: with ps; [  ];

+7

pkgs/servers/home-assistant/default.nix

···

       28
       28
        
                 sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918";

     

       29
       29
        
               };

     

       30
       30
        
             });

     

       31
       31
       +
             astral = super.astral.overridePythonAttrs (oldAttrs: rec {

     

       32
       32
       +
               version = "1.5";

     

       33
       33
       +
               src = oldAttrs.src.override {

     

       34
       34
       +
                 inherit version;

     

       35
       35
       +
                 sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6";

     

       36
       36
       +
               };

     

       37
       37
       +
             });

     

       31
       38
        
             hass-frontend = super.callPackage ./frontend.nix { };

     

       32
       39
        
           };

     

       33
       40
        
         };

+10 -6

pkgs/servers/http/nginx/modules.nix

···

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         brotli = {

     

       5
       5
       -
           src = fetchFromGitHub {

     

       6
       6
       -
             owner = "google";

     

       5
       5
       +
           src = let gitsrc = pkgs.fetchFromGitHub {

     

       6
       6
       +
             owner = "eustas";

     

       7
       7
        
             repo = "ngx_brotli";

     

       8
       8
       -
             rev = "bfd2885b2da4d763fed18f49216bb935223cd34b";

     

       9
       9
       -
             sha256 = "04yx1n0wi3l2x37jd1ynl9951qxkn8xp42yv0mfp1qz9svips81n";

     

       10
       10
       -
             fetchSubmodules = true;

     

       11
       11
       -
           };

     

       8
       8
       +
             rev = "8cd9dd5fc232d3a01644584921e52dae99034779";

     

       9
       9
       +
             sha256 = "0ap1kf51hzb8yvvxjkcj9hnmsmmd5drcay64hd4n7vybf9dqw6g6";

     

       10
       10
       +
           }; in pkgs.runCommandNoCC "ngx_brotli-src" {} ''

     

       11
       11
       +
             cp -a ${gitsrc} $out

     

       12
       12
       +
             substituteInPlace $out/config \

     

       13
       13
       +
               --replace /usr/local ${lib.getDev pkgs.brotli}

     

       14
       14
       +
           '';

     

       15
       15
       +
           inputs = [ pkgs.brotli ];

     

       12
       16
        
         };

     

       13
       17
        
       

     

       14
       18
        
         rtmp ={

+10 -10

pkgs/servers/sql/postgresql/default.nix

···

       93
       93
        
       in {

     

       94
       94
        
       

     

       95
       95
        
         postgresql93 = common {

     

       96
       96
       -
           version = "9.3.20";

     

       96
       96
       +
           version = "9.3.21";

     

       97
       97
        
           psqlSchema = "9.3";

     

       98
       98
       -
           sha256 = "1jp6lac4b0q6hb28yrdsl0ymzn75gg59hvp5zasarf3mf3b8l4zb";

     

       98
       98
       +
           sha256 = "1q2038rvqa00rpk8sjbnwb19x64fcyjphw9x087432hq918vrfmr";

     

       99
       99
        
         };

     

       100
       100
        
       

     

       101
       101
        
         postgresql94 = common {

     

       102
       102
       -
           version = "9.4.15";

     

       102
       102
       +
           version = "9.4.16";

     

       103
       103
        
           psqlSchema = "9.4";

     

       104
       104
       -
           sha256 = "1i5c67gg4fj38hk07h6w6m4mqak84bhnblqsjbpiamg4x33v7gqj";

     

       104
       104
       +
           sha256 = "10ay2cy3m4g66jwvxknc0f0w6mv2v7vm0dzkq92s9n7446v65g6w";

     

       105
       105
        
         };

     

       106
       106
        
       

     

       107
       107
        
         postgresql95 = common {

     

       108
       108
       -
           version = "9.5.10";

     

       108
       108
       +
           version = "9.5.11";

     

       109
       109
        
           psqlSchema = "9.5";

     

       110
       110
       -
           sha256 = "10gjfn16bhzkmlqfsn384w49db0j39bg3n4majwxdpjd17g7lpcl";

     

       110
       110
       +
           sha256 = "1pf8fwx8a6vn344b80a1bf2p4hjg06sh69kb2qwswxbsw9scv0l1";

     

       111
       111
        
         };

     

       112
       112
        
       

     

       113
       113
        
         postgresql96 = common {

     

       114
       114
       -
           version = "9.6.6";

     

       114
       114
       +
           version = "9.6.7";

     

       115
       115
        
           psqlSchema = "9.6";

     

       116
       116
       -
           sha256 = "0m417h30s18rwa7yzkqqcdb22ifpcda2fpg2cyx8bxvjp3ydz71r";

     

       116
       116
       +
           sha256 = "1ii4lrw8sncnz5g0fss1011shjhmbajzzhxx4f0bgsniq7rkvgif";

     

       117
       117
        
         };

     

       118
       118
        
       

     

       119
       119
        
         postgresql100 = common {

     

       120
       120
       -
           version = "10.1";

     

       120
       120
       +
           version = "10.2";

     

       121
       121
        
           psqlSchema = "10.0";

     

       122
       122
       -
           sha256 = "04z7lm4h94625vbncwv98svycqr942n3q47ailqaczkszqjlxjrw";

     

       122
       122
       +
           sha256 = "1bav2iyi93h866skrrlqlvsp4sfv1sfww1s305zpzffxcadh0cpy";

     

       123
       123
        
         };

     

       124
       124
        
       

     

       125
       125
        
       }

+1 -3

pkgs/shells/bash/4.4.nix

···

       36
       36
        
       

     

       37
       37
        
         hardeningDisable = [ "format" ];

     

       38
       38
        
       

     

       39
       39
       -
         outputs = [ "out" "dev" "doc" "info" ]

     

       40
       40
       -
           # the man pages are small and useful enough, so include them in $out in interactive builds

     

       41
       41
       -
           ++ stdenv.lib.optional (!interactive) "man";

     

       39
       39
       +
         outputs = [ "out" "dev" "man" "doc" "info" ];

     

       42
       40
        
       

     

       43
       41
        
         NIX_CFLAGS_COMPILE = ''

     

       44
       42
        
           -DSYS_BASHRC="/etc/bashrc"

+7

pkgs/shells/bash/bash-4.4-patches.nix

···

       13
       13
        
       (patch "010" "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4")

     

       14
       14
        
       (patch "011" "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx")

     

       15
       15
        
       (patch "012" "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps")

     

       16
       16
       +
       (patch "013" "1djkx0w9v62q78gz3jsvamj1jq53i6hbfrfhhsw86ihwpjnfy98v")

     

       17
       17
       +
       (patch "014" "0z5ikcq9zyxw79d0z36r5p0mspnb5piavbv03jmlan1wnknmrxx7")

     

       18
       18
       +
       (patch "015" "09n307fi1j257abhm295k6ksmnzw47ka2zhnr0i5lbdnpvn04xnk")

     

       19
       19
       +
       (patch "016" "1cgi1y6mifm8hsgv4avj5ih76535js3qba1sqwbfvp7si76927sh")

     

       20
       20
       +
       (patch "017" "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp")

     

       21
       21
       +
       (patch "018" "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v")

     

       22
       22
       +
       (patch "019" "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7")

     

       16
       23
        
       ]

-11

pkgs/stdenv/adapters.nix

···

       75
       75
        
         in stdenv // {

     

       76
       76
        
           mkDerivation =

     

       77
       77
        
             { nativeBuildInputs ? []

     

       78
       78
       -
             , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false

     

       79
       78
        
             , ...

     

       80
       79
        
             } @ args:

     

       81
       80
        
       

     

       82
       82
       -
             let

     

       83
       83
       -
               # *BuildInputs exists temporarily as another name for

     

       84
       84
       -
               # *HostInputs.

     

       85
       85
       -
       

     

       86
       86
       -
               # The base stdenv already knows that nativeBuildInputs and

     

       87
       87
       -
               # buildInputs should be built with the usual gcc-wrapper

     

       88
       88
       -
               # And the same for propagatedBuildInputs.

     

       89
       89
       -
               nativeDrv = stdenv.mkDerivation args;

     

       90
       90
       -
             in

     

       91
       81
        
               stdenv.mkDerivation (args // {

     

       92
       82
        
                 nativeBuildInputs = nativeBuildInputs

     

       93
       93
       -
                   ++ stdenv.lib.optional selfNativeBuildInput nativeDrv

     

       94
       83
        
                     # without proper `file` command, libtool sometimes fails

     

       95
       84
        
                     # to recognize 64-bit DLLs

     

       96
       85
        
                   ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file

+14 -11

pkgs/stdenv/darwin/default.nix

···

       61
       61
        
                                 libcxx,

     

       62
       62
        
                                 allowedRequisites ? null}:

     

       63
       63
        
           let

     

       64
       64
       +
             name = "bootstrap-stage${toString step}";

     

       65
       65
       +
       

     

       64
       66
        
             buildPackages = lib.optionalAttrs (last ? stdenv) {

     

       65
       67
        
               inherit (last) stdenv;

     

       66
       68
        
             };

     

       67
       69
        
       

     

       68
       68
       -
             coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; };

     

       69
       69
       -
             gnugrep   = { name = "gnugrep-9.9.9";   outPath = bootstrapTools; };

     

       70
       70
       +
             coreutils = { name = "${name}-coreutils"; outPath = bootstrapTools; };

     

       71
       71
       +
             gnugrep   = { name = "${name}-gnugrep";   outPath = bootstrapTools; };

     

       70
       72
        
       

     

       71
       73
        
             bintools = import ../../build-support/bintools-wrapper {

     

       72
       74
        
               inherit shell;

     
···

       76
       78
        
               nativeLibc   = false;

     

       77
       79
        
               inherit buildPackages coreutils gnugrep;

     

       78
       80
        
               libc         = last.pkgs.darwin.Libsystem;

     

       79
       79
       -
               bintools     = { name = "binutils-9.9.9";  outPath = bootstrapTools; };

     

       81
       81
       +
               bintools     = { name = "${name}-binutils"; outPath = bootstrapTools; };

     

       80
       82
        
             };

     

       81
       83
        
       

     

       82
       84
        
             cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {

     
···

       86
       88
        
               extraPackages = lib.optional (libcxx != null) libcxx;

     

       87
       89
        
       

     

       88
       90
        
               nativeTools  = false;

     

       91
       91
       +
               propagateDoc = false;

     

       89
       92
        
               nativeLibc   = false;

     

       90
       93
        
               inherit buildPackages coreutils gnugrep bintools;

     

       91
       94
        
               libc         = last.pkgs.darwin.Libsystem;

     

       92
       95
        
               isClang      = true;

     

       93
       93
       -
               cc           = { name = "clang-9.9.9";     outPath = bootstrapTools; };

     

       96
       96
       +
               cc           = { name = "${name}-clang"; outPath = bootstrapTools; };

     

       94
       97
        
             };

     

       95
       98
        
       

     

       96
       99
        
             thisStdenv = import ../generic {

     

       100
       100
       +
               name = "${name}-stdenv-darwin";

     

       101
       101
       +
       

     

       97
       102
        
               inherit config shell extraNativeBuildInputs extraBuildInputs;

     

       98
       103
        
               allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [

     

       99
       104
        
                 cc.expand-response-params cc.bintools

     

       100
       105
        
               ];

     

       101
       101
       -
       

     

       102
       102
       -
               name = "stdenv-darwin-boot-${toString step}";

     

       103
       106
        
       

     

       104
       107
        
               buildPlatform = localSystem;

     

       105
       108
        
               hostPlatform = localSystem;

     
···

       146
       149
        
           overrides = self: super: with stage0; rec {

     

       147
       150
        
             darwin = super.darwin // {

     

       148
       151
        
               Libsystem = stdenv.mkDerivation {

     

       149
       149
       -
                 name = "bootstrap-Libsystem";

     

       152
       152
       +
                 name = "bootstrap-stage0-Libsystem";

     

       150
       153
        
                 buildCommand = ''

     

       151
       154
        
                   mkdir -p $out

     

       152
       155
        
                   ln -s ${bootstrapTools}/lib $out/lib

     
···

       157
       160
        
             };

     

       158
       161
        
       

     

       159
       162
        
             libcxx = stdenv.mkDerivation {

     

       160
       160
       -
               name = "bootstrap-libcxx";

     

       163
       163
       +
               name = "bootstrap-stage0-libcxx";

     

       161
       164
        
               phases = [ "installPhase" "fixupPhase" ];

     

       162
       165
        
               installPhase = ''

     

       163
       166
        
                 mkdir -p $out/lib $out/include

     
···

       169
       172
        
             };

     

       170
       173
        
       

     

       171
       174
        
             libcxxabi = stdenv.mkDerivation {

     

       172
       172
       -
               name = "bootstrap-libcxxabi";

     

       175
       175
       +
               name = "bootstrap-stage0-libcxxabi";

     

       173
       176
        
               buildCommand = ''

     

       174
       177
        
                 mkdir -p $out/lib

     

       175
       178
        
                 ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib

     
···

       325
       328
        
             inherit binutils binutils-raw;

     

       326
       329
        
           };

     

       327
       330
        
         in import ../generic rec {

     

       331
       331
       +
           name = "stdenv-darwin";

     

       332
       332
       +
       

     

       328
       333
        
           inherit config;

     

       329
       334
        
           inherit (pkgs.stdenv) fetchurlBoot;

     

       330
       330
       -
       

     

       331
       331
       -
           name = "stdenv-darwin";

     

       332
       335
        
       

     

       333
       336
        
           buildPlatform = localSystem;

     

       334
       337
        
           hostPlatform = localSystem;

+12 -10

pkgs/stdenv/linux/default.nix

···

       66
       66
        
           let

     

       67
       67
        
       

     

       68
       68
        
             thisStdenv = import ../generic {

     

       69
       69
       -
               name = "stdenv-linux-boot";

     

       69
       69
       +
               name = "${name}-stdenv-linux";

     

       70
       70
        
               buildPlatform = localSystem;

     

       71
       71
        
               hostPlatform = localSystem;

     

       72
       72
        
               targetPlatform = localSystem;

     
···

       88
       88
        
               cc = if isNull prevStage.gcc-unwrapped

     

       89
       89
        
                    then null

     

       90
       90
        
                    else lib.makeOverridable (import ../../build-support/cc-wrapper) {

     

       91
       91
       +
                 name = "${name}-gcc-wrapper";

     

       91
       92
        
                 nativeTools = false;

     

       93
       93
       +
                 propagateDoc = false;

     

       92
       94
        
                 nativeLibc = false;

     

       93
       95
        
                 buildPackages = lib.optionalAttrs (prevStage ? stdenv) {

     

       94
       96
        
                   inherit (prevStage) stdenv;

     
···

       98
       100
        
                 isGNU = true;

     

       99
       101
        
                 libc = getLibc prevStage;

     

       100
       102
        
                 inherit (prevStage) coreutils gnugrep;

     

       101
       101
       -
                 name = name;

     

       102
       103
        
                 stdenvNoCC = prevStage.ccWrapperStdenv;

     

       103
       104
        
               };

     

       104
       105
        
       

     
···

       138
       139
        
         # Build a dummy stdenv with no GCC or working fetchurl.  This is

     

       139
       140
        
         # because we need a stdenv to build the GCC wrapper and fetchurl.

     

       140
       141
        
         (prevStage: stageFun prevStage {

     

       141
       141
       -
           name = null;

     

       142
       142
       +
           name = "bootstrap-stage0";

     

       142
       143
        
       

     

       143
       144
        
           overrides = self: super: {

     

       144
       145
        
             # We thread stage0's stdenv through under this name so downstream stages

     
···

       152
       153
        
             # create a dummy Glibc here, which will be used in the stdenv of

     

       153
       154
        
             # stage1.

     

       154
       155
        
             ${localSystem.libc} = self.stdenv.mkDerivation {

     

       155
       155
       -
               name = "bootstrap-${localSystem.libc}";

     

       156
       156
       +
               name = "bootstrap-stage0-${localSystem.libc}";

     

       156
       157
        
               buildCommand = ''

     

       157
       158
        
                 mkdir -p $out

     

       158
       159
        
                 ln -s ${bootstrapTools}/lib $out/lib

     
···

       164
       165
        
             };

     

       165
       166
        
             gcc-unwrapped = bootstrapTools;

     

       166
       167
        
             binutils = import ../../build-support/bintools-wrapper {

     

       168
       168
       +
               name = "bootstrap-stage0-binutils-wrapper";

     

       167
       169
        
               nativeTools = false;

     

       168
       170
        
               nativeLibc = false;

     

       169
       171
        
               buildPackages = { };

     

       170
       172
        
               libc = getLibc self;

     

       171
       173
        
               inherit (self) stdenvNoCC coreutils gnugrep;

     

       172
       174
        
               bintools = bootstrapTools;

     

       173
       173
       -
               name = "bootstrap-binutils-wrapper";

     

       174
       175
        
             };

     

       175
       176
        
             coreutils = bootstrapTools;

     

       176
       177
        
             gnugrep = bootstrapTools;

     
···

       189
       190
        
         # simply re-export those packages in the middle stage(s) using the

     

       190
       191
        
         # overrides attribute and the inherit syntax.

     

       191
       192
        
         (prevStage: stageFun prevStage {

     

       192
       192
       -
           name = "bootstrap-gcc-wrapper";

     

       193
       193
       +
           name = "bootstrap-stage1";

     

       193
       194
        
       

     

       194
       195
        
           # Rebuild binutils to use from stage2 onwards.

     

       195
       196
        
           overrides = self: super: {

     
···

       213
       214
        
         # 2nd stdenv that contains our own rebuilt binutils and is used for

     

       214
       215
        
         # compiling our own Glibc.

     

       215
       216
        
         (prevStage: stageFun prevStage {

     

       216
       216
       -
           name = "bootstrap-gcc-wrapper";

     

       217
       217
       +
           name = "bootstrap-stage2";

     

       217
       218
        
       

     

       218
       219
        
           overrides = self: super: {

     

       219
       220
        
             inherit (prevStage)

     
···

       234
       235
        
         # one uses the rebuilt Glibc from stage2.  It still uses the recent

     

       235
       236
        
         # binutils and rest of the bootstrap tools, including GCC.

     

       236
       237
        
         (prevStage: stageFun prevStage {

     

       237
       237
       -
           name = "bootstrap-gcc-wrapper";

     

       238
       238
       +
           name = "bootstrap-stage3";

     

       238
       239
        
       

     

       239
       240
        
           overrides = self: super: rec {

     

       240
       241
        
             inherit (prevStage)

     
···

       262
       263
        
         # Construct a fourth stdenv that uses the new GCC.  But coreutils is

     

       263
       264
        
         # still from the bootstrap tools.

     

       264
       265
        
         (prevStage: stageFun prevStage {

     

       265
       265
       -
           name = "";

     

       266
       266
       +
           name = "bootstrap-stage4";

     

       266
       267
        
       

     

       267
       268
        
           overrides = self: super: {

     

       268
       269
        
             # Zlib has to be inherited and not rebuilt in this stage,

     
···

       291
       292
        
               bintools = self.binutils;

     

       292
       293
        
               libc = getLibc self;

     

       293
       294
        
               inherit (self) stdenvNoCC coreutils gnugrep;

     

       294
       294
       -
               name = "";

     

       295
       295
        
               shell = self.bash + "/bin/bash";

     

       296
       296
        
             };

     

       297
       297
        
           };

     
···

       310
       310
        
         (prevStage: {

     

       311
       311
        
           inherit config overlays;

     

       312
       312
        
           stdenv = import ../generic rec {

     

       313
       313
       +
             name = "stdenv-linux";

     

       314
       314
       +
       

     

       313
       315
        
             buildPlatform = localSystem;

     

       314
       316
        
             hostPlatform = localSystem;

     

       315
       317
        
             targetPlatform = localSystem;

+20 -28

pkgs/tools/admin/awscli/default.nix

···

       1
       1
       -
       { stdenv

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , botocore

     

       5
       5
       -
       , bcdoc

     

       6
       6
       -
       , s3transfer

     

       7
       7
       -
       , six

     

       8
       8
       -
       , colorama

     

       9
       9
       -
       , docutils

     

       10
       10
       -
       , rsa

     

       11
       11
       -
       , pyyaml

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , python

     

       12
       3
        
       , groff

     

       13
       4
        
       , less

     

       14
       5
        
       }:

     

       15
       6
        
       

     

       16
       7
        
       let

     

       17
       17
       -
         colorama_3_7 = colorama.overrideAttrs (old: rec {

     

       18
       18
       -
           name = "${pname}-${version}";

     

       19
       19
       -
           pname = "colorama";

     

       20
       20
       -
           version = "0.3.7";

     

       21
       21
       -
           src = old.src.override {

     

       22
       22
       -
             inherit version;

     

       23
       23
       -
             sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";

     

       8
       8
       +
         py = python.override {

     

       9
       9
       +
           packageOverrides = self: super: {

     

       10
       10
       +
             colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {

     

       11
       11
       +
               version = "0.3.7";

     

       12
       12
       +
               src = oldAttrs.src.override {

     

       13
       13
       +
                 inherit version;

     

       14
       14
       +
                 sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";

     

       15
       15
       +
               };

     

       16
       16
       +
             });

     

       24
       17
        
           };

     

       25
       25
       -
         });

     

       18
       18
       +
         };

     

       26
       19
        
       

     

       27
       27
       -
       in buildPythonPackage rec {

     

       20
       20
       +
       in py.pkgs.buildPythonApplication rec {

     

       28
       21
        
         pname = "awscli";

     

       29
       29
       -
         version = "1.14.41";

     

       30
       30
       -
         namePrefix = "";

     

       22
       22
       +
         version = "1.14.47";

     

       31
       23
        
       

     

       32
       32
       -
         src = fetchPypi {

     

       24
       24
       +
         src = py.pkgs.fetchPypi {

     

       33
       25
        
           inherit pname version;

     

       34
       34
       -
           sha256 = "8cf2a52d56f26e22e2fbd7b72649ef1d3de8930df7a730d7f27418d129bb3a6a";

     

       26
       26
       +
           sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8";

     

       35
       27
        
         };

     

       36
       28
        
       

     

       37
       29
        
         # No tests included

     

       38
       30
        
         doCheck = false;

     

       39
       31
        
       

     

       40
       40
       -
         propagatedBuildInputs = [

     

       32
       32
       +
         propagatedBuildInputs = with py.pkgs; [

     

       41
       33
        
           botocore

     

       42
       34
        
           bcdoc

     

       43
       35
        
           s3transfer

     

       44
       36
        
           six

     

       45
       45
       -
           colorama_3_7

     

       37
       37
       +
           colorama

     

       46
       38
        
           docutils

     

       47
       39
        
           rsa

     

       48
       40
        
           pyyaml

     
···

       58
       50
        
           rm $out/bin/aws.cmd

     

       59
       51
        
         '';

     

       60
       52
        
       

     

       61
       61
       -
         meta = with stdenv.lib; {

     

       53
       53
       +
         meta = with lib; {

     

       62
       54
        
           homepage = https://aws.amazon.com/cli/;

     

       63
       55
        
           description = "Unified tool to manage your AWS services";

     

       64
       64
       -
           license = stdenv.lib.licenses.asl20;

     

       56
       56
       +
           license = licenses.asl20;

     

       65
       57
        
           maintainers = with maintainers; [ muflax ];

     

       66
       58
        
         };

     

       67
       59
        
       }

+3 -3

pkgs/tools/compression/lzip/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "1.19";

     

       5
       5
       +
         version = "1.20";

     

       6
       6
        
       

     

       7
       7
        
         buildInputs = [ texinfo ];

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://savannah/lzip/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz";

     

       11
       11
       +
           sha256 = "0319q59kb8g324wnj7xzbr7vvlx5bcs13lr34j0zb3kqlyjq2fy9";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";

     

       14
       14
       +
         configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3" + stdenv.lib.optionalString stdenv.isCross " CXX=${stdenv.cc.targetPrefix}c++";

     

       15
       15
        
       

     

       16
       16
        
         setupHook = ./lzip-setup-hook.sh;

     

       17
       17

+2 -2

pkgs/tools/filesystems/btrfs-progs/default.nix

···

       2
       2
        
       , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       let version = "4.14.1"; in

     

       5
       5
       +
       let version = "4.15.1"; in

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         name = "btrfs-progs-${version}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";

     

       12
       12
       -
           sha256 = "1palnddw3d50kyflwk1j4xapbc6jniid6j5i9dsr8l8a7nkv7ich";

     

       12
       12
       +
           sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [

+2 -2

pkgs/tools/filesystems/e2fsprogs/default.nix

···

       1
       1
        
       { stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "e2fsprogs-1.43.8";

     

       4
       4
       +
         name = "e2fsprogs-1.43.9";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "1pn33rap3lcjm3gx07pmgyhx4j634gja63phmi4g5dq8yj0z8ciz";

     

       8
       8
       +
           sha256 = "15rqvkzylqqckshfy7vmk15k7wds2rh3k1pwrkrs684p3g0gzq2v";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "bin" "dev" "out" "man" "info" ];

+2 -2

pkgs/tools/misc/you-get/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonApplication rec {

     

       4
       4
        
         pname = "you-get";

     

       5
       5
       -
         version = "0.4.1025";

     

       5
       5
       +
         version = "0.4.1040";

     

       6
       6
        
       

     

       7
       7
        
         # Tests aren't packaged, but they all hit the real network so

     

       8
       8
        
         # probably aren't suitable for a build environment anyway.

     
···

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "1dbalpwhzn39kgswjy84720wfjssa087adavbwig53krsjdvhj6k";

     

       13
       13
       +
           sha256 = "fdc9021e8b1cf936aad4bd6c74b80ea8fa3573b807c41242ba781e247f8c8ca8";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         meta = with stdenv.lib; {

+3 -7

pkgs/tools/networking/dhcp/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

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

     

       7
       7
       -
         version = "4.3.4";

     

       7
       7
       +
         version = "4.3.6-P1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "0zk0imll6bfyp9p4ndn8h6s4ifijnw5bhixswifr5rnk7pp5l4gm";

     

       11
       11
       +
           sha256 = "1hx3az6ckvgvybr1ag4k9kqr8zfcpzcww4vpw5gz0mi8y2z7gl9g";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patches =

     

       15
       15
       -
           [ # Don't bring down interfaces, because wpa_supplicant doesn't

     

       16
       16
       -
             # recover when the wlan interface goes down.  Instead just flush

     

       17
       17
       -
             # all addresses, routes and neighbours of the interface.

     

       18
       18
       -
             ./flush-if.patch

     

       19
       19
       -
       

     

       15
       15
       +
           [

     

       20
       16
        
             # Make sure that the hostname gets set on reboot.  Without this

     

       21
       17
        
             # patch, the hostname doesn't get set properly if the old

     

       22
       18
        
             # hostname (i.e. before reboot) is equal to the new hostname.

-76

pkgs/tools/networking/dhcp/flush-if.patch

···

       1
       1
       -
       diff --exclude '*~' -rc dhcp-4.1.0p1-orig/client/scripts/linux dhcp-4.1.0p1/client/scripts/linux

     

       2
       2
       -
       *** dhcp-4.1.0p1-orig/client/scripts/linux	2008-05-23 15:56:07.000000000 +0200

     

       3
       3
       -
       --- dhcp-4.1.0p1/client/scripts/linux	2009-09-29 17:56:57.000000000 +0200

     

       4
       4
       -
       ***************

     

       5
       5
       -
       *** 67,72 ****

     

       6
       6
       -
       --- 67,80 ----

     

       7
       7
       -
           exit $exit_status

     

       8
       8
       -
         }

     

       9
       9
       -
         

     

       10
       10
       -
       + # Delete the old addresses, routes and ARP information for this

     

       11
       11
       -
       + # interface.

     

       12
       12
       -
       + flush_if() {

     

       13
       13
       -
       +   ${ip} -4 address flush dev $interface

     

       14
       14
       -
       +   ${ip} -4 route flush dev $interface

     

       15
       15
       -
       +   ${ip} -4 neighbour flush dev $interface

     

       16
       16
       -
       + }

     

       17
       17
       -
       + 

     

       18
       18
       -
         # Invoke the local dhcp client enter hooks, if they exist.

     

       19
       19
       -
         if [ -f /etc/dhclient-enter-hooks ]; then

     

       20
       20
       -
           exit_status=0

     

       21
       21
       -
       ***************

     

       22
       22
       -
       *** 150,159 ****

     

       23
       23
       -
             ifconfig $interface:0- inet 0

     

       24
       24
       -
           fi

     

       25
       25
       -
           if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then

     

       26
       26
       -
       !     # IP address changed. Bringing down the interface will delete all routes,

     

       27
       27
       -
       !     # and clear the ARP cache.

     

       28
       28
       -
       !     ifconfig $interface inet 0 down

     

       29
       29
       -
       ! 

     

       30
       30
       -
           fi

     

       31
       31
       -
           if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \

     

       32
       32
       -
              [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then

     

       33
       33
       -
       --- 158,165 ----

     

       34
       34
       -
             ifconfig $interface:0- inet 0

     

       35
       35
       -
           fi

     

       36
       36
       -
           if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then

     

       37
       37
       -
       !     # IP address changed.

     

       38
       38
       -
       !     flush_if

     

       39
       39
       -
           fi

     

       40
       40
       -
           if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \

     

       41
       41
       -
              [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then

     

       42
       42
       -
       ***************

     

       43
       43
       -
       *** 189,196 ****

     

       44
       44
       -
             ifconfig $interface:0- inet 0

     

       45
       45
       -
           fi

     

       46
       46
       -
           if [ x$old_ip_address != x ]; then

     

       47
       47
       -
       !     # Shut down interface, which will delete routes and clear arp cache.

     

       48
       48
       -
       !     ifconfig $interface inet 0 down

     

       49
       49
       -
           fi

     

       50
       50
       -
           if [ x$alias_ip_address != x ]; then

     

       51
       51
       -
             ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg

     

       52
       52
       -
       --- 195,201 ----

     

       53
       53
       -
             ifconfig $interface:0- inet 0

     

       54
       54
       -
           fi

     

       55
       55
       -
           if [ x$old_ip_address != x ]; then

     

       56
       56
       -
       !     flush_if

     

       57
       57
       -
           fi

     

       58
       58
       -
           if [ x$alias_ip_address != x ]; then

     

       59
       59
       -
             ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg

     

       60
       60
       -
       ***************

     

       61
       61
       -
       *** 225,231 ****

     

       62
       62
       -
             make_resolv_conf

     

       63
       63
       -
             exit_with_hooks 0

     

       64
       64
       -
           fi

     

       65
       65
       -
       !   ifconfig $interface inet 0 down

     

       66
       66
       -
           exit_with_hooks 1

     

       67
       67
       -
         fi

     

       68
       68
       -
         

     

       69
       69
       -
       --- 230,236 ----

     

       70
       70
       -
             make_resolv_conf

     

       71
       71
       -
             exit_with_hooks 0

     

       72
       72
       -
           fi

     

       73
       73
       -
       !   flush_if

     

       74
       74
       -
           exit_with_hooks 1

     

       75
       75
       -
         fi

     

       76
       76
       -

+11 -13

pkgs/tools/networking/dhcp/set-hostname.patch

···

       1
       1
       -
       diff -ru -x '*~' dhcp-4.1.2-P1-orig//client/scripts/linux dhcp-4.1.2-P1//client/scripts/linux

     

       2
       2
       -
       --- dhcp-4.1.2-P1-orig//client/scripts/linux	2010-09-15 00:49:48.000000000 +0200

     

       3
       3
       -
       +++ dhcp-4.1.2-P1//client/scripts/linux	2011-04-01 16:08:10.984372269 +0200

     

       1
       1
       +
       --- a/client/scripts/linux	2010-09-15 00:49:48.000000000 +0200

     

       2
       2
       +
       +++ b/client/scripts/linux	2011-04-01 16:08:10.984372269 +0200

     

       4
       3
        
       @@ -133,9 +133,7 @@

     

       5
       5
       -
             [ x$current_hostname = "x(none)" ] || \

     

       6
       6
       -
             [ x$current_hostname = xlocalhost ] || \

     

       7
       7
       -
             [ x$current_hostname = x$old_host_name ]; then

     

       8
       8
       -
       -    if [ x$new_host_name != x$old_host_name ]; then

     

       9
       9
       -
       -      hostname "$new_host_name"

     

       10
       10
       -
       -    fi

     

       11
       11
       -
       +    hostname "$new_host_name"

     

       12
       12
       -
          fi

     

       13
       13
       -
            

     

       14
       14
       -
          if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \

     

       4
       4
       +
                   [ "$current_hostname" = '(none)' ] ||

     

       5
       5
       +
                   [ "$current_hostname" = 'localhost' ] ||

     

       6
       6
       +
                   [ "$current_hostname" = "$old_host_name" ]; then

     

       7
       7
       +
       -           if [ "$new_host_name" != "$old_host_name" ]; then

     

       8
       8
       +
       -               hostname "$new_host_name"

     

       9
       9
       +
       -           fi

     

       10
       10
       +
       +           hostname "$new_host_name"

     

       11
       11
       +
                fi

     

       12
       12
       +
            fi

+6 -1

pkgs/tools/networking/dhcpcd/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, udev }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         # when updating this to >=7, check, see previous reverts:

     
···

       26
       26
        
       

     

       27
       27
        
         # Check that the udev plugin got built.

     

       28
       28
        
         postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";

     

       29
       29
       +
       

     

       30
       30
       +
         # TODO shlevy remove once patchShebangs is fixed

     

       31
       31
       +
         postFixup = ''

     

       32
       32
       +
           find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|'

     

       33
       33
       +
         '';

     

       29
       34
        
       

     

       30
       35
        
         meta = {

     

       31
       36
        
           description = "A client for the Dynamic Host Configuration Protocol (DHCP)";

+2 -2

pkgs/tools/security/gnupg/22.nix

···

       15
       15
        
       stdenv.mkDerivation rec {

     

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

     

       17
       17
        
       

     

       18
       18
       -
         version = "2.2.4";

     

       18
       18
       +
         version = "2.2.5";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchurl {

     

       21
       21
        
           url = "mirror://gnupg/gnupg/${name}.tar.bz2";

     

       22
       22
       -
           sha256 = "1v7j8v2ww1knknbrhw3svfrqkmf9ll58iq0dczbsdpqgg1j3w6j0";

     

       22
       22
       +
           sha256 = "0mzgibq4dpxh3i9anmwg12xdjry28y83icafhx3j3djg5niqk89z";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ pkgconfig ];

+3 -2

pkgs/tools/security/gnupg/fix-libusb-include-path.patch

···

       1
       1
        
       --- a/configure

     

       2
       2
        
       +++ b/configure

     

       3
       3
       -
       @@ -8872,7 +8872,7 @@

     

       3
       3
       +
       @@ -8987,8 +8987,7 @@

     

       4
       4
        
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb include dir" >&5

     

       5
       5
        
        $as_echo_n "checking libusb include dir... " >&6; }

     

       6
       6
        
           usb_incdir_found="no"

     

       7
       7
       -
       -   for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do

     

       7
       7
       +
       -   for _incdir in "" "/usr/include/libusb-1.0" \

     

       8
       8
       +
       -       "/usr/local/include/libusb-1.0" "/usr/pkg/include/libusb-1.0"; do

     

       8
       9
        
       +   for _incdir in "$($PKG_CONFIG --variable=includedir libusb-1.0)/libusb-1.0"; do

     

       9
       10
        
             _libusb_save_cppflags=$CPPFLAGS

     

       10
       11
        
             if test -n "${_incdir}"; then

+2 -1

pkgs/tools/security/sudo/default.nix

···

       51
       51
        
           installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy"

     

       52
       52
        
           '';

     

       53
       53
        
       

     

       54
       54
       -
         buildInputs = [ coreutils pam groff ];

     

       54
       54
       +
         nativeBuildInputs = [ groff ];

     

       55
       55
       +
         buildInputs = [ pam ];

     

       55
       56
        
       

     

       56
       57
        
         enableParallelBuilding = true;

     

       57
       58

+2 -2

pkgs/tools/text/gawk/default.nix

···

       19
       19
        
         inherit (stdenv.lib) optional;

     

       20
       20
        
       in

     

       21
       21
        
       stdenv.mkDerivation rec {

     

       22
       22
       -
         name = "gawk-4.2.0";

     

       22
       22
       +
         name = "gawk-4.2.1";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchurl {

     

       25
       25
        
           url = "mirror://gnu/gawk/${name}.tar.xz";

     

       26
       26
       -
           sha256 = "1wm9lqj77y7xz07zi0n187aqm8zavzxzpm1j53ahxz81q0qwvwyl";

     

       26
       26
       +
           sha256 = "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         # When we do build separate interactive version, it makes sense to always include man.

+3 -1

pkgs/tools/text/groff/default.nix

···

       47
       47
        
         ] ++ stdenv.lib.optionals (ghostscript != null) [

     

       48
       48
        
           "--with-gs=${ghostscript}/bin/gs"

     

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

     

       50
       50
       -
           "ac_cv_path_PERL=${perl}/bin/perl"

     

       50
       50
       +
           "ac_cv_path_PERL=${buildPackages.perl}/bin/perl"

     

       51
       51
        
         ];

     

       52
       52
        
       

     

       53
       53
        
         doCheck = true;

     
···

       103
       103
        
           substituteInPlace $perl/bin/grog \

     

       104
       104
        
             --replace $out/lib/groff/grog $perl/lib/groff/grog

     

       105
       105
        
       

     

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

     

       107
       107
       +
           find $perl/ -type f -print0 | xargs --null sed -i 's|${buildPackages.perl}|${perl}|'

     

       106
       108
        
         '';

     

       107
       109
        
       

     

       108
       110
        
         meta = with stdenv.lib; {

+2 -2

pkgs/tools/typesetting/docbook2x/default.nix

···

       1
       1
        
       { fetchurl, stdenv, texinfo, perl

     

       2
       2
       -
       , XMLSAX, XMLParser, XMLNamespaceSupport

     

       2
       2
       +
       , XMLSAX, XMLSAXBase, XMLParser, XMLNamespaceSupport

     

       3
       3
        
       , groff, libxml2, libxslt, gnused, libiconv, opensp

     

       4
       4
        
       , docbook_xml_dtd_43

     

       5
       5
        
       , makeWrapper }:

     
···

       35
       35
        
             # XXX: We work around the fact that `wrapProgram' doesn't support

     

       36
       36
        
             # spaces below by inserting escaped backslashes.

     

       37
       37
        
             wrapProgram $out/bin/$i --prefix PERL5LIB :			\

     

       38
       38
       -
               "${XMLSAX}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \

     

       38
       38
       +
               "${XMLSAX}/lib/perl5/site_perl:${XMLSAXBase}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \

     

       39
       39
        
       	--prefix PERL5LIB :						\

     

       40
       40
        
       	"${XMLNamespaceSupport}/lib/perl5/site_perl"			\

     

       41
       41
        
       	--prefix XML_CATALOG_FILES "\ "					\

+10 -2

pkgs/tools/typesetting/tex/texlive/bin.nix

···

       28
       28
        
             sha256 = "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81";

     

       29
       29
        
           };

     

       30
       30
        
       

     

       31
       31
       +
           patches = [

     

       32
       32
       +
             (fetchurl {

     

       33
       33
       +
               name = "texlive-poppler-0.59.patch";

     

       34
       34
       +
               url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.59.patch?h=packages/texlive-bin&id=6308ec39bce2a4d735f6ff8a4e94473748d7b450;

     

       35
       35
       +
               sha256 = "1c4ikq4kxw48bi3i33bzpabrjvbk01fwjr2lz20gkc9kv8l0bg3n";

     

       36
       36
       +
             })

     

       37
       37
       +
           ];

     

       38
       38
       +
       

     

       31
       39
        
           configureFlags = [

     

       32
       40
        
             "--with-banner-add=/NixOS.org"

     

       33
       41
        
             "--disable-missing" "--disable-native-texlive-build"

     
···

       58
       66
        
       core = stdenv.mkDerivation rec {

     

       59
       67
        
         name = "texlive-bin-${version}";

     

       60
       68
        
       

     

       61
       61
       -
         inherit (common) src;

     

       69
       69
       +
         inherit (common) src patches;

     

       62
       70
        
       

     

       63
       71
        
         outputs = [ "out" "doc" ];

     

       64
       72
        
       

     
···

       168
       176
        
               # http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex

     

       169
       177
        
             ];

     

       170
       178
        
       

     

       171
       171
       -
         patches = [ ./luatex-gcc7.patch ];

     

       179
       179
       +
         patches = common.patches ++ [ ./luatex-gcc7.patch ];

     

       172
       180
        
       

     

       173
       181
        
         configureScript = ":";

     

       174
       182

+1 -7

pkgs/tools/typesetting/tex/texlive/default.nix

···

       57
       57
        
       

     

       58
       58
        
             # remove dependency-heavy packages from the basic collections

     

       59
       59
        
             collection-basic = orig.collection-basic // {

     

       60
       60
       -
               deps = removeAttrs orig.collection-basic.deps [ "luatex" "metafont" "xdvi" ];

     

       61
       61
       -
             };

     

       62
       62
       -
             latex = orig.latex // {

     

       63
       63
       -
               deps = removeAttrs orig.latex.deps [ "luatex" ];

     

       60
       60
       +
               deps = removeAttrs orig.collection-basic.deps [ "metafont" "xdvi" ];

     

       64
       61
        
             };

     

       65
       62
        
             # add them elsewhere so that collections cover all packages

     

       66
       66
       -
             collection-luatex = orig.collection-luatex // {

     

       67
       67
       -
               deps = orig.collection-luatex.deps // { inherit (tl) luatex; };

     

       68
       68
       -
             };

     

       69
       63
        
             collection-metapost = orig.collection-metapost // {

     

       70
       64
        
               deps = orig.collection-metapost.deps // { inherit (tl) metafont; };

     

       71
       65
        
             };

+15 -58

pkgs/top-level/all-packages.nix

···

       557
       557
        
       

     

       558
       558
        
         avfs = callPackage ../tools/filesystems/avfs { };

     

       559
       559
        
       

     

       560
       560
       -
         awscli = pythonPackages.callPackage ../tools/admin/awscli { };

     

       560
       560
       +
         awscli = callPackage ../tools/admin/awscli { };

     

       561
       561
        
       

     

       562
       562
        
         awsebcli = callPackage ../tools/virtualization/awsebcli {};

     

       563
       563
        
       

     
···

       1955
       1955
        
         doas = callPackage ../tools/security/doas { };

     

       1956
       1956
        
       

     

       1957
       1957
        
         docbook2x = callPackage ../tools/typesetting/docbook2x {

     

       1958
       1958
       -
           inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;

     

       1958
       1958
       +
           inherit (perlPackages) XMLSAX XMLSAXBase XMLParser XMLNamespaceSupport;

     

       1959
       1959
        
         };

     

       1960
       1960
        
       

     

       1961
       1961
        
         docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };

     
···

       5700
       5700
        
       

     

       5701
       5701
        
         ### SHELLS

     

       5702
       5702
        
       

     

       5703
       5703
       +
         runtimeShell = "${runtimeShellPackage}/bin/bash";

     

       5704
       5704
       +
         runtimeShellPackage = bash;

     

       5705
       5705
       +
       

     

       5703
       5706
        
         bash = lowPrio (callPackage ../shells/bash/4.4.nix {

     

       5704
       5707
        
           texinfo = null;

     

       5705
       5708
        
           interactive = stdenv.isCygwin; # patch for cygwin requires readline support

     
···

       6003
       6006
        
           inherit binutils;

     

       6004
       6007
        
         };

     

       6005
       6008
        
       

     

       6006
       6006
       -
         gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 {

     

       6007
       6007
       -
           inherit noSysDirs;

     

       6008
       6008
       -
           texinfo = texinfo4;

     

       6009
       6009
       -
       

     

       6010
       6010
       -
           ppl = null;

     

       6011
       6011
       -
           cloogppl = null;

     

       6012
       6012
       -
       

     

       6013
       6013
       -
           # bootstrapping a profiled compiler does not work in the sheevaplug:

     

       6014
       6014
       -
           # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944

     

       6015
       6015
       -
           profiledCompiler = !stdenv.isArm;

     

       6016
       6016
       -
       

     

       6017
       6017
       -
           libcCross = if targetPlatform != buildPlatform then libcCross else null;

     

       6018
       6018
       -
         }));

     

       6019
       6019
       -
       

     

       6020
       6009
        
         gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 {

     

       6021
       6010
        
           inherit noSysDirs;

     

       6022
       6011
        
       

     
···

       6141
       6130
        
           inherit (gnome2) libart_lgpl;

     

       6142
       6131
        
         });

     

       6143
       6132
        
       

     

       6144
       6144
       -
         gnat = gnat45; # failed to make 4.6 or 4.8 build

     

       6145
       6145
       -
       

     

       6146
       6146
       -
         gnat45 = wrapCC (gcc45.cc.override {

     

       6147
       6147
       -
           name = "gnat";

     

       6148
       6148
       -
           langCC = false;

     

       6149
       6149
       -
           langC = true;

     

       6150
       6150
       -
           langAda = true;

     

       6151
       6151
       -
           profiledCompiler = false;

     

       6152
       6152
       -
           inherit gnatboot;

     

       6153
       6153
       -
           # We can't use the ppl stuff, because we would have

     

       6154
       6154
       -
           # libstdc++ problems.

     

       6155
       6155
       -
           cloogppl = null;

     

       6156
       6156
       -
           ppl = null;

     

       6157
       6157
       -
         });

     

       6158
       6158
       -
       

     

       6159
       6159
       -
         gnatboot = wrapGCC-old (callPackage ../development/compilers/gnatboot {});

     

       6160
       6160
       -
       

     

       6161
       6133
        
         gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk {

     

       6162
       6134
        
           emacsSupport = config.emacsSupport or false;

     

       6163
       6135
        
         };

     
···

       6170
       6142
        
           langGo = true;

     

       6171
       6143
        
           profiledCompiler = false;

     

       6172
       6144
        
         });

     

       6173
       6173
       -
       

     

       6174
       6174
       -
         ghdl_mcode = callPackage_i686 ../development/compilers/ghdl {

     

       6175
       6175
       -
           flavour = "mcode";

     

       6176
       6176
       -
         };

     

       6177
       6177
       -
       

     

       6178
       6178
       -
         ghdl_llvm = callPackage ../development/compilers/ghdl {

     

       6179
       6179
       -
           flavour = "llvm";

     

       6180
       6180
       -
         };

     

       6181
       6145
        
       

     

       6182
       6146
        
         gcl = callPackage ../development/compilers/gcl {

     

       6183
       6147
        
           gmp = gmp4;

     
···

       6845
       6809
        
           bintools = if targetPlatform.isDarwin then darwin.binutils else binutils;

     

       6846
       6810
        
           libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc;

     

       6847
       6811
        
         };

     

       6848
       6848
       -
         # legacy version, used for gnat bootstrapping

     

       6849
       6849
       -
         wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old {

     

       6850
       6850
       -
           nativeTools = stdenv.cc.nativeTools or false;

     

       6851
       6851
       -
           nativeLibc = stdenv.cc.nativeLibc or false;

     

       6852
       6852
       -
           nativePrefix = stdenv.cc.nativePrefix or "";

     

       6853
       6853
       -
           gcc = baseGCC;

     

       6854
       6854
       -
           libc = glibc;

     

       6855
       6855
       -
         };

     

       6856
       6812
        
       

     

       6857
       6813
        
         wrapBintoolsWith = { bintools, libc }: bintoolsWrapperFun {

     

       6858
       6814
        
           nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false;

     
···

       7432
       7388
        
       

     

       7433
       7389
        
         autocutsel = callPackage ../tools/X11/autocutsel{ };

     

       7434
       7390
        
       

     

       7435
       7435
       -
         automake = automake115x;

     

       7391
       7391
       +
         automake = automake116x;

     

       7436
       7392
        
       

     

       7437
       7393
        
         automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };

     

       7438
       7394
        
       

     

       7439
       7439
       -
         automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { };

     

       7395
       7395
       +
         automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { };

     

       7440
       7396
        
       

     

       7441
       7397
        
         automoc4 = callPackage ../development/tools/misc/automoc4 { };

     

       7442
       7398
        
       

     
···

       8296
       8252
        
         yodl = callPackage ../development/tools/misc/yodl { };

     

       8297
       8253
        
       

     

       8298
       8254
        
         yq = callPackage ../development/tools/yq {

     

       8299
       8299
       -
           inherit (python3Packages) buildPythonApplication fetchPypi pyyaml;

     

       8255
       8255
       +
           inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict;

     

       8300
       8256
        
         };

     

       8301
       8257
        
       

     

       8302
       8258
        
         winpdb = callPackage ../development/tools/winpdb { };

     
···

       10906
       10862
        
           suffix = "min";

     

       10907
       10863
        
         };

     

       10908
       10864
        
       

     

       10909
       10909
       -
         poppler_qt4 = poppler.override {

     

       10910
       10910
       -
           qt4Support = true;

     

       10911
       10911
       -
           suffix = "qt4";

     

       10912
       10912
       -
         };

     

       10865
       10865
       +
         poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { };

     

       10913
       10866
        
       

     

       10914
       10867
        
         poppler_utils = poppler.override { suffix = "utils"; utils = true; };

     

       10915
       10868
        
       

     
···

       10939
       10892
        
       

     

       10940
       10893
        
         postgis = callPackage ../development/libraries/postgis { };

     

       10941
       10894
        
       

     

       10942
       10942
       -
         protobuf = callPackage ../development/libraries/protobuf/3.4.nix { };

     

       10895
       10895
       +
         protobuf = protobuf3_4;

     

       10943
       10896
        
       

     

       10897
       10897
       +
         protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };

     

       10898
       10898
       +
         protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };

     

       10944
       10899
        
         protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };

     

       10945
       10900
        
         protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };

     

       10946
       10901
        
       

     
···

       12146
       12101
        
         apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages;

     

       12147
       12102
        
         apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;

     

       12148
       12103
        
       

     

       12104
       12104
       +
         appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };

     

       12105
       12105
       +
       

     

       12149
       12106
        
         archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { };

     

       12150
       12107
        
       

     

       12151
       12108
        
         atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { };

     
···

       13116
       13073
        
         iproute = callPackage ../os-specific/linux/iproute { };

     

       13117
       13074
        
       

     

       13118
       13075
        
         iputils = callPackage ../os-specific/linux/iputils {

     

       13119
       13119
       -
           inherit (perlPackages) SGMLSpm;

     

       13076
       13076
       +
           inherit (buildPackages.buildPackages.perlPackages) SGMLSpm;

     

       13120
       13077
        
         };

     

       13121
       13078
        
       

     

       13122
       13079
        
         iptables = callPackage ../os-specific/linux/iptables { };

+71 -20

pkgs/top-level/perl-packages.nix

···

       2471
       2471
        
         constant = buildPerlPackage rec {

     

       2472
       2472
        
           name = "constant-1.33";

     

       2473
       2473
        
           src = fetchurl {

     

       2474
       2474
       -
             url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";

     

       2474
       2474
       +
             url = mirror://cpan/authors/id/R/RJ/RJBS/constant-1.33.tar.gz;

     

       2475
       2475
        
             sha256 = "015my616h5l2fswh52x4dp3n007gk5lax83ww9q6cmzb610mv5kr";

     

       2476
       2476
        
           };

     

       2477
       2477
       +
           propagatedBuildInputs = [ TestSimple13 ];

     

       2478
       2478
       +
           buildInputs = [ ExtUtilsMakeMaker ];

     

       2477
       2479
        
         };

     

       2478
       2480
        
       

     

       2479
       2481
        
         constantboolean = buildPerlPackage {

     
···

       3824
       3826
        
         };

     

       3825
       3827
        
       

     

       3826
       3828
        
         DBI = buildPerlPackage rec {

     

       3827
       3827
       -
           name = "DBI-1.636";

     

       3829
       3829
       +
           name = "DBI-${version}";

     

       3830
       3830
       +
           version = "1.6.36";

     

       3828
       3831
        
           src = fetchurl {

     

       3829
       3832
        
             url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz";

     

       3830
       3833
        
             sha256 = "8f7ddce97c04b4b7a000e65e5d05f679c964d62c8b02c94c1a7d815bb2dd676c";

     

       3831
       3834
        
           };

     

       3835
       3835
       +
           postInstall = stdenv.lib.optionalString (perl ? crossVersion) ''

     

       3836
       3836
       +
             mkdir -p $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI

     

       3837
       3837
       +
             cat > $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI.pm <<EOF

     

       3838
       3838
       +
             package DBI;

     

       3839
       3839
       +
             BEGIN {

     

       3840
       3840
       +
             our \$VERSION = "$version";

     

       3841
       3841
       +
             }

     

       3842
       3842
       +
             1;

     

       3843
       3843
       +
             EOF

     

       3844
       3844
       +
       

     

       3845
       3845
       +
             autodir=$(echo $out/lib/perl5/site_perl/${perl.version}/*/auto/DBI)

     

       3846
       3846
       +
             cat > $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI/DBD.pm <<EOF

     

       3847
       3847
       +
             package DBI::DBD;

     

       3848
       3848
       +
             use Exporter ();

     

       3849
       3849
       +
             use vars qw (@ISA @EXPORT);

     

       3850
       3850
       +
             @ISA = qw(Exporter);

     

       3851
       3851
       +
             @EXPORT = qw(dbd_postamble);

     

       3852
       3852
       +
             sub dbd_postamble {

     

       3853
       3853
       +
                 return '

     

       3854
       3854
       +
             # --- This section was generated by DBI::DBD::dbd_postamble()

     

       3855
       3855
       +
             DBI_INSTARCH_DIR=$autodir

     

       3856
       3856
       +
             DBI_DRIVER_XST=$autodir/Driver.xst

     

       3857
       3857
       +
       

     

       3858
       3858
       +
             # The main dependency (technically correct but probably not used)

     

       3859
       3859
       +
             \$(BASEEXT).c: \$(BASEEXT).xsi

     

       3860
       3860
       +
       

     

       3861
       3861
       +
             # This dependency is needed since MakeMaker uses the .xs.o rule

     

       3862
       3862
       +
             \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi

     

       3863
       3863
       +
       

     

       3864
       3864
       +
             \$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h

     

       3865
       3865
       +
             	\$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi

     

       3866
       3866
       +
       

     

       3867
       3867
       +
             # ---

     

       3868
       3868
       +
             ';

     

       3869
       3869
       +
             }

     

       3870
       3870
       +
             1;

     

       3871
       3871
       +
             EOF

     

       3872
       3872
       +
           '';

     

       3832
       3873
        
           meta = {

     

       3833
       3874
        
             homepage = http://dbi.perl.org/;

     

       3834
       3875
        
             description = "Database independent interface for Perl";

     
···

       5237
       5278
        
         };

     

       5238
       5279
        
       

     

       5239
       5280
        
         ExtUtilsMakeMaker = buildPerlPackage {

     

       5240
       5240
       -
           name = "ExtUtils-MakeMaker-6.98";

     

       5281
       5281
       +
           name = "ExtUtils-MakeMaker-7.32";

     

       5241
       5282
        
           src = fetchurl {

     

       5242
       5242
       -
             url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-6.98.tar.gz;

     

       5243
       5243
       -
             sha256 = "2eb023189e5fa6b9dcc66858b1fde953d1f1b86f971ec5ab42dd36c172da63ef";

     

       5283
       5283
       +
             url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.32.tar.gz;

     

       5284
       5284
       +
             sha256 = "9a269f52ab59b125eb80b968271d9f49da0975d43e51363dbfd1695000ed69de";

     

       5244
       5285
        
           };

     

       5245
       5245
       -
           propagatedBuildInputs =

     

       5246
       5246
       -
             [ ParseCPANMeta JSONPP JSONPPCompat5006 CPANMetaYAML FileCopyRecursive ];

     

       5247
       5286
        
           meta = {

     

       5248
       5287
        
             homepage = https://metacpan.org/release/ExtUtils-MakeMaker;

     

       5249
       5288
        
             description = "Create a module Makefile";

     
···

       7610
       7649
        
             url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz;

     

       7611
       7650
        
             sha256 = "127yppvr17qik9pkd1vy901hs4l13kg6rhp76jdgcyask35v7nsd";

     

       7612
       7651
        
           };

     

       7652
       7652
       +
           preConfigure = ''

     

       7653
       7653
       +
             cp lib/JSON/backportPP.pm{,orig}

     

       7654
       7654
       +
             echo "1;" > lib/JSON/backportPP.pm

     

       7655
       7655
       +
           '';

     

       7656
       7656
       +
           postConfigure = ''

     

       7657
       7657
       +
             cp lib/JSON/backportPP.pm{,orig}

     

       7658
       7658
       +
           '';

     

       7613
       7659
        
           buildInputs = [ TestPod ];

     

       7614
       7660
        
           meta = {

     

       7615
       7661
        
             description = "JSON (JavaScript Object Notation) encoder/decoder";

     
···

       14423
       14469
        
         TestSimple = null;

     

       14424
       14470
        
       

     

       14425
       14471
        
         TestSimple13 = buildPerlPackage rec {

     

       14426
       14426
       -
           name = "Test-Simple-1.302120";

     

       14472
       14472
       +
           name = "Test-Simple-1.302125";

     

       14427
       14473
        
           src = fetchurl {

     

       14428
       14428
       -
             url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";

     

       14429
       14429
       -
             sha256 = "c82360092d4dacd6e3248b613fa00053072fe9cf55d022f1e0f427f51d04346c";

     

       14474
       14474
       +
             url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302125.tar.gz;

     

       14475
       14475
       +
             sha256 = "8a3785a4fa60c4c5ae0c5cac2f3312242f2b36ca20e368d8a9ec22b4061aa317";

     

       14430
       14476
        
           };

     

       14431
       14477
        
           meta = {

     

       14432
       14478
        
             description = "Basic utilities for writing tests";

     

       14433
       14479
        
             license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

     

       14434
       14480
        
             maintainers = [ maintainers.rycee ];

     

       14435
       14481
        
           };

     

       14482
       14482
       +
           buildInputs = [ ExtUtilsMakeMaker ];

     

       14436
       14483
        
         };

     

       14437
       14484
        
       

     

       14438
       14485
        
         TestSpec = buildPerlPackage rec {

     
···

       16196
       16243
        
         };

     

       16197
       16244
        
       

     

       16198
       16245
        
         XMLNamespaceSupport = buildPerlPackage {

     

       16199
       16199
       -
           name = "XML-NamespaceSupport-1.11";

     

       16246
       16246
       +
           name = "XML-NamespaceSupport-1.12";

     

       16200
       16247
        
           src = fetchurl {

     

       16201
       16201
       -
             url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.11.tar.gz;

     

       16202
       16202
       -
             sha256 = "1sklgcldl3w6gn706vx1cgz6pm4y5lfgsjxnfqyk20pilgq530bd";

     

       16248
       16248
       +
             url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz;

     

       16249
       16249
       +
             sha256 = "1vz5pbi4lm5fhq2slrs2hlp6bnk29863abgjlcx43l4dky2rbsa7";

     

       16203
       16250
        
           };

     

       16251
       16251
       +
           propagatedBuildInputs = [ constant ];

     

       16252
       16252
       +
           buildInputs = [ ExtUtilsMakeMaker ];

     

       16204
       16253
        
         };

     

       16205
       16254
        
       

     

       16206
       16255
        
         XMLParser = buildPerlPackage {

     
···

       16266
       16315
        
         };

     

       16267
       16316
        
       

     

       16268
       16317
        
         XMLSAX = buildPerlPackage {

     

       16269
       16269
       -
           name = "XML-SAX-0.96";

     

       16318
       16318
       +
           name = "XML-SAX-1.00";

     

       16270
       16319
        
           src = fetchurl {

     

       16271
       16271
       -
             url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz;

     

       16272
       16272
       -
             sha256 = "024fbjgg6s87j0y3yik55plzf7d6qpn7slwd03glcb54mw9zdglv";

     

       16320
       16320
       +
             url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.00.tar.gz;

     

       16321
       16321
       +
             sha256 = "1qra9k3wszjxvsgbragl55z3qba4nri0ipmjaxfib4l6xxj6bsj5";

     

       16273
       16322
        
           };

     

       16274
       16274
       -
           propagatedBuildInputs = [XMLNamespaceSupport];

     

       16323
       16323
       +
           propagatedBuildInputs = [ XMLNamespaceSupport XMLSAXBase ];

     

       16275
       16324
        
           postInstall = ''

     

       16276
       16325
        
             perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()"

     

       16277
       16326
        
             '';

     

       16327
       16327
       +
           buildInputs = [ ExtUtilsMakeMaker ];

     

       16278
       16328
        
         };

     

       16279
       16329
        
       

     

       16280
       16330
        
         XMLSAXBase = buildPerlPackage {

     

       16281
       16281
       -
           name = "XML-SAX-Base-1.08";

     

       16331
       16331
       +
           name = "XML-SAX-Base-1.09";

     

       16282
       16332
        
           src = fetchurl {

     

       16283
       16283
       -
             url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.08.tar.gz;

     

       16284
       16284
       -
             sha256 = "666270318b15f88b8427e585198abbc19bc2e6ccb36dc4c0a4f2d9807330219e";

     

       16333
       16333
       +
             url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz;

     

       16334
       16334
       +
             sha256 = "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0";

     

       16285
       16335
        
           };

     

       16286
       16336
        
           meta = {

     

       16287
       16337
        
             description = "Base class for SAX Drivers and Filters";

     

       16288
       16338
        
             homepage = https://github.com/grantm/XML-SAX-Base;

     

       16289
       16339
        
             license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

     

       16290
       16340
        
           };

     

       16341
       16341
       +
           buildInputs = [ ExtUtilsMakeMaker TestSimple13 ];

     

       16291
       16342
        
         };

     

       16292
       16343
        
       

     

       16293
       16344
        
         XMLSAXWriter = buildPerlPackage {

+35 -335

pkgs/top-level/python-packages.nix

···

       257
       257
        
           hdf5 = pkgs.hdf5-mpi;

     

       258
       258
        
         };

     

       259
       259
        
       

     

       260
       260
       +
         ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };

     

       261
       261
       +
       

     

       260
       262
        
         habanero = callPackage ../development/python-modules/habanero { };

     

       261
       263
        
       

     

       262
       264
        
         i3ipc = callPackage ../development/python-modules/i3ipc { };

     
···

       448
       450
        
       

     

       449
       451
        
         aiohttp-cors = callPackage ../development/python-modules/aiohttp/cors.nix { };

     

       450
       452
        
       

     

       453
       453
       +
         aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };

     

       454
       454
       +
       

     

       451
       455
        
         alabaster = callPackage ../development/python-modules/alabaster {};

     

       452
       456
        
       

     

       453
       457
        
         alembic = callPackage ../development/python-modules/alembic {};

     
···

       578
       582
        
           gui = false;

     

       579
       583
        
         };

     

       580
       584
        
       

     

       585
       585
       +
         deluge-client = callPackage ../development/python-modules/deluge-client { };

     

       581
       586
        
       

     

       582
       587
        
         arrow = callPackage ../development/python-modules/arrow { };

     

       583
       583
       -
       

     

       584
       584
       -
         async = buildPythonPackage rec {

     

       585
       585
       -
           name = "async-0.6.1";

     

       586
       586
       -
           disabled = isPy3k;

     

       587
       587
       -
           meta.maintainers = with maintainers; [ ];

     

       588
       588
       -
       

     

       589
       589
       -
           buildInputs = with self; [ pkgs.zlib ];

     

       590
       590
       -
           doCheck = false;

     

       591
       591
       -
       

     

       592
       592
       -
           src = pkgs.fetchurl {

     

       593
       593
       -
             url = "mirror://pypi/a/async/${name}.tar.gz";

     

       594
       594
       -
             sha256 = "1lfmjm8apy9qpnpbq8g641fd01qxh9jlya5g2d6z60vf8p04rla1";

     

       595
       595
       -
           };

     

       596
       596
       -
         };

     

       597
       588
        
       

     

       598
       589
        
         asynctest = callPackage ../development/python-modules/asynctest { };

     

       599
       590
        
       

     
···

       1613
       1604
        
           };

     

       1614
       1605
        
         };

     

       1615
       1606
        
       

     

       1616
       1616
       -
       

     

       1617
       1617
       -
         binaryornot = buildPythonPackage rec {

     

       1618
       1618
       -
           name = "binaryornot-${version}";

     

       1619
       1619
       -
           version = "0.4.0";

     

       1620
       1620
       -
       

     

       1621
       1621
       -
           src = pkgs.fetchurl {

     

       1622
       1622
       -
             url ="mirror://pypi/b/binaryornot/${name}.tar.gz";

     

       1623
       1623
       -
             sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb";

     

       1624
       1624
       -
           };

     

       1625
       1625
       -
       

     

       1626
       1626
       -
           buildInputs = with self; [ hypothesis ];

     

       1627
       1627
       -
       

     

       1628
       1628
       -
           propagatedBuildInputs = with self; [ chardet ];

     

       1629
       1629
       -
       

     

       1630
       1630
       -
           meta = {

     

       1631
       1631
       -
             homepage = https://github.com/audreyr/binaryornot;

     

       1632
       1632
       -
             description = "Ultra-lightweight pure Python package to check if a file is binary or text";

     

       1633
       1633
       -
             license = licenses.bsd3;

     

       1634
       1634
       -
           };

     

       1635
       1635
       -
         };

     

       1636
       1636
       -
       

     

       1607
       1607
       +
         binaryornot = callPackage ../development/python-modules/binaryornot { };

     

       1637
       1608
        
       

     

       1638
       1609
        
         bitbucket_api = buildPythonPackage rec {

     

       1639
       1610
        
           name = "bitbucket-api-0.4.4";

     
···

       2791
       2762
        
             maintainers = [ stdenv.lib.maintainers.tv ];

     

       2792
       2763
        
           };

     

       2793
       2764
        
         };

     

       2765
       2765
       +
       

     

       2766
       2766
       +
         miniupnpc = callPackage ../development/python-modules/miniupnpc {};

     

       2794
       2767
        
       

     

       2795
       2768
        
         mixpanel = buildPythonPackage rec {

     

       2796
       2769
        
           version = "4.0.2";

     
···

       4396
       4369
        
           };

     

       4397
       4370
        
         };

     

       4398
       4371
        
       

     

       4399
       4399
       -
         ftputil = buildPythonPackage rec {

     

       4400
       4400
       -
           version = "3.3";

     

       4401
       4401
       -
           name = "ftputil-${version}";

     

       4402
       4402
       -
       

     

       4403
       4403
       -
           src = pkgs.fetchurl {

     

       4404
       4404
       -
             url = "mirror://pypi/f/ftputil/${name}.tar.gz";

     

       4405
       4405
       -
             sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b";

     

       4406
       4406
       -
           };

     

       4407
       4407
       -
       

     

       4408
       4408
       -
           disabled = isPy3k;

     

       4409
       4409
       -
       

     

       4410
       4410
       -
           meta = {

     

       4411
       4411
       -
             description = "High-level FTP client library (virtual file system and more)";

     

       4412
       4412
       -
             homepage    = https://pypi.python.org/pypi/ftputil;

     

       4413
       4413
       -
             platforms   = platforms.linux;

     

       4414
       4414
       -
             license     = licenses.bsd2; # "Modified BSD license, says pypi"

     

       4415
       4415
       -
           };

     

       4416
       4416
       -
         };

     

       4372
       4372
       +
         ftputil = callPackage ../development/python-modules/ftputil { };

     

       4417
       4373
        
       

     

       4418
       4374
        
         fudge = buildPythonPackage rec {

     

       4419
       4375
        
           name = "fudge-1.1.0";

     
···

       7016
       6972
        
           };

     

       7017
       6973
        
         };

     

       7018
       6974
        
       

     

       6975
       6975
       +
         dj-database-url = callPackage ../development/python-modules/dj-database-url { };

     

       6976
       6976
       +
       

     

       7019
       6977
        
         djmail = callPackage ../development/python-modules/djmail { };

     

       7020
       6978
        
       

     

       7021
       6979
        
         pillowfight = buildPythonPackage rec {

     
···

       7108
       7066
        
       

     

       7109
       7067
        
         hg-git = buildPythonPackage rec {

     

       7110
       7068
        
           name = "hg-git-${version}";

     

       7111
       7111
       -
           version = "0.8.10";

     

       7069
       7069
       +
           version = "0.8.11";

     

       7112
       7070
        
           disabled = isPy3k;

     

       7113
       7071
        
       

     

       7114
       7072
        
           src = pkgs.fetchurl {

     

       7115
       7073
        
             url = "mirror://pypi/h/hg-git/${name}.tar.gz";

     

       7116
       7116
       -
             sha256 = "03dzcs4l7hzq59sgjhngxgmi34xfyd7jcxyjl0f68rwq8b1yqrp3";

     

       7074
       7074
       +
             sha256 = "08kw1sj3sq1q1571hwkc51w20ks9ysmlg93pcnmd6gr66bz02dyn";

     

       7117
       7075
        
           };

     

       7118
       7076
        
       

     

       7119
       7077
        
           propagatedBuildInputs = with self; [ dulwich ];

     
···

       7122
       7080
        
             description = "Push and pull from a Git server using Mercurial";

     

       7123
       7081
        
             homepage = http://hg-git.github.com/;

     

       7124
       7082
        
             maintainers = with maintainers; [ koral ];

     

       7083
       7083
       +
             license = stdenv.lib.licenses.gpl2;

     

       7125
       7084
        
           };

     

       7126
       7085
        
         };

     

       7127
       7086
        
       

     
···

       9083
       9042
        
           };

     

       9084
       9043
        
         };

     

       9085
       9044
        
       

     

       9086
       9086
       -
         konfig = buildPythonPackage rec {

     

       9087
       9087
       -
           name = "konfig-${version}";

     

       9088
       9088
       -
           version = "1.1";

     

       9089
       9089
       -
       

     

       9090
       9090
       -
           # konfig unconditionaly depend on configparser, even if it is part of

     

       9091
       9091
       -
           # the standard library in python 3.2 or above.

     

       9092
       9092
       -
           disabled = isPy3k;

     

       9093
       9093
       -
       

     

       9094
       9094
       -
           src = pkgs.fetchgit {

     

       9095
       9095
       -
             url = https://github.com/mozilla-services/konfig.git;

     

       9096
       9096
       -
             rev = "refs/tags/${version}";

     

       9097
       9097
       -
             sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c";

     

       9098
       9098
       -
           };

     

       9099
       9099
       -
       

     

       9100
       9100
       -
           propagatedBuildInputs = with self; [ configparser six ];

     

       9101
       9101
       -
       

     

       9102
       9102
       -
           patches = [ (pkgs.writeText "konfig.patch" ''

     

       9103
       9103
       -
             diff --git a/setup.py b/setup.py

     

       9104
       9104
       -
             index 96fd858..bb4db06 100644

     

       9105
       9105
       -
             --- a/setup.py

     

       9106
       9106
       -
             +++ b/setup.py

     

       9107
       9107
       -
             @@ -20,7 +20,7 @@ setup(name='konfig',

     

       9108
       9108
       -
                    author_email="tarek@mozilla.com",

     

       9109
       9109
       -
                    include_package_data=True,

     

       9110
       9110
       -
                    install_requires = [

     

       9111
       9111
       -
             -        'configparser', 'argparse', 'six'

     

       9112
       9112
       -
             +        'configparser', 'six'

     

       9113
       9113
       -
                    ],

     

       9114
       9114
       -
                    zip_safe=False,

     

       9115
       9115
       -
                    classifiers=classifiers,

     

       9116
       9116
       -
           '') ];

     

       9117
       9117
       -
       

     

       9118
       9118
       -
           meta = {

     

       9119
       9119
       -
             description = "Yet Another Config Parser";

     

       9120
       9120
       -
             homepage    = "https://github.com/mozilla-services/konfig";

     

       9121
       9121
       -
             license     = licenses.mpl20;

     

       9122
       9122
       -
           };

     

       9123
       9123
       -
         };

     

       9045
       9045
       +
         konfig = callPackage ../development/python-modules/konfig { };

     

       9124
       9046
        
       

     

       9125
       9047
        
         kitchen = callPackage ../development/python-modules/kitchen/default.nix { };

     

       9126
       9048
        
       

     
···

       9789
       9711
        
             license = licenses.mit;

     

       9790
       9712
        
           };

     

       9791
       9713
        
         };

     

       9714
       9714
       +
       

     

       9715
       9715
       +
         mozterm = callPackage ../development/python-modules/mozterm { };

     

       9792
       9716
        
       

     

       9793
       9717
        
         mplleaflet = callPackage ../development/python-modules/mplleaflet { };

     

       9794
       9718
        
       

     
···

       10504
       10428
        
       

     

       10505
       10429
        
         mysql-connector = callPackage ../development/python-modules/mysql-connector { };

     

       10506
       10430
        
       

     

       10507
       10507
       -
         mysql_connector_repackaged = buildPythonPackage rec {

     

       10508
       10508
       -
           name = "mysql-connector-repackaged-0.3.1";

     

       10509
       10509
       -
       

     

       10510
       10510
       -
           src = pkgs.fetchurl {

     

       10511
       10511
       -
             url = "mirror://pypi/m/mysql-connector-repackaged/${name}.tar.gz";

     

       10512
       10512
       -
             sha256 = "170fbf11c54def1b5fcc919be0a890b760bb2eca81f56123a5dda0c69b5b099e";

     

       10513
       10513
       -
           };

     

       10514
       10514
       -
       

     

       10515
       10515
       -
           # Judging from SyntaxError

     

       10516
       10516
       -
           disabled = isPy3k;

     

       10517
       10517
       -
       

     

       10518
       10518
       -
           meta = {

     

       10519
       10519
       -
             maintainers = with maintainers; [ garbas domenkozar ];

     

       10520
       10520
       -
             platforms = platforms.linux;

     

       10521
       10521
       -
           };

     

       10522
       10522
       -
         };

     

       10523
       10523
       -
       

     

       10524
       10524
       -
       

     

       10525
       10431
        
         namebench = buildPythonPackage (rec {

     

       10526
       10432
        
           name = "namebench-1.3.1";

     

       10527
       10433
        
           disabled = isPy3k || isPyPy;

     
···

       11555
       11461
        
           };

     

       11556
       11462
        
         };

     

       11557
       11463
        
       

     

       11558
       11558
       -
         ldappool = buildPythonPackage rec {

     

       11559
       11559
       -
           name = "ldappool-${version}";

     

       11560
       11560
       -
           version = "1.0";

     

       11561
       11561
       -
       

     

       11562
       11562
       -
           src = pkgs.fetchurl {

     

       11563
       11563
       -
             url = "mirror://pypi/l/ldappool/${name}.tar.gz";

     

       11564
       11564
       -
             sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";

     

       11565
       11565
       -
           };

     

       11566
       11566
       -
       

     

       11567
       11567
       -
           # Judging from SyntaxError

     

       11568
       11568
       -
           disabled = isPy3k;

     

       11569
       11569
       -
       

     

       11570
       11570
       -
           meta = with stdenv.lib; {

     

       11571
       11571
       -
             homepage = "https://github.com/mozilla-services/ldappool";

     

       11572
       11572
       -
           };

     

       11573
       11573
       -
         };

     

       11574
       11574
       -
       

     

       11464
       11464
       +
         ldappool = callPackage ../development/python-modules/ldappool { };

     

       11575
       11465
        
       

     

       11576
       11466
        
         lz4 = buildPythonPackage rec {

     

       11577
       11467
        
           name = "lz4-0.8.2";

     
···

       11699
       11589
        
       

     

       11700
       11590
        
         doc8 = callPackage ../development/python-modules/doc8 { };

     

       11701
       11591
        
       

     

       11702
       11702
       -
         wrapt = buildPythonPackage rec {

     

       11703
       11703
       -
           name = "wrapt-${version}";

     

       11704
       11704
       -
           version = "1.10.5";

     

       11705
       11705
       -
       

     

       11706
       11706
       -
           # No tests in archive

     

       11707
       11707
       -
           doCheck = false;

     

       11708
       11708
       -
       

     

       11709
       11709
       -
           src = pkgs.fetchurl {

     

       11710
       11710
       -
             url = "mirror://pypi/w/wrapt/${name}.tar.gz";

     

       11711
       11711
       -
             sha256 = "0cq8rlpzkxzk48b50yrfhzn1d1hrq4gjcdqlrgq4v5palgiv9jwr";

     

       11712
       11712
       -
           };

     

       11713
       11713
       -
         };

     

       11592
       11592
       +
         wrapt = callPackage ../development/python-modules/wrapt { };

     

       11714
       11593
        
       

     

       11715
       11594
        
         pagerduty = buildPythonPackage rec {

     

       11716
       11595
        
           name = "pagerduty-${version}";

     
···

       12921
       12800
        
           };

     

       12922
       12801
        
         });

     

       12923
       12802
        
       

     

       12924
       12924
       -
         pycups = buildPythonPackage rec {

     

       12925
       12925
       -
           name = "pycups-${version}";

     

       12926
       12926
       -
           version = "1.9.73";

     

       12927
       12927
       -
       

     

       12928
       12928
       -
           src = pkgs.fetchurl {

     

       12929
       12929
       -
             url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2";

     

       12930
       12930
       -
             sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335";

     

       12931
       12931
       -
           };

     

       12932
       12932
       -
       

     

       12933
       12933
       -
           buildInputs = [ pkgs.cups ];

     

       12934
       12934
       -
       

     

       12935
       12935
       -
           # Wants to connect to CUPS

     

       12936
       12936
       -
           doCheck = false;

     

       12937
       12937
       -
       

     

       12938
       12938
       -
           meta = {

     

       12939
       12939
       -
             description = "Python bindings for libcups";

     

       12940
       12940
       -
             homepage = http://cyberelk.net/tim/software/pycups/;

     

       12941
       12941
       -
             license = with licenses; [ gpl2Plus ];

     

       12942
       12942
       -
           };

     

       12943
       12943
       -
       

     

       12944
       12944
       -
         };

     

       12803
       12803
       +
         pycups = callPackage ../development/python-modules/pycups { };

     

       12945
       12804
        
       

     

       12946
       12805
        
         pycurl = callPackage ../development/python-modules/pycurl { };

     

       12947
       12806
        
       

     
···

       14520
       14379
        
       

     

       14521
       14380
        
         redis = callPackage ../development/python-modules/redis { };

     

       14522
       14381
        
       

     

       14523
       14523
       -
         rednose = buildPythonPackage rec {

     

       14524
       14524
       -
           name = "rednose-${version}";

     

       14525
       14525
       -
           version = "1.2.1";

     

       14526
       14526
       -
       

     

       14527
       14527
       -
           src = pkgs.fetchurl {

     

       14528
       14528
       -
             url = "mirror://pypi/r/rednose/${name}.tar.gz";

     

       14529
       14529
       -
             sha256 = "0b0bsna217lr1nykyhl5fgjly15zhdvqd4prg4wy1zrgfv7al6m0";

     

       14530
       14530
       -
           };

     

       14531
       14531
       -
       

     

       14532
       14532
       -
           meta = {

     

       14533
       14533
       -
             description = "A python nose plugin adding color to console results.";

     

       14534
       14534
       -
           };

     

       14535
       14535
       -
       

     

       14536
       14536
       -
           buildInputs = with self; [ nose six ];

     

       14537
       14537
       -
           propagatedBuildInputs = with self; [ colorama termstyle ];

     

       14538
       14538
       -
         };

     

       14382
       14382
       +
         rednose = callPackage ../development/python-modules/rednose { };

     

       14539
       14383
        
       

     

       14540
       14384
        
         reikna = callPackage ../development/python-modules/reikna { };

     

       14541
       14385
        
       

     
···

       15460
       15304
        
       

     

       15461
       15305
        
         stevedore = callPackage ../development/python-modules/stevedore {};

     

       15462
       15306
        
       

     

       15307
       15307
       +
         text-unidecode = callPackage ../development/python-modules/text-unidecode { };

     

       15308
       15308
       +
       

     

       15463
       15309
        
         Theano = callPackage ../development/python-modules/Theano rec {

     

       15464
       15310
        
           cudaSupport = pkgs.config.cudaSupport or false;

     

       15465
       15311
        
           cudnnSupport = cudaSupport;

     
···

       15643
       15489
        
             };

     

       15644
       15490
        
           in if isPy3k then py3 else py2;

     

       15645
       15491
        
       

     

       15646
       15646
       -
         pythondaemon = buildPythonPackage rec {

     

       15647
       15647
       -
           name = "python-daemon-${version}";

     

       15648
       15648
       -
           version = "2.1.1";

     

       15649
       15649
       -
       

     

       15650
       15650
       -
           src = pkgs.fetchurl {

     

       15651
       15651
       -
             url = "mirror://pypi/p/python-daemon/${name}.tar.gz";

     

       15652
       15652
       -
             sha256 = "17v80qb98p1gv4j9mq6wb55cv7hc4j1hzw5y2f4s5hrpxs3w3a2q";

     

       15653
       15653
       -
           };

     

       15654
       15654
       -
       

     

       15655
       15655
       -
           # A test fail within chroot builds.

     

       15656
       15656
       -
           doCheck = false;

     

       15657
       15657
       -
       

     

       15658
       15658
       -
           buildInputs = with self; [ mock testscenarios ];

     

       15659
       15659
       -
           propagatedBuildInputs = with self; [ docutils lockfile ];

     

       15660
       15660
       -
       

     

       15661
       15661
       -
           meta = {

     

       15662
       15662
       -
             description = "Library to implement a well-behaved Unix daemon process";

     

       15663
       15663
       -
             homepage = https://alioth.debian.org/projects/python-daemon/;

     

       15664
       15664
       -
             license = [ licenses.gpl3Plus licenses.asl20 ];

     

       15665
       15665
       -
           };

     

       15666
       15666
       -
         };

     

       15492
       15492
       +
         pythondaemon = callPackage ../development/python-modules/python-daemon { };

     

       15667
       15493
        
       

     

       15668
       15494
        
         sympy = callPackage ../development/python-modules/sympy { };

     

       15669
       15495
        
       

     
···

       16718
       16544
        
           };

     

       16719
       16545
        
         };

     

       16720
       16546
        
       

     

       16721
       16721
       -
         tmdb3 = buildPythonPackage rec {

     

       16722
       16722
       -
           name = "tmdb3-${version}";

     

       16723
       16723
       -
           version = "0.6.17";

     

       16724
       16724
       -
       

     

       16725
       16725
       -
           src = pkgs.fetchurl {

     

       16726
       16726
       -
             url = "mirror://pypi/t/tmdb3/${name}.zip";

     

       16727
       16727
       -
             sha256 = "64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972";

     

       16728
       16728
       -
           };

     

       16729
       16729
       -
       

     

       16730
       16730
       -
           meta = {

     

       16731
       16731
       -
             description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";

     

       16732
       16732
       -
             homepage = https://pypi.python.org/pypi/tmdb3;

     

       16733
       16733
       -
             license = licenses.bsd3;

     

       16734
       16734
       -
           };

     

       16735
       16735
       -
         };

     

       16547
       16547
       +
         tmdb3 = callPackage ../development/python-modules/tmdb3 { };

     

       16736
       16548
        
       

     

       16737
       16549
        
         toolz = callPackage ../development/python-modules/toolz { };

     

       16738
       16550
        
       

     
···

       17261
       17073
        
       

     

       17262
       17074
        
         virtkey = callPackage ../development/python-modules/virtkey { };

     

       17263
       17075
        
       

     

       17264
       17264
       -
         virtual-display = buildPythonPackage rec {

     

       17265
       17265
       -
           name = "PyVirtualDisplay-0.1.5";

     

       17266
       17266
       -
       

     

       17267
       17267
       -
           propagatedBuildInputs = with self; [ EasyProcess ];

     

       17268
       17268
       -
       

     

       17269
       17269
       -
           src = pkgs.fetchurl {

     

       17270
       17270
       -
             url = "mirror://pypi/P/PyVirtualDisplay/${name}.tar.gz";

     

       17271
       17271
       -
             sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53";

     

       17272
       17272
       -
           };

     

       17273
       17273
       -
       

     

       17274
       17274
       -
           meta = {

     

       17275
       17275
       -
             description = "Python wrapper for Xvfb, Xephyr and Xvnc";

     

       17276
       17276
       -
             homepage = "https://github.com/ponty/pyvirtualdisplay";

     

       17277
       17277
       -
             license = licenses.bsdOriginal;

     

       17278
       17278
       -
             maintainers = with maintainers; [ layus ];

     

       17279
       17279
       -
           };

     

       17280
       17280
       -
         };

     

       17076
       17076
       +
         virtual-display = callPackage ../development/python-modules/virtual-display { };

     

       17281
       17077
        
       

     

       17282
       17078
        
         virtualenv = callPackage ../development/python-modules/virtualenv { };

     

       17283
       17079
        
       

     
···

       17744
       17540
        
       

     

       17745
       17541
        
         persistent = callPackage ../development/python-modules/persistent {};

     

       17746
       17542
        
       

     

       17747
       17747
       -
         xdot = buildPythonPackage rec {

     

       17748
       17748
       -
           name = "xdot-0.9";

     

       17749
       17749
       -
       

     

       17750
       17750
       -
           src = pkgs.fetchurl {

     

       17751
       17751
       -
             url = "mirror://pypi/x/xdot/${name}.tar.gz";

     

       17752
       17752
       -
             sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3";

     

       17753
       17753
       -
           };

     

       17754
       17754
       -
       

     

       17755
       17755
       -
           nativeBuildInputs = with pkgs; [ wrapGAppsHook ];

     

       17756
       17756
       -
           propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pygobject3 pkgs.graphviz pkgs.gnome3.gtk ];

     

       17757
       17757
       -
       

     

       17758
       17758
       -
           meta = {

     

       17759
       17759
       -
             description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";

     

       17760
       17760
       -
             homepage = https://github.com/jrfonseca/xdot.py;

     

       17761
       17761
       -
             license = licenses.lgpl3Plus;

     

       17762
       17762
       -
           };

     

       17763
       17763
       -
         };

     

       17543
       17543
       +
         xdot = callPackage ../development/python-modules/xdot { };

     

       17764
       17544
        
       

     

       17765
       17545
        
         zetup = callPackage ../development/python-modules/zetup { };

     

       17766
       17546
        
       

     
···

       18134
       17914
        
           propagatedBuildInputs = with self; [ requests webob ];

     

       18135
       17915
        
         };

     

       18136
       17916
        
       

     

       18137
       18137
       -
         tunigo = buildPythonPackage rec {

     

       18138
       18138
       -
           name = "tunigo-${version}";

     

       18139
       18139
       -
           version = "1.0.0";

     

       18140
       18140
       -
           propagatedBuildInputs = with self; [ requests ];

     

       18141
       18141
       -
       

     

       18142
       18142
       -
           src = pkgs.fetchFromGitHub {

     

       18143
       18143
       -
             owner = "trygveaa";

     

       18144
       18144
       -
             repo = "python-tunigo";

     

       18145
       18145
       -
             rev = "v${version}";

     

       18146
       18146
       -
             sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";

     

       18147
       18147
       -
           };

     

       18148
       18148
       -
       

     

       18149
       18149
       -
           buildInputs = with self; [ mock nose ];

     

       18150
       18150
       -
       

     

       18151
       18151
       -
           meta = {

     

       18152
       18152
       -
             description = "Python API for the browse feature of Spotify";

     

       18153
       18153
       -
             homepage = https://github.com/trygveaa/python-tunigo;

     

       18154
       18154
       -
             license = licenses.asl20;

     

       18155
       18155
       -
           };

     

       18156
       18156
       -
         };

     

       17917
       17917
       +
         tunigo = callPackage ../development/python-modules/tunigo { };

     

       18157
       17918
        
       

     

       18158
       17919
        
         tarman = buildPythonPackage rec {

     

       18159
       17920
        
           version = "0.1.3";

     
···

       18510
       18271
        
       

     

       18511
       18272
        
         pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; };

     

       18512
       18273
        
       

     

       18513
       18513
       -
         BlinkStick = buildPythonPackage rec {

     

       18514
       18514
       -
           name = "BlinkStick-${version}";

     

       18515
       18515
       -
           version = "1.1.8";

     

       18516
       18516
       -
       

     

       18517
       18517
       -
           src = pkgs.fetchurl {

     

       18518
       18518
       -
             url = "mirror://pypi/B/BlinkStick/${name}.tar.gz";

     

       18519
       18519
       -
             sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";

     

       18520
       18520
       -
           };

     

       18521
       18521
       -
       

     

       18522
       18522
       -
           # Requires pyusb 1.0.0b1.

     

       18523
       18523
       -
           # Likely current pyusb will work but we need to patch the hard requirement then.

     

       18524
       18524
       -
           broken = true;

     

       18525
       18525
       -
       

     

       18526
       18526
       -
           patchPhase = "substituteInPlace setup.py --replace pyusb==1.0.0b1 pyusb==1.0.0";

     

       18527
       18527
       -
       

     

       18528
       18528
       -
           propagatedBuildInputs = with self; [ pyusb ];

     

       18529
       18529
       -
       

     

       18530
       18530
       -
           meta = {

     

       18531
       18531
       -
             description = "Python package to control BlinkStick USB devices";

     

       18532
       18532
       -
             homepage = https://pypi.python.org/pypi/BlinkStick/;

     

       18533
       18533
       -
             license = licenses.bsd3;

     

       18534
       18534
       -
             maintainers = with maintainers; [ np ];

     

       18535
       18535
       -
           };

     

       18536
       18536
       -
         };

     

       18274
       18274
       +
         BlinkStick = callPackage ../development/python-modules/blinkstick { };

     

       18537
       18275
        
       

     

       18538
       18276
        
         usbtmc = callPackage ../development/python-modules/usbtmc {};

     

       18539
       18277
        
       

     
···

       20170
       19908
        
           };

     

       20171
       19909
        
         };

     

       20172
       19910
        
       

     

       20173
       20173
       -
         termstyle = buildPythonPackage rec {

     

       20174
       20174
       -
           name = "python-termstyle-${version}";

     

       20175
       20175
       -
           version = "0.1.10";

     

       20176
       20176
       -
           src = pkgs.fetchurl {

     

       20177
       20177
       -
             url = "mirror://pypi/p/python-termstyle/${name}.tar.gz";

     

       20178
       20178
       -
             sha256 = "1qllzkx1alf14zcfapppf8w87si4cpa7lgjmdp3f5idzdyqnnapl";

     

       20179
       20179
       -
           };

     

       20180
       20180
       -
       

     

       20181
       20181
       -
           meta = {

     

       20182
       20182
       -
             description = "Console colouring for python";

     

       20183
       20183
       -
             homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10";

     

       20184
       20184
       -
             license = licenses.bsdOriginal;

     

       20185
       20185
       -
           };

     

       20186
       20186
       -
       

     

       20187
       20187
       -
         };

     

       20188
       20188
       -
       

     

       20189
       20189
       -
         green = buildPythonPackage rec {

     

       20190
       20190
       -
           name = "green-${version}";

     

       20191
       20191
       -
           version = "2.3.0";

     

       20192
       20192
       -
           src = pkgs.fetchurl {

     

       20193
       20193
       -
             url = "mirror://pypi/g/green/${name}.tar.gz";

     

       20194
       20194
       -
             sha256 = "1888khfl9yxb8yfxq9b48dxwplqlxx8s0l530z5j7c6bx74v08b4";

     

       20195
       20195
       -
           };

     

       19911
       19911
       +
         termstyle = callPackage ../development/python-modules/termstyle { };

     

       20196
       19912
        
       

     

       20197
       20197
       -
           propagatedBuildInputs = with self; [ termstyle colorama ];

     

       20198
       20198
       -
           buildInputs = with self; [ mock ];

     

       20199
       20199
       -
       

     

       20200
       20200
       -
           meta = {

     

       20201
       20201
       -
             description = "Python test runner";

     

       20202
       20202
       -
             homepage = "https://github.com/CleanCut/green";

     

       20203
       20203
       -
             license = licenses.mit;

     

       20204
       20204
       -
           };

     

       20205
       20205
       -
         };

     

       19913
       19913
       +
         green = callPackage ../development/python-modules/green { };

     

       20206
       19914
        
       

     

       20207
       19915
        
         topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22

     

       20208
       19916
        
       

     
···

       20883
       20591
        
       

     

       20884
       20592
        
         whitenoise = callPackage ../development/python-modules/whitenoise { };

     

       20885
       20593
        
       

     

       20886
       20886
       -
         wp_export_parser = buildPythonPackage rec {

     

       20887
       20887
       -
           name = "${pname}-${version}";

     

       20888
       20888
       -
           pname = "wp_export_parser";

     

       20889
       20889
       -
           version = "1.0";

     

       20890
       20890
       -
           src = pkgs.fetchFromGitHub {

     

       20891
       20891
       -
             owner = "RealGeeks";

     

       20892
       20892
       -
             repo = "wp_export_parser";

     

       20893
       20893
       -
             rev = "479211f6c5a7d034fd77762dfed381c3315cd773";

     

       20894
       20894
       -
             sha256 = "1ad0mkixc0s86djwsvhp1qlvcfs25086nh0qw7bys49gz8shczzi";

     

       20895
       20895
       -
           };

     

       20896
       20896
       -
         };

     

       20897
       20897
       -
       

     

       20898
       20594
        
         XlsxWriter = callPackage ../development/python-modules/XlsxWriter { };

     

       20899
       20595
        
       

     

       20900
       20596
        
         yowsup = callPackage ../development/python-modules/yowsup { };

     
···

       20950
       20646
        
       

     

       20951
       20647
        
         thinc = callPackage ../development/python-modules/thinc { };

     

       20952
       20648
        
       

     

       20649
       20649
       +
         yahooweather = callPackage ../development/python-modules/yahooweather { };

     

       20650
       20650
       +
       

     

       20953
       20651
        
         spacy = callPackage ../development/python-modules/spacy { };

     

       20954
       20652
        
       

     

       20955
       20653
        
         spacy_models = callPackage ../development/python-modules/spacy/models.nix { };

     

       20654
       20654
       +
       

     

       20655
       20655
       +
         sseclient = callPackage ../development/python-modules/sseclient { };

     

       20956
       20656
        
       

     

       20957
       20657
        
         textacy = callPackage ../development/python-modules/textacy { };

     

       20958
       20658

-1

pkgs/top-level/release-small.nix

···

       48
       48
        
         gcj = linux;

     

       49
       49
        
         glibc = linux;

     

       50
       50
        
         glibcLocales = linux;

     

       51
       51
       -
         gnat = linux;

     

       52
       51
        
         gnugrep = all;

     

       53
       52
        
         gnum4 = all;

     

       54
       53
        
         gnumake = all;