commit 6b6a57574828b21632a7b8ff3a99e1465035b93e · pyrox.dev/nixpkgs

+2 -2

nixos/doc/manual/configuration/linux-kernel.xml

···

       50
        
       <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];

     

       51
        
       </programlisting>

     

       52
        
         If the module is required early during the boot (e.g. to mount the root file

     

       53
       -
         system), you can use <xref linkend="opt-boot.initrd.extraKernelModules"/>:

     

       54
        
       <programlisting>

     

       55
       -
       <xref linkend="opt-boot.initrd.extraKernelModules"/> = [ "cifs" ];

     

       56
        
       </programlisting>

     

       57
        
         This causes the specified modules and their dependencies to be added to the

     

       58
        
         initial ramdisk.

···

       50
        
       <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];

     

       51
        
       </programlisting>

     

       52
        
         If the module is required early during the boot (e.g. to mount the root file

     

       53
       +
         system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>:

     

       54
        
       <programlisting>

     

       55
       +
       <xref linkend="opt-boot.initrd.kernelModules"/> = [ "cifs" ];

     

       56
        
       </programlisting>

     

       57
        
         This causes the specified modules and their dependencies to be added to the

     

       58
        
         initial ramdisk.

+4 -1

nixos/doc/manual/release-notes/rl-1809.xml

···

       53
        
       

     

       54
        
         <itemizedlist>

     

       55
        
          <listitem>

     

       56
       -
           <para></para>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       57
        
          </listitem>

     

       58
        
         </itemizedlist>

     

       59
        
        </section>

···

       53
        
       

     

       54
        
         <itemizedlist>

     

       55
        
          <listitem>

     

       56
       +
            <para>When enabled the <literal>iproute2</literal> will copy the files

     

       57
       +
              expected by ip route (e.g., <filename>rt_tables</filename>) in

     

       58
       +
              <filename>/run/iproute2</filename>. This allows to write aliases for

     

       59
       +
              routing tables for instance.</para>

     

       60
        
          </listitem>

     

       61
        
         </itemizedlist>

     

       62
        
        </section>

+23

nixos/modules/config/iproute2.nix

···

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

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       

     

       5
       +
       let

     

       6
       +
         cfg = config.networking.iproute2;

     

       7
       +
         confDir = "/run/iproute2";

     

       8
       +
       in

     

       9
       +
       {

     

       10
       +
         options.networking.iproute2.enable = mkEnableOption "copy IP route configuration files";

     

       11
       +
       

     

       12
       +
         config = mkMerge [

     

       13
       +
           ({ nixpkgs.config.iproute2.confDir = confDir; })

     

       14
       +
       

     

       15
       +
           (mkIf cfg.enable {

     

       16
       +
             system.activationScripts.iproute2 = ''

     

       17
       +
               cp -R ${pkgs.iproute}/etc/iproute2 ${confDir}

     

       18
       +
               chmod -R 664 ${confDir}

     

       19
       +
               chmod +x ${confDir}

     

       20
       +
             '';

     

       21
       +
           })

     

       22
       +
         ];

     

       23
       +
       }

nixos/modules/module-list.nix

···

       9
        
         ./config/fonts/ghostscript.nix

     

       10
        
         ./config/gnu.nix

     

       11
        
         ./config/i18n.nix

     

       0
        
       
     

       12
        
         ./config/krb5/default.nix

     

       13
        
         ./config/ldap.nix

     

       14
        
         ./config/networking.nix

     
···

       214
        
         ./services/desktops/accountsservice.nix

     

       215
        
         ./services/desktops/dleyna-renderer.nix

     

       216
        
         ./services/desktops/dleyna-server.nix

     

       0
        
       
     

       217
        
         ./services/desktops/geoclue2.nix

     

       218
        
         ./services/desktops/pipewire.nix

     

       219
        
         ./services/desktops/gnome3/at-spi2-core.nix

     
···

       649
        
         ./services/web-apps/tt-rss.nix

     

       650
        
         ./services/web-apps/selfoss.nix

     

       651
        
         ./services/web-apps/quassel-webserver.nix

     

       0
        
       
     

       652
        
         ./services/web-servers/apache-httpd/default.nix

     

       653
        
         ./services/web-servers/caddy.nix

     

       654
        
         ./services/web-servers/fcgiwrap.nix

···

       9
        
         ./config/fonts/ghostscript.nix

     

       10
        
         ./config/gnu.nix

     

       11
        
         ./config/i18n.nix

     

       12
       +
         ./config/iproute2.nix

     

       13
        
         ./config/krb5/default.nix

     

       14
        
         ./config/ldap.nix

     

       15
        
         ./config/networking.nix

     
···

       215
        
         ./services/desktops/accountsservice.nix

     

       216
        
         ./services/desktops/dleyna-renderer.nix

     

       217
        
         ./services/desktops/dleyna-server.nix

     

       218
       +
         ./services/desktops/flatpak.nix

     

       219
        
         ./services/desktops/geoclue2.nix

     

       220
        
         ./services/desktops/pipewire.nix

     

       221
        
         ./services/desktops/gnome3/at-spi2-core.nix

     
···

       651
        
         ./services/web-apps/tt-rss.nix

     

       652
        
         ./services/web-apps/selfoss.nix

     

       653
        
         ./services/web-apps/quassel-webserver.nix

     

       654
       +
         ./services/web-apps/youtrack.nix

     

       655
        
         ./services/web-servers/apache-httpd/default.nix

     

       656
        
         ./services/web-servers/caddy.nix

     

       657
        
         ./services/web-servers/fcgiwrap.nix

+52

nixos/modules/services/desktops/flatpak.nix

···

       1
       +
       # flatpak service.

     

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

     

       3
       +
       

     

       4
       +
       with lib;

     

       5
       +
       

     

       6
       +
       let

     

       7
       +
         cfg = config.services.flatpak;

     

       8
       +
       in {

     

       9
       +
         meta = {

     

       10
       +
           doc = ./flatpak.xml;

     

       11
       +
           maintainers = pkgs.flatpak.meta.maintainers;

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         ###### interface

     

       15
       +
         options = {

     

       16
       +
           services.flatpak = {

     

       17
       +
             enable = mkEnableOption "flatpak";

     

       18
       +
       

     

       19
       +
             extraPortals = mkOption {

     

       20
       +
               type = types.listOf types.package;

     

       21
       +
               default = [];

     

       22
       +
               description = ''

     

       23
       +
                 List of additional portals to add to path. Portals allow interaction

     

       24
       +
                 with system, like choosing files or taking screenshots. At minimum,

     

       25
       +
                 a desktop portal implementation should be listed. GNOME already

     

       26
       +
                 adds <package>xdg-desktop-portal-gtk</package>; for KDE, there

     

       27
       +
                 is <package>xdg-desktop-portal-kde</package>. Other desktop

     

       28
       +
                 environments will probably want to do the same.

     

       29
       +
               '';

     

       30
       +
             };

     

       31
       +
           };

     

       32
       +
         };

     

       33
       +
       

     

       34
       +
       

     

       35
       +
         ###### implementation

     

       36
       +
         config = mkIf cfg.enable {

     

       37
       +
           environment.systemPackages = [ pkgs.flatpak ];

     

       38
       +
       

     

       39
       +
           services.dbus.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;

     

       40
       +
       

     

       41
       +
           systemd.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;

     

       42
       +
       

     

       43
       +
           environment.variables = {

     

       44
       +
             PATH = [

     

       45
       +
               "$HOME/.local/share/flatpak/exports/bin"

     

       46
       +
               "/var/lib/flatpak/exports/bin"

     

       47
       +
             ];

     

       48
       +
       

     

       49
       +
             XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals;

     

       50
       +
           };

     

       51
       +
         };

     

       52
       +
       }

+53

nixos/modules/services/desktops/flatpak.xml

···

       1
       +
       <chapter xmlns="http://docbook.org/ns/docbook"

     

       2
       +
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       3
       +
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       4
       +
                version="5.0"

     

       5
       +
                xml:id="module-services-flatpak">

     

       6
       +
       

     

       7
       +
       <title>Flatpak</title>

     

       8
       +
       

     

       9
       +
       <para><emphasis>Source:</emphasis> <filename>modules/services/desktop/flatpak.nix</filename></para>

     

       10
       +
       

     

       11
       +
       <para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/flatpak/flatpak/wiki"/></para>

     

       12
       +
       

     

       13
       +
       <para>Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.</para>

     

       14
       +
       

     

       15
       +
       <para>

     

       16
       +
         To enable Flatpak, add the following to your <filename>configuration.nix</filename>:

     

       17
       +
       

     

       18
       +
         <programlisting>

     

       19
       +
         <xref linkend="opt-services.flatpak.enable"/> = true;

     

       20
       +
         </programlisting>

     

       21
       +
       </para>

     

       22
       +
       

     

       23
       +
       <para>

     

       24
       +
         For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your <filename>configuration.nix</filename>:

     

       25
       +
       

     

       26
       +
         <programlisting>

     

       27
       +
         <xref linkend="opt-services.flatpak.extraPortals"/> = [ pkgs.xdg-desktop-portal-gtk ];

     

       28
       +
         </programlisting>

     

       29
       +
       </para>

     

       30
       +
       

     

       31
       +
       <para>

     

       32
       +
         Then, you will need to add a repository, for example, <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, either using the following commands:

     

       33
       +
       

     

       34
       +
         <programlisting>

     

       35
       +
         flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo

     

       36
       +
         flatpak update

     

       37
       +
         </programlisting>

     

       38
       +
       

     

       39
       +
         or by opening the <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository file</link> in GNOME Software.

     

       40
       +
       </para>

     

       41
       +
       

     

       42
       +
       <para>

     

       43
       +
         Finally, you can search and install programs:

     

       44
       +
       

     

       45
       +
         <programlisting>

     

       46
       +
         flatpak search bustle

     

       47
       +
         flatpak install flathub org.freedesktop.Bustle

     

       48
       +
         flatpak run org.freedesktop.Bustle

     

       49
       +
         </programlisting>

     

       50
       +
       

     

       51
       +
         Again, GNOME Software offers graphical interface for these tasks.

     

       52
       +
       </para>

     

       53
       +
       </chapter>

+34 -6

nixos/modules/services/web-apps/nexus.nix

···

       42
        
               default = 8081;

     

       43
        
               description = "Port to listen on.";

     

       44
        
             };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
           };

     

       46
        
         };

     

       47
        
       

     
···

       63
        
             environment = {

     

       64
        
               NEXUS_USER = cfg.user;

     

       65
        
               NEXUS_HOME = cfg.home;

     

       0
        
       
     

       0
        
       
     

       66
        
             };

     

       67
        
       

     

       68
        
             preStart = ''

     

       69
        
               mkdir -p ${cfg.home}/nexus3/etc

     

       70
        
       

     

       71
       -
               ln -sf ${cfg.home} /run/sonatype-work

     

       72
       -
       

     

       73
        
               chown -R ${cfg.user}:${cfg.group} ${cfg.home}

     

       74
        
       

     

       75
        
               if [ ! -f ${cfg.home}/nexus3/etc/nexus.properties ]; then

     
···

       77
        
                 echo "application-port=${toString cfg.listenPort}" >> ${cfg.home}/nexus3/etc/nexus.properties

     

       78
        
                 echo "application-host=${toString cfg.listenAddress}" >> ${cfg.home}/nexus3/etc/nexus.properties

     

       79
        
               else

     

       80
       -
                 sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties 

     

       81
       -
                 sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties 

     

       82
       -
                 sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties 

     

       83
       -
                 sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties 

     

       84
        
               fi

     

       85
        
             '';

     

       86

···

       42
        
               default = 8081;

     

       43
        
               description = "Port to listen on.";

     

       44
        
             };

     

       45
       +
       

     

       46
       +
             jvmOpts = mkOption {

     

       47
       +
               type = types.lines;

     

       48
       +
               default = ''

     

       49
       +
                 -Xms1200M

     

       50
       +
                 -Xmx1200M

     

       51
       +
                 -XX:MaxDirectMemorySize=2G

     

       52
       +
                 -XX:+UnlockDiagnosticVMOptions

     

       53
       +
                 -XX:+UnsyncloadClass

     

       54
       +
                 -XX:+LogVMOutput

     

       55
       +
                 -XX:LogFile=${cfg.home}/nexus3/log/jvm.log

     

       56
       +
                 -XX:-OmitStackTraceInFastThrow

     

       57
       +
                 -Djava.net.preferIPv4Stack=true

     

       58
       +
                 -Dkaraf.home=${pkgs.nexus}

     

       59
       +
                 -Dkaraf.base=${pkgs.nexus}

     

       60
       +
                 -Dkaraf.etc=${pkgs.nexus}/etc/karaf

     

       61
       +
                 -Djava.util.logging.config.file=${pkgs.nexus}/etc/karaf/java.util.logging.properties

     

       62
       +
                 -Dkaraf.data=${cfg.home}/nexus3

     

       63
       +
                 -Djava.io.tmpdir=${cfg.home}/nexus3/tmp

     

       64
       +
                 -Dkaraf.startLocalConsole=false

     

       65
       +
               '';

     

       66
       +
       

     

       67
       +
               description = ''

     

       68
       +
                 Options for the JVM written to `nexus.jvmopts`.

     

       69
       +
                 Please refer to the docs (https://help.sonatype.com/repomanager3/installation/configuring-the-runtime-environment)

     

       70
       +
                 for further information.

     

       71
       +
               '';

     

       72
       +
             };

     

       73
        
           };

     

       74
        
         };

     

       75
        
       

     
···

       91
        
             environment = {

     

       92
        
               NEXUS_USER = cfg.user;

     

       93
        
               NEXUS_HOME = cfg.home;

     

       94
       +
       

     

       95
       +
               VM_OPTS_FILE = pkgs.writeText "nexus.vmoptions" cfg.jvmOpts;

     

       96
        
             };

     

       97
        
       

     

       98
        
             preStart = ''

     

       99
        
               mkdir -p ${cfg.home}/nexus3/etc

     

       100
        
       

     

       0
        
       
     

       0
        
       
     

       101
        
               chown -R ${cfg.user}:${cfg.group} ${cfg.home}

     

       102
        
       

     

       103
        
               if [ ! -f ${cfg.home}/nexus3/etc/nexus.properties ]; then

     
···

       105
        
                 echo "application-port=${toString cfg.listenPort}" >> ${cfg.home}/nexus3/etc/nexus.properties

     

       106
        
                 echo "application-host=${toString cfg.listenAddress}" >> ${cfg.home}/nexus3/etc/nexus.properties

     

       107
        
               else

     

       108
       +
                 sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties

     

       109
       +
                 sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties

     

       110
       +
                 sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties

     

       111
       +
                 sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties

     

       112
        
               fi

     

       113
        
             '';

     

       114

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

···

       120
        
           services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center

     

       121
        
           services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];

     

       122
        
           systemd.packages = [ pkgs.gnome3.vino ];

     

       0
        
       
     

       123
        
       

     

       124
        
           # If gnome3 is installed, build vim for gtk3 too.

     

       125
        
           nixpkgs.config.vim.gui = "gtk3";

···

       120
        
           services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center

     

       121
        
           services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];

     

       122
        
           systemd.packages = [ pkgs.gnome3.vino ];

     

       123
       +
           services.flatpak.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];

     

       124
        
       

     

       125
        
           # If gnome3 is installed, build vim for gtk3 too.

     

       126
        
           nixpkgs.config.vim.gui = "gtk3";

+2 -1

nixos/modules/system/boot/plymouth.nix

···

       87
        
       

     

       88
        
           systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ];

     

       89
        
           systemd.services.plymouth-halt.wantedBy = [ "halt.target" ];

     

       0
        
       
     

       90
        
           systemd.services.plymouth-quit = {

     

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

     

       92
       -
             after = [ "display-manager.service" "multi-user.target" ];

     

       93
        
           };

     

       94
        
           systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ];

     

       95
        
           systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ];

···

       87
        
       

     

       88
        
           systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ];

     

       89
        
           systemd.services.plymouth-halt.wantedBy = [ "halt.target" ];

     

       90
       +
           systemd.services.plymouth-quit-wait.wantedBy = [ "multi-user.target" ];

     

       91
        
           systemd.services.plymouth-quit = {

     

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

     

       93
       +
             after = [ "display-manager.service" ];

     

       94
        
           };

     

       95
        
           systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ];

     

       96
        
           systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ];

+12 -5

nixos/modules/system/boot/systemd-lib.nix

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       5
       -
       let cfg = config.systemd; in

     

       6
       -
       

     

       7
       -
       rec {

     

       0
        
       
     

       8
        
       

     

       9
        
         shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);

     

       10
        
       

     
···

       136
        
             for i in ${toString cfg.packages}; do

     

       137
        
               for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do

     

       138
        
                 if ! [[ "$fn" =~ .wants$ ]]; then

     

       139
       -
                   ln -s $fn $out/

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       140
        
                 fi

     

       141
        
               done

     

       142
        
             done

     
···

       151
        
                 if [ "$(readlink -f $i/$fn)" = /dev/null ]; then

     

       152
        
                   ln -sfn /dev/null $out/$fn

     

       153
        
                 else

     

       154
       -
                   mkdir $out/$fn.d

     

       155
        
                   ln -s $i/$fn $out/$fn.d/overrides.conf

     

       156
        
                 fi

     

       157
        
              else

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       5
       +
       let

     

       6
       +
         cfg = config.systemd;

     

       7
       +
         lndir = "${pkgs.xorg.lndir}/bin/lndir";

     

       8
       +
       in rec {

     

       9
        
       

     

       10
        
         shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);

     

       11
        
       

     
···

       137
        
             for i in ${toString cfg.packages}; do

     

       138
        
               for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do

     

       139
        
                 if ! [[ "$fn" =~ .wants$ ]]; then

     

       140
       +
                   if [[ -d "$fn" ]]; then

     

       141
       +
                     targetDir="$out/$(basename "$fn")"

     

       142
       +
                     mkdir -p "$targetDir"

     

       143
       +
                     ${lndir} "$fn" "$targetDir"

     

       144
       +
                   else

     

       145
       +
                     ln -s $fn $out/

     

       146
       +
                   fi

     

       147
        
                 fi

     

       148
        
               done

     

       149
        
             done

     
···

       158
        
                 if [ "$(readlink -f $i/$fn)" = /dev/null ]; then

     

       159
        
                   ln -sfn /dev/null $out/$fn

     

       160
        
                 else

     

       161
       +
                   mkdir -p $out/$fn.d

     

       162
        
                   ln -s $i/$fn $out/$fn.d/overrides.conf

     

       163
        
                 fi

     

       164
        
              else

nixos/release.nix

···

       285
        
         tests.env = callTest tests/env.nix {};

     

       286
        
         tests.ferm = callTest tests/ferm.nix {};

     

       287
        
         tests.firefox = callTest tests/firefox.nix {};

     

       0
        
       
     

       288
        
         tests.firewall = callTest tests/firewall.nix {};

     

       289
        
         tests.fwupd = callTest tests/fwupd.nix {};

     

       290
        
         tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};

     
···

       347
        
         tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };

     

       348
        
         # TODO: put in networking.nix after the test becomes more complete

     

       349
        
         tests.networkingProxy = callTest tests/networking-proxy.nix {};

     

       0
        
       
     

       350
        
         tests.nfs3 = callTest tests/nfs.nix { version = 3; };

     

       351
        
         tests.nfs4 = callTest tests/nfs.nix { version = 4; };

     

       352
        
         tests.nginx = callTest tests/nginx.nix { };

     
···

       397
        
         tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {};

     

       398
        
         tests.wordpress = callTest tests/wordpress.nix {};

     

       399
        
         tests.xautolock = callTest tests/xautolock.nix {};

     

       0
        
       
     

       400
        
         tests.xfce = callTest tests/xfce.nix {};

     

       401
        
         tests.xmonad = callTest tests/xmonad.nix {};

     

       402
        
         tests.xrdp = callTest tests/xrdp.nix {};

···

       285
        
         tests.env = callTest tests/env.nix {};

     

       286
        
         tests.ferm = callTest tests/ferm.nix {};

     

       287
        
         tests.firefox = callTest tests/firefox.nix {};

     

       288
       +
         tests.flatpak = callTest tests/flatpak.nix {};

     

       289
        
         tests.firewall = callTest tests/firewall.nix {};

     

       290
        
         tests.fwupd = callTest tests/fwupd.nix {};

     

       291
        
         tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};

     
···

       348
        
         tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };

     

       349
        
         # TODO: put in networking.nix after the test becomes more complete

     

       350
        
         tests.networkingProxy = callTest tests/networking-proxy.nix {};

     

       351
       +
         tests.nexus = callTest tests/nexus.nix { };

     

       352
        
         tests.nfs3 = callTest tests/nfs.nix { version = 3; };

     

       353
        
         tests.nfs4 = callTest tests/nfs.nix { version = 4; };

     

       354
        
         tests.nginx = callTest tests/nginx.nix { };

     
···

       399
        
         tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {};

     

       400
        
         tests.wordpress = callTest tests/wordpress.nix {};

     

       401
        
         tests.xautolock = callTest tests/xautolock.nix {};

     

       402
       +
         tests.xdg-desktop-portal = callTest tests/xdg-desktop-portal.nix {};

     

       403
        
         tests.xfce = callTest tests/xfce.nix {};

     

       404
        
         tests.xmonad = callTest tests/xmonad.nix {};

     

       405
        
         tests.xrdp = callTest tests/xrdp.nix {};

+23

nixos/tests/flatpak.nix

···

       1
       +
       # run installed tests

     

       2
       +
       import ./make-test.nix ({ pkgs, ... }:

     

       3
       +
       

     

       4
       +
       {

     

       5
       +
         name = "flatpak";

     

       6
       +
         meta = {

     

       7
       +
           maintainers = pkgs.flatpak.meta.maintainers;

     

       8
       +
         };

     

       9
       +
       

     

       10
       +
         machine = { config, pkgs, ... }: {

     

       11
       +
           imports = [ ./common/x11.nix ];

     

       12
       +
           services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work

     

       13
       +
           services.flatpak.enable = true;

     

       14
       +
           environment.systemPackages = with pkgs; [ gnupg gnome-desktop-testing ostree python2 ];

     

       15
       +
           virtualisation.memorySize = 2047;

     

       16
       +
           virtualisation.diskSize = 1024;

     

       17
       +
         };

     

       18
       +
       

     

       19
       +
         testScript = ''

     

       20
       +
           $machine->waitForX();

     

       21
       +
           $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.flatpak.installedTests}/share' --timeout 3600");

     

       22
       +
         '';

     

       23
       +
       })

nixos/tests/installer.nix

···

       241
        
                       nixos-artwork.wallpapers.gnome-dark

     

       242
        
                       perlPackages.XMLLibXML

     

       243
        
                       perlPackages.ListCompare

     

       0
        
       
     

       244
        
       

     

       245
        
                       # add curl so that rather than seeing the test attempt to download

     

       246
        
                       # curl's tarball, we see what it's trying to download

···

       241
        
                       nixos-artwork.wallpapers.gnome-dark

     

       242
        
                       perlPackages.XMLLibXML

     

       243
        
                       perlPackages.ListCompare

     

       244
       +
                       xorg.lndir

     

       245
        
       

     

       246
        
                       # add curl so that rather than seeing the test attempt to download

     

       247
        
                       # curl's tarball, we see what it's trying to download

+7 -9

nixos/tests/nexus.nix

···

       1
        
       # verifies:

     

       2
        
       #   1. nexus service starts on server

     

       3
       -
       #   2. nexus user can be extended on server

     

       4
       -
       #   3. nexus service not can startup on server (creating database and all other initial stuff)

     

       5
        
       

     

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

     

       7
        
         name = "nexus";

     

       8
        
         meta = with pkgs.stdenv.lib.maintainers; {

     

       9
       -
           maintainers = [ ironpinguin ];

     

       10
        
         };

     

       11
        
       

     

       12
        
         nodes = {

     
···

       14
        
           server =

     

       15
        
             { config, pkgs, ... }:

     

       16
        
             { virtualisation.memorySize = 2048;

     

       0
        
       
     

       17
        
       

     

       18
        
               services.nexus.enable = true;

     

       19
       -
       

     

       20
       -
               users.extraUsers.nexus.extraGroups = [ "users" ];

     

       21
        
             };

     

       0
        
       
     

       22
        
         };

     

       23
        
       

     

       24
        
         testScript = ''

     

       25
        
           startAll;

     

       26
        
       

     

       27
        
           $server->waitForUnit("nexus");

     

       28
       -
       

     

       29
       -
           print $server->execute("sudo -u nexus groups");

     

       30
       -
           $server->mustSucceed("sudo -u nexus groups | grep nexus | grep users");

     

       31
       -
       

     

       32
        
           $server->waitForOpenPort(8081);

     

       0
        
       
     

       0
        
       
     

       33
        
         '';

     

       34
        
       })

···

       1
        
       # verifies:

     

       2
        
       #   1. nexus service starts on server

     

       3
       +
       #   2. nexus service can startup on server (creating database and all other initial stuff)

     

       4
       +
       #   3. the web application is reachable via HTTP

     

       5
        
       

     

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

     

       7
        
         name = "nexus";

     

       8
        
         meta = with pkgs.stdenv.lib.maintainers; {

     

       9
       +
           maintainers = [ ironpinguin ma27 ];

     

       10
        
         };

     

       11
        
       

     

       12
        
         nodes = {

     
···

       14
        
           server =

     

       15
        
             { config, pkgs, ... }:

     

       16
        
             { virtualisation.memorySize = 2048;

     

       17
       +
               virtualisation.diskSize = 2048;

     

       18
        
       

     

       19
        
               services.nexus.enable = true;

     

       0
        
       
     

       0
        
       
     

       20
        
             };

     

       21
       +
       

     

       22
        
         };

     

       23
        
       

     

       24
        
         testScript = ''

     

       25
        
           startAll;

     

       26
        
       

     

       27
        
           $server->waitForUnit("nexus");

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
           $server->waitForOpenPort(8081);

     

       29
       +
       

     

       30
       +
           $server->succeed("curl -f 127.0.0.1:8081");

     

       31
        
         '';

     

       32
        
       })

+17

nixos/tests/xdg-desktop-portal.nix

···

       1
       +
       # run installed tests

     

       2
       +
       import ./make-test.nix ({ pkgs, ... }:

     

       3
       +
       

     

       4
       +
       {

     

       5
       +
         name = "xdg-desktop-portal";

     

       6
       +
         meta = {

     

       7
       +
           maintainers = pkgs.xdg-desktop-portal.meta.maintainers;

     

       8
       +
         };

     

       9
       +
       

     

       10
       +
         machine = { config, pkgs, ... }: {

     

       11
       +
           environment.systemPackages = with pkgs; [ gnome-desktop-testing ];

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         testScript = ''

     

       15
       +
           $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.xdg-desktop-portal.installedTests}/share'");

     

       16
       +
         '';

     

       17
       +
       })

+3 -3

pkgs/applications/editors/atom/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       -
         version = "1.26.1";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";

     

       9
       -
           sha256 = "0g83qj9siq1vr2v46rzjf3dy2gns9krh6xlh7w3bhrgfk0vqkm11";

     

       10
        
           name = "${name}.deb";

     

       11
        
         };

     

       12
        
       

     
···

       47
        
           description = "A hackable text editor for the 21st Century";

     

       48
        
           homepage = https://atom.io/;

     

       49
        
           license = licenses.mit;

     

       50
       -
           maintainers = [ maintainers.offline maintainers.nequissimus maintainers.ysndr ];

     

       51
        
           platforms = [ "x86_64-linux" ];

     

       52
        
         };

     

       53
        
       }

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "1.27.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";

     

       9
       +
           sha256 = "1r37s6ndxyib644v7nlgha1pkcnz7kxpmlkhh41l5jp4dpc6iik6";

     

       10
        
           name = "${name}.deb";

     

       11
        
         };

     

       12
        
       

     
···

       47
        
           description = "A hackable text editor for the 21st Century";

     

       48
        
           homepage = https://atom.io/;

     

       49
        
           license = licenses.mit;

     

       50
       +
           maintainers = with maintainers; [ offline nequissimus synthetica ysndr ];

     

       51
        
           platforms = [ "x86_64-linux" ];

     

       52
        
         };

     

       53
        
       }

+10 -10

pkgs/applications/editors/eclipse/default.nix

···

       114
        
         };

     

       115
        
       

     

       116
        
         eclipse-platform-47 = buildEclipse {

     

       117
       -
           name = "eclipse-platform-4.7.2";

     

       118
        
           description = "Eclipse Platform Oxygen";

     

       119
        
           sources = {

     

       120
        
             "x86_64-linux" = fetchurl {

     

       121
       -
                 url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz;

     

       122
       -
                 sha256 = "1zl406brvhh25dkd2pi1kvz5386gzkybpwik03aadpzmjrbm9730";

     

       123
        
               };

     

       124
        
             "i686-linux" = fetchurl {

     

       125
       -
                 url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk.tar.gz;

     

       126
       -
                 sha256 = "0v0i13ah8d8zmcv0ip1ia5ifnfnl76aibiqpv4q4lih5d1qsa79d";

     

       127
        
               };

     

       128
        
           };

     

       129
        
         };

     
···

       168
        
         };

     

       169
        
       

     

       170
        
         eclipse-sdk-47 = buildEclipse {

     

       171
       -
           name = "eclipse-sdk-4.7.2";

     

       172
        
           description = "Eclipse Oxygen Classic";

     

       173
        
           sources = {

     

       174
        
             "x86_64-linux" = fetchurl {

     

       175
       -
                 url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz;

     

       176
       -
                 sha256 = "1j5d72rkl3lq3rpnvq1spsa0zlzbmbkgadfhbz868sqqbavrwbzv";

     

       177
        
               };

     

       178
        
             "i686-linux" = fetchurl {

     

       179
       -
                 url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk.tar.gz;

     

       180
       -
                 sha256 = "117436ni79v1kiync8b3wkfkb8a5rv3sbqp6qnwbmanwkvnyvfvc";

     

       181
        
               };

     

       182
        
           };

     

       183
        
         };

···

       114
        
         };

     

       115
        
       

     

       116
        
         eclipse-platform-47 = buildEclipse {

     

       117
       +
           name = "eclipse-platform-4.7.3a";

     

       118
        
           description = "Eclipse Platform Oxygen";

     

       119
        
           sources = {

     

       120
        
             "x86_64-linux" = fetchurl {

     

       121
       +
               url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz;

     

       122
       +
                 sha512 = "caf86cd6efaf66258c75434f1adf552587a7395d57dba4cfd20f86196308cf942866d931f4b352f9d39a6fbf14444fcd2167e6bfd146a28c96c229bb9988156a";

     

       123
        
               };

     

       124
        
             "i686-linux" = fetchurl {

     

       125
       +
                 url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk.tar.gz;

     

       126
       +
                 sha512 = "c633da467774e4ab40f8d51d07b8e7d8403f26f23365c3c3ceeaeec1039b8c23c7508cee1f786bf52db64c7b84e0f91cb31a2848a74ac8271f8504934407bd5c";

     

       127
        
               };

     

       128
        
           };

     

       129
        
         };

     
···

       168
        
         };

     

       169
        
       

     

       170
        
         eclipse-sdk-47 = buildEclipse {

     

       171
       +
           name = "eclipse-sdk-4.7.3a";

     

       172
        
           description = "Eclipse Oxygen Classic";

     

       173
        
           sources = {

     

       174
        
             "x86_64-linux" = fetchurl {

     

       175
       +
                 url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz;

     

       176
       +
                 sha512 = "d77e42aca16d26526cef32e363d038258bb8a4616d9dbe6e76dd3656dc2217369436390a82555bde4566bbbdb631813bbaca08602f7bb885cb30e8a26a14873f";

     

       177
        
               };

     

       178
        
             "i686-linux" = fetchurl {

     

       179
       +
                 url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk.tar.gz;

     

       180
       +
                 sha512 = "b0b936fd4142ae86ec5c30535cd5e4caf6fe313d814ae5b16f300635e4163a79b748b1eee11792a135114f2265678a74821ec80c2bfd69872769b6d0ccbcde3a";

     

       181
        
               };

     

       182
        
           };

     

       183
        
         };

+3 -3

pkgs/applications/editors/eclipse/plugins.nix

···

       470
        
       

     

       471
        
         jdt = buildEclipseUpdateSite rec {

     

       472
        
           name = "jdt-${version}";

     

       473
       -
           version = "4.7.2";

     

       474
        
       

     

       475
        
           src = fetchzip {

     

       476
        
             stripRoot = false;

     

       477
       -
             url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/org.eclipse.jdt-4.7.2.zip;

     

       478
       -
             sha256 = "1yzqnjs88cdyyqv8f1g8fbfyccci29f3pzxxvaz7szxicwzn59mz";

     

       479
        
           };

     

       480
        
       

     

       481
        
           meta = with stdenv.lib; {

···

       470
        
       

     

       471
        
         jdt = buildEclipseUpdateSite rec {

     

       472
        
           name = "jdt-${version}";

     

       473
       +
           version = "4.7.3a";

     

       474
        
       

     

       475
        
           src = fetchzip {

     

       476
        
             stripRoot = false;

     

       477
       +
             url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/org.eclipse.jdt-4.7.3a.zip;

     

       478
       +
             sha256 = "10dndhqz894xf79zz07dlmkn7k33mn42nbmycr78xz6d2jy8cscx";

     

       479
        
           };

     

       480
        
       

     

       481
        
           meta = with stdenv.lib; {

+2 -2

pkgs/applications/editors/nano/default.nix

···

       20
        
       

     

       21
        
       in stdenv.mkDerivation rec {

     

       22
        
         name = "nano-${version}";

     

       23
       -
         version = "2.9.4";

     

       24
        
       

     

       25
        
         src = fetchurl {

     

       26
        
           url = "mirror://gnu/nano/${name}.tar.xz";

     

       27
       -
           sha256 = "0nm3zy4azr5rkxjq7jfybbj3cnddmvxc49rxyqm9cp2zfdp75y9c";

     

       28
        
         };

     

       29
        
       

     

       30
        
         nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

···

       20
        
       

     

       21
        
       in stdenv.mkDerivation rec {

     

       22
        
         name = "nano-${version}";

     

       23
       +
         version = "2.9.7";

     

       24
        
       

     

       25
        
         src = fetchurl {

     

       26
        
           url = "mirror://gnu/nano/${name}.tar.xz";

     

       27
       +
           sha256 = "1ga4sdk3ikx1ilggc6c77vyfpbmq3nrhg6svgglpf5sv60bv0jmn";

     

       28
        
         };

     

       29
        
       

     

       30
        
         nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

+59

pkgs/applications/misc/multibootusb/default.nix

···

       1
       +
       { lib, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }:

     

       2
       +
       python36Packages.buildPythonApplication rec {

     

       3
       +
         pname = "multibootusb";

     

       4
       +
         name = "${pname}-${version}";

     

       5
       +
         version = "9.2.0";

     

       6
       +
       

     

       7
       +
         buildInputs = [

     

       8
       +
           python36Packages.dbus-python

     

       9
       +
           python36Packages.pyqt5

     

       10
       +
           python36Packages.pytest-shutil

     

       11
       +
           python36Packages.python

     

       12
       +
           python36Packages.pyudev

     

       13
       +
           python36Packages.six

     

       14
       +
           libxcb

     

       15
       +
           mtools

     

       16
       +
           p7zip

     

       17
       +
           parted

     

       18
       +
           procps

     

       19
       +
           qt5.full

     

       20
       +
           utillinux

     

       21
       +
         ];

     

       22
       +
       

     

       23
       +
         src = fetchFromGitHub {

     

       24
       +
           owner = "mbusb";

     

       25
       +
           repo = pname;

     

       26
       +
           rev = "v${version}";

     

       27
       +
       

     

       28
       +
           sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3";

     

       29
       +
         };

     

       30
       +
       

     

       31
       +
         # Skip the fixup stage where stuff is shrinked (can't shrink text files)

     

       32
       +
         phases = [ "unpackPhase" "installPhase" ];

     

       33
       +
       

     

       34
       +
         installPhase = ''

     

       35
       +
           share="$out/share/${pname}"

     

       36
       +
           mkdir -p "$share"

     

       37
       +
           cp -r data "$share/data"

     

       38
       +
           cp -r scripts "$share/scripts"

     

       39
       +
           cp "${pname}" "$share/${pname}"

     

       40
       +
       

     

       41
       +
           mkdir "$out/bin"

     

       42
       +
           cat > "$out/bin/${pname}" <<EOF

     

       43
       +
             #!/bin/sh

     

       44
       +
             cd "$share"

     

       45
       +
             export PYTHONPATH="$PYTHONPATH:$share"

     

       46
       +
             export PATH="$PATH:${parted}/bin:${procps}/bin"

     

       47
       +
       

     

       48
       +
             "${python36Packages.python}/bin/python" "${pname}"

     

       49
       +
           EOF

     

       50
       +
           chmod +x "$out/bin/${pname}"

     

       51
       +
         '';

     

       52
       +
       

     

       53
       +
         meta = with lib; {

     

       54
       +
           description = "Multiboot USB creator for Linux live disks";

     

       55
       +
           homepage = http://multibootusb.org/;

     

       56
       +
           license = licenses.gpl2;

     

       57
       +
           maintainers = with maintainers; [ jD91mZM2 ];

     

       58
       +
         };

     

       59
       +
       }

+2 -2

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

···

       13
        
       stdenv.mkDerivation rec {

     

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

     

       15
        
         product = "vivaldi";

     

       16
       -
         version = "1.14.1077.45-1";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";

     

       20
       -
           sha256 = "0b4iviar927jx6xqyrzgzb3p4p617zm4an1np8jnldadq2a0p56d";

     

       21
        
         };

     

       22
        
       

     

       23
        
         unpackPhase = ''

···

       13
        
       stdenv.mkDerivation rec {

     

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

     

       15
        
         product = "vivaldi";

     

       16
       +
         version = "1.15.1147.42-1";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";

     

       20
       +
           sha256 = "15cajvn2sv05qdp3y538n2xvyy3il49q8zi5928z1mfirjz3dlwh";

     

       21
        
         };

     

       22
        
       

     

       23
        
         unpackPhase = ''

+3 -3

pkgs/applications/networking/cluster/helm/default.nix

···

       5
        
                then "linux-amd64"

     

       6
        
                else "darwin-amd64";

     

       7
        
         checksum = if isLinux

     

       8
       -
                    then "1lr2s66kln6rp3sb156br9nfx51bdy654vdjr4vnncz4kp3mljv1"

     

       9
       -
                    else "04y4ii0w4s00z831q1wzxz6qkc8qfrhwzdrq3wwvrcl0413cza50";

     

       10
        
         pname = "helm";

     

       11
       -
         version = "2.8.2";

     

       12
        
       in

     

       13
        
       stdenv.mkDerivation {

     

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

···

       5
        
                then "linux-amd64"

     

       6
        
                else "darwin-amd64";

     

       7
        
         checksum = if isLinux

     

       8
       +
                    then "0bnjpiivhsxhl45ab32vzf6crv4z8nbq5kcjkvlbcbswdbgp0pq6"

     

       9
       +
                    else "0smwhj4pmd4k7csz82akbkrkb0j2jxnmb33ifhkqw7n33jhl3aqp";

     

       10
        
         pname = "helm";

     

       11
       +
         version = "2.9.0";

     

       12
        
       in

     

       13
        
       stdenv.mkDerivation {

     

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

+5 -5

pkgs/applications/networking/cluster/kops/default.nix

···

       1
       -
       { stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata  }:

     

       0
        
       
     

       2
        
       

     

       3
        
       buildGoPackage rec {

     

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

     

       5
       -
         version = "1.8.1";

     

       6
        
       

     

       7
        
         goPackagePath = "k8s.io/kops";

     

       8
        
       

     
···

       10
        
           rev = version;

     

       11
        
           owner = "kubernetes";

     

       12
        
           repo = "kops";

     

       13
       -
           sha256 = "12nyr0iw1xwp60apli3nlq2vyn4jk3qjrb404m2syx2mqbnn47my";

     

       14
        
         };

     

       15
        
       

     

       16
        
         buildInputs = [go-bindata];

     
···

       24
        
       

     

       25
        
         preBuild = ''

     

       26
        
           (cd go/src/k8s.io/kops

     

       27
       -
            go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...

     

       28
       -
            go-bindata -o federation/model/bindata.go -pkg model -prefix federation/model federation/model/...)

     

       29
        
         '';

     

       30
        
       

     

       31
        
         postInstall = ''

···

       1
       +
       

     

       2
       +
       { stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }:

     

       3
        
       

     

       4
        
       buildGoPackage rec {

     

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

     

       6
       +
         version = "1.9.0";

     

       7
        
       

     

       8
        
         goPackagePath = "k8s.io/kops";

     

       9
        
       

     
···

       11
        
           rev = version;

     

       12
        
           owner = "kubernetes";

     

       13
        
           repo = "kops";

     

       14
       +
           sha256 = "03avkm7gk2dqyvd7245qsca1sbhwk41j9yhc208gcmjgjhkx2vn7";

     

       15
        
         };

     

       16
        
       

     

       17
        
         buildInputs = [go-bindata];

     
···

       25
        
       

     

       26
        
         preBuild = ''

     

       27
        
           (cd go/src/k8s.io/kops

     

       28
       +
            go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...)

     

       0
        
       
     

       29
        
         '';

     

       30
        
       

     

       31
        
         postInstall = ''

+2 -2

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

···

       40
        
         stdenv.mkDerivation rec {

     

       41
        
           name = "signal-desktop-${version}";

     

       42
        
       

     

       43
       -
           version = "1.10.1";

     

       44
        
       

     

       45
        
           src =

     

       46
        
             if stdenv.system == "x86_64-linux" then

     

       47
        
               fetchurl {

     

       48
        
                 url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

     

       49
       -
                 sha256 = "1ndk2in9mbsm5i2k7pgpbd6smbgpswxmjvr12zmbmw893ay015h3";

     

       50
        
               }

     

       51
        
             else

     

       52
        
               throw "Signal for Desktop is not currently supported on ${stdenv.system}";

···

       40
        
         stdenv.mkDerivation rec {

     

       41
        
           name = "signal-desktop-${version}";

     

       42
        
       

     

       43
       +
           version = "1.11.0";

     

       44
        
       

     

       45
        
           src =

     

       46
        
             if stdenv.system == "x86_64-linux" then

     

       47
        
               fetchurl {

     

       48
        
                 url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

     

       49
       +
                 sha256 = "0s3qlzm7iy9qxca2hlh1hq0dnjr7y5wxad1ssqgmyhxsif0nqm96";

     

       50
        
               }

     

       51
        
             else

     

       52
        
               throw "Signal for Desktop is not currently supported on ${stdenv.system}";

+2 -2

pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix

···

       14
        
         stable = mkTelegram stableVersion;

     

       15
        
         preview = mkTelegram (stableVersion // {

     

       16
        
           stable = false;

     

       17
       -
           version = "1.2.19";

     

       18
       -
           sha256Hash = "0val6lfcg3ghcksflm3jclqly0x8plpn3an8v9bix0s5yll1ka4h";

     

       19
        
         });

     

       20
        
       }

···

       14
        
         stable = mkTelegram stableVersion;

     

       15
        
         preview = mkTelegram (stableVersion // {

     

       16
        
           stable = false;

     

       17
       +
           version = "1.2.20";

     

       18
       +
           sha256Hash = "00ncpb1qs88jrrmmx7f7l8wy37wbwnrb958x3xls14p1h1xg63l6";

     

       19
        
         });

     

       20
        
       }

+2 -2

pkgs/applications/science/biology/star/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       -
         version = "2.5.3a";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           repo = "STAR";

     

       9
        
           owner = "alexdobin";

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "1fd9xl7i1zxgsxn2qf6gz8s42g2djm29qmp6qb35d8nnxh8ns54x";

     

       12
        
         };

     

       13
        
       

     

       14
        
         sourceRoot = "source/source";

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "2.6.0c";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           repo = "STAR";

     

       9
        
           owner = "alexdobin";

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "04cj6jw8d9q6lk9c78wa4fky6jdlicf1d13plq7182h8vqiz8p59";

     

       12
        
         };

     

       13
        
       

     

       14
        
         sourceRoot = "source/source";

+12 -1

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

···

       1
        
       { stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl

     

       2
        
       , pkgconfig, gtksourceview, pango, gettext

     

       0
        
       
     

       0
        
       
     

       3
        
       }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     
···

       12
        
       

     

       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
        
         buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl

     

       15
       -
           gtksourceview pango gettext ];

     

       0
        
       
     

       16
        
       

     

       17
        
         doCheck = false;

     

       18
        
       

     

       19
        
         enableParallelBuilding = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
       

     

       21
        
         meta = {

     

       22
        
           homepage = http://www.gnu.org/software/pspp/;

···

       1
        
       { stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl

     

       2
        
       , pkgconfig, gtksourceview, pango, gettext

     

       3
       +
       , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme

     

       4
       +
       , gnome3

     

       5
        
       }:

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     
···

       14
        
       

     

       15
        
         nativeBuildInputs = [ pkgconfig ];

     

       16
        
         buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl

     

       17
       +
           gtksourceview pango gettext

     

       18
       +
           makeWrapper gsettings-desktop-schemas hicolor-icon-theme ];

     

       19
        
       

     

       20
        
         doCheck = false;

     

       21
        
       

     

       22
        
         enableParallelBuilding = true;

     

       23
       +
       

     

       24
       +
         preFixup = ''

     

       25
       +
           wrapProgram "$out/bin/psppire" \

     

       26
       +
            --prefix XDG_DATA_DIRS : "$out/share" \

     

       27
       +
            --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \

     

       28
       +
            --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \

     

       29
       +
            --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"

     

       30
       +
         '';

     

       31
        
       

     

       32
        
         meta = {

     

       33
        
           homepage = http://www.gnu.org/software/pspp/;

+4 -7

pkgs/applications/video/handbrake/default.nix

···

       3
        
       # Derivation patches HandBrake to use our closure.

     

       4
        
       #

     

       5
        
       

     

       6
       -
       # TODO: Release 1.2.0 would switch LibAV to FFmpeg.

     

       7
       -
       

     

       8
        
       { stdenv, lib, fetchurl,

     

       9
        
         python2, pkgconfig, yasm, harfbuzz, zlib,

     

       10
       -
         autoconf, automake, cmake, libtool, m4, jansson,

     

       11
        
         libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,

     

       12
        
         libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,

     

       13
        
         lame, libdvdread, libdvdnav, libbluray,

     
···

       21
        
       }:

     

       22
        
       

     

       23
        
       stdenv.mkDerivation rec {

     

       0
        
       
     

       24
        
         version = "1.1.0";

     

       25
        
         name = "handbrake-${version}";

     

       26
        
       

     
···

       40
        
         });

     

       41
        
       

     

       42
        
         nativeBuildInputs = [

     

       43
       -
           cmake python2 pkgconfig yasm autoconf automake libtool m4

     

       44
        
         ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];

     

       45
        
       

     

       46
        
         buildInputs = [

     
···

       54
        
           libgudev

     

       55
        
         ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])

     

       56
        
         ++ lib.optional useFdk fdk_aac;

     

       57
       -
       

     

       58
       -
         dontUseCmakeConfigure = true;

     

       59
        
       

     

       60
        
         enableParallelBuilding = true;

     

       61
        
       

     
···

       103
        
           '';

     

       104
        
           license = licenses.gpl2;

     

       105
        
           maintainers = with maintainers; [ Anton-Latukha wmertens ];

     

       106
       -
           platforms = platforms.linux;

     

       107
        
         };

     

       108
        
       }

···

       3
        
       # Derivation patches HandBrake to use our closure.

     

       4
        
       #

     

       5
        
       

     

       0
        
       
     

       0
        
       
     

       6
        
       { stdenv, lib, fetchurl,

     

       7
        
         python2, pkgconfig, yasm, harfbuzz, zlib,

     

       8
       +
         autoconf, automake, libtool, m4, jansson,

     

       9
        
         libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,

     

       10
        
         libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,

     

       11
        
         lame, libdvdread, libdvdnav, libbluray,

     
···

       19
        
       }:

     

       20
        
       

     

       21
        
       stdenv.mkDerivation rec {

     

       22
       +
         # TODO: Release 1.2.0 would switch LibAV to FFmpeg.

     

       23
        
         version = "1.1.0";

     

       24
        
         name = "handbrake-${version}";

     

       25
        
       

     
···

       39
        
         });

     

       40
        
       

     

       41
        
         nativeBuildInputs = [

     

       42
       +
           python2 pkgconfig yasm autoconf automake libtool m4

     

       43
        
         ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];

     

       44
        
       

     

       45
        
         buildInputs = [

     
···

       53
        
           libgudev

     

       54
        
         ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])

     

       55
        
         ++ lib.optional useFdk fdk_aac;

     

       0
        
       
     

       0
        
       
     

       56
        
       

     

       57
        
         enableParallelBuilding = true;

     

       58
        
       

     
···

       100
        
           '';

     

       101
        
           license = licenses.gpl2;

     

       102
        
           maintainers = with maintainers; [ Anton-Latukha wmertens ];

     

       103
       +
           platforms = with platforms; unix;

     

       104
        
         };

     

       105
        
       }

+2 -2

pkgs/desktops/gnome-3/core/gnome-shell/default.nix

···

       13
        
       

     

       14
        
       in stdenv.mkDerivation rec {

     

       15
        
         name = "gnome-shell-${version}";

     

       16
       -
         version = "3.28.1";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";

     

       20
       -
           sha256 = "1k2cgaky293kcjis0pmh9hw1aby3yyilb5dzrbww62wxzppc9s35";

     

       21
        
         };

     

       22
        
       

     

       23
        
         # Needed to find /etc/NetworkManager/VPN

···

       13
        
       

     

       14
        
       in stdenv.mkDerivation rec {

     

       15
        
         name = "gnome-shell-${version}";

     

       16
       +
         version = "3.28.2";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";

     

       20
       +
           sha256 = "1b9n89ij2g5nqaqp7a13jnqcd8qa2v9p55rbi71al3xvqk091ri7";

     

       21
        
         };

     

       22
        
       

     

       23
        
         # Needed to find /etc/NetworkManager/VPN

+2 -3

pkgs/desktops/gnome-3/core/gnome-software/default.nix

···

       1
        
       { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree

     

       2
       -
       , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection

     

       3
        
       , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     
···

       27
        
           gnome3.gtk glib packagekit appstream-glib libsoup

     

       28
        
           gnome3.gsettings-desktop-schemas gnome3.gnome-desktop

     

       29
        
           gspell json-glib libsecret ostree

     

       30
       -
           polkit

     

       31
        
         ];

     

       32
        
       

     

       33
        
         mesonFlags = [

     

       34
       -
           "-Denable-flatpak=false"

     

       35
        
           "-Denable-rpm=false"

     

       36
        
           "-Denable-fwupd=false"

     

       37
        
           "-Denable-oauth=false"

···

       1
        
       { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree

     

       2
       +
       , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection, flatpak

     

       3
        
       , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     
···

       27
        
           gnome3.gtk glib packagekit appstream-glib libsoup

     

       28
        
           gnome3.gsettings-desktop-schemas gnome3.gnome-desktop

     

       29
        
           gspell json-glib libsecret ostree

     

       30
       +
           polkit flatpak

     

       31
        
         ];

     

       32
        
       

     

       33
        
         mesonFlags = [

     

       0
        
       
     

       34
        
           "-Denable-rpm=false"

     

       35
        
           "-Denable-fwupd=false"

     

       36
        
           "-Denable-oauth=false"

+2 -2

pkgs/desktops/gnome-3/core/mutter/default.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "mutter-${version}";

     

       8
       -
         version = "3.28.1";

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
        
           url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";

     

       12
       -
           sha256 = "1bhmjvf6l1fj5igsw2xlg3nv5526laiwaxh47dgk50f40qax1qin";

     

       13
        
         };

     

       14
        
       

     

       15
        
         passthru = {

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "mutter-${version}";

     

       8
       +
         version = "3.28.2";

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
        
           url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";

     

       12
       +
           sha256 = "0ighs1zvlssgq16v1h3vg280za7y448snq65gc5m1zmqqawqkymg";

     

       13
        
         };

     

       14
        
       

     

       15
        
         passthru = {

+93 -24

pkgs/desktops/gnome-3/core/tracker-miners/default.nix

···

       1
       -
       { stdenv, intltool, fetchurl, libxml2, upower

     

       2
       -
       , substituteAll, pkgconfig, gtk3, glib, gexiv2

     

       3
       -
       , bash, wrapGAppsHook, itstool, vala, sqlite, libxslt

     

       4
       -
       , gnome3, librsvg, gdk_pixbuf, libnotify

     

       5
       -
       , evolution-data-server, gst_all_1, poppler

     

       6
       -
       , icu, taglib, libjpeg, libtiff, giflib, libcue

     

       7
       -
       , libvorbis, flac, exempi, networkmanager

     

       8
       -
       , libpng, libexif, libgsf, libuuid, bzip2

     

       9
       -
       , libsoup, json-glib, libseccomp

     

       10
       -
       , libiptcdata }:

     

       11
        
       

     

       12
       -
       let

     

       0
        
       
     

       13
        
         pname = "tracker-miners";

     

       14
        
         version = "2.0.4";

     

       15
       -
       in stdenv.mkDerivation rec {

     

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

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";

     

       20
        
           sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6";

     

       21
        
         };

     

       22
        
       

     

       23
       -
         NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";

     

       0
        
       
     

       24
        
       

     

       25
       -
         enableParallelBuilding = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
       

     

       27
       -
         nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ];

     

       28
        
         # TODO: add libgrss, libenca, libosinfo

     

       29
        
         buildInputs = [

     

       30
       -
           bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser

     

       31
       -
           gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu

     

       32
       -
           json-glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup

     

       33
       -
           libtiff libuuid libvorbis libxml2 poppler taglib upower gexiv2

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       34
        
         ];

     

       35
        
       

     

       36
       -
         LANG = "en_US.UTF-8"; # for running tests

     

       37
       -
       

     

       38
       -
         doCheck = true;

     

       39
        
       

     

       40
        
         patches = [

     

       41
        
           (substituteAll {

     

       42
        
             src = ./fix-paths.patch;

     

       43
        
             inherit (gnome3) tracker;

     

       44
        
           })

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
         ];

     

       46
        
       

     

       47
        
         passthru = {

     
···

       51
        
           };

     

       52
        
         };

     

       53
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       54
        
         meta = with stdenv.lib; {

     

       55
        
           homepage = https://wiki.gnome.org/Projects/Tracker;

     

       56
        
           description = "Desktop-neutral user information store, search tool and indexer";

     

       57
        
           maintainers = gnome3.maintainers;

     

       58
       -
           license = licenses.gpl2;

     

       59
        
           platforms = platforms.linux;

     

       60
        
         };

     

       61
        
       }

···

       1
       +
       { stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, makeWrapper

     

       2
       +
       , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server

     

       3
       +
       , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif

     

       4
       +
       , libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid

     

       5
       +
       , libvorbis, libxml2, poppler, taglib, upower }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6
        
       

     

       7
       +
       stdenv.mkDerivation rec {

     

       8
       +
         name = "${pname}-${version}";

     

       9
        
         pname = "tracker-miners";

     

       10
        
         version = "2.0.4";

     

       0
        
       
     

       0
        
       
     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";

     

       14
        
           sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6";

     

       15
        
         };

     

       16
        
       

     

       17
       +
         # https://github.com/NixOS/nixpkgs/issues/39547

     

       18
       +
         LIBRARY_PATH = stdenv.lib.makeLibraryPath [ giflib ];

     

       19
        
       

     

       20
       +
         nativeBuildInputs = [

     

       21
       +
           intltool

     

       22
       +
           itstool

     

       23
       +
           libxslt

     

       24
       +
           makeWrapper

     

       25
       +
           meson

     

       26
       +
           ninja

     

       27
       +
           pkgconfig

     

       28
       +
           vala

     

       29
       +
           wrapGAppsHook

     

       30
       +
         ];

     

       31
        
       

     

       0
        
       
     

       32
        
         # TODO: add libgrss, libenca, libosinfo

     

       33
        
         buildInputs = [

     

       34
       +
           bzip2

     

       35
       +
           dbus

     

       36
       +
           evolution-data-server

     

       37
       +
           exempi

     

       38
       +
           flac

     

       39
       +
           giflib

     

       40
       +
           glib

     

       41
       +
           gnome3.gexiv2

     

       42
       +
           gnome3.totem-pl-parser

     

       43
       +
           gnome3.tracker

     

       44
       +
           gst_all_1.gst-plugins-base

     

       45
       +
           gst_all_1.gstreamer

     

       46
       +
           icu

     

       47
       +
           json-glib

     

       48
       +
           libcue

     

       49
       +
           libexif

     

       50
       +
           libgsf

     

       51
       +
           libiptcdata

     

       52
       +
           libjpeg

     

       53
       +
           libpng

     

       54
       +
           libseccomp

     

       55
       +
           libsoup

     

       56
       +
           libtiff

     

       57
       +
           libuuid

     

       58
       +
           libvorbis

     

       59
       +
           libxml2

     

       60
       +
           poppler

     

       61
       +
           taglib

     

       62
       +
           upower

     

       63
        
         ];

     

       64
        
       

     

       65
       +
         mesonFlags = [

     

       66
       +
           "-Dminer_rss=false" # needs libgrss

     

       67
       +
         ];

     

       68
        
       

     

       69
        
         patches = [

     

       70
        
           (substituteAll {

     

       71
        
             src = ./fix-paths.patch;

     

       72
        
             inherit (gnome3) tracker;

     

       73
        
           })

     

       74
       +
           # https://bugzilla.gnome.org/show_bug.cgi?id=795573

     

       75
       +
           (fetchurl {

     

       76
       +
             url = https://bugzilla.gnome.org/attachment.cgi?id=371422;

     

       77
       +
             sha256 = "1rzwzrc7q73k42s1j1iw52chy10w6y3xksfrzg2l42nn9wk7n281";

     

       78
       +
           })

     

       79
       +
           # https://bugzilla.gnome.org/show_bug.cgi?id=795574

     

       80
       +
           (fetchurl {

     

       81
       +
             url = https://bugzilla.gnome.org/attachment.cgi?id=371423;

     

       82
       +
             sha256 = "0b2ck8z4b2yrgwg4v9jsac5n8h3a91qkp90vv17wxcvr4v50fg48";

     

       83
       +
           })

     

       84
       +
           # https://bugzilla.gnome.org/show_bug.cgi?id=795575

     

       85
       +
           (fetchurl {

     

       86
       +
             url = https://bugzilla.gnome.org/attachment.cgi?id=371424;

     

       87
       +
             sha256 = "03i29fabxrpraydh7712vdrc571qmiq0l4axj24gbi6h77xn7mxc";

     

       88
       +
           })

     

       89
       +
           # https://bugzilla.gnome.org/show_bug.cgi?id=795576

     

       90
       +
           (fetchurl {

     

       91
       +
             url = https://bugzilla.gnome.org/attachment.cgi?id=371427;

     

       92
       +
             sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";

     

       93
       +
           })

     

       94
       +
           # https://bugzilla.gnome.org/show_bug.cgi?id=795577

     

       95
       +
           (fetchurl {

     

       96
       +
             url = https://bugzilla.gnome.org/attachment.cgi?id=371425;

     

       97
       +
             sha256 = "05m629469jr2lm2cjs54n7xwyim2d5rwwvdjxzcwh5qpfjds5phm";

     

       98
       +
           })

     

       99
        
         ];

     

       100
        
       

     

       101
        
         passthru = {

     
···

       105
        
           };

     

       106
        
         };

     

       107
        
       

     

       108
       +
         # https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131

     

       109
       +
         # https://github.com/NixOS/nixpkgs/pull/37693

     

       110
       +
         preConfigure = ''

     

       111
       +
           mesonFlagsArray+=("-Ddbus_services=$out/share/dbus-1/services")

     

       112
       +
         '';

     

       113
       +
       

     

       114
       +
         postInstall = ''

     

       115
       +
           ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas

     

       116
       +
         '';

     

       117
       +
         

     

       118
       +
         # https://bugzilla.gnome.org/show_bug.cgi?id=796145

     

       119
       +
         postFixup = ''

     

       120
       +
           rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service

     

       121
       +
         '';

     

       122
       +
       

     

       123
        
         meta = with stdenv.lib; {

     

       124
        
           homepage = https://wiki.gnome.org/Projects/Tracker;

     

       125
        
           description = "Desktop-neutral user information store, search tool and indexer";

     

       126
        
           maintainers = gnome3.maintainers;

     

       127
       +
           license = licenses.gpl2Plus;

     

       128
        
           platforms = platforms.linux;

     

       129
        
         };

     

       130
        
       }

+2 -2

pkgs/desktops/mate/caja/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       -
         version = "1.21.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";

     

       9
       -
           sha256 = "0v8zx5rzqh1zkwizkpdckmwm6004cv9sbjghzgz3049xzcqm371g";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "1.21.1";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";

     

       9
       +
           sha256 = "013lmngnm0i2746qrkkyhg62kyh4cjdd0i634cz5fm7ah65ylxg4";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [

pkgs/development/compilers/gcc/7/default.nix

···

       325
        
             "--with-gnu-as" "--without-gnu-ld"

     

       326
        
           ]

     

       327
        
           ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"

     

       0
        
       
     

       328
        
         ;

     

       329
        
       

     

       330
        
         targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

···

       325
        
             "--with-gnu-as" "--without-gnu-ld"

     

       326
        
           ]

     

       327
        
           ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"

     

       328
       +
           ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"

     

       329
        
         ;

     

       330
        
       

     

       331
        
         targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

+10 -10

pkgs/development/libraries/ffmpeg-full/default.nix

···

       25
        
       , ffmpegProgram ? true # Build ffmpeg executable

     

       26
        
       , ffplayProgram ? true # Build ffplay executable

     

       27
        
       , ffprobeProgram ? true # Build ffprobe executable

     

       28
       -
       , ffserverProgram ? true # Build ffserver executable

     

       29
        
       , qtFaststartProgram ? true # Build qt-faststart executable

     

       30
        
       /*

     

       31
        
        *  Library options

     
···

       98
        
       , libXv ? null # Xlib support

     

       99
        
       , lzma ? null # xz-utils

     

       100
        
       , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support

     

       0
        
       
     

       101
        
       , openal ? null # OpenAL 1.1 capture support

     

       102
        
       #, opencl ? null # OpenCL code

     

       103
        
       , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder

     

       104
        
       #, opencv ? null # Video filtering

     

       105
        
       , openglExtlib ? false, libGLU_combined ? null # OpenGL rendering

     

       106
        
       #, openh264 ? null # H.264/AVC encoder

     

       107
       -
       , openjpeg_1 ? null # JPEG 2000 de/encoder

     

       108
        
       , opensslExtlib ? false, openssl ? null

     

       109
        
       , libpulseaudio ? null # Pulseaudio input support

     

       110
        
       , rtmpdump ? null # RTMP[E] support

     
···

       159
        
        *   utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video

     

       160
        
        *

     

       161
        
        * Need fixes to support Darwin:

     

       162
       -
        *   frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,

     

       163
        
        *   pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs

     

       164
        
        *

     

       165
        
        * Not supported:

     
···

       176
        
       let

     

       177
        
         inherit (stdenv) isCygwin isFreeBSD isLinux;

     

       178
        
         inherit (stdenv.lib) optional optionals optionalString enableFeature;

     

       0
        
       
     

       0
        
       
     

       179
        
       in

     

       180
        
       

     

       181
        
       /*

     
···

       201
        
                            && swresampleLibrary

     

       202
        
                            && SDL2 != null;

     

       203
        
       assert ffprobeProgram -> avcodecLibrary && avformatLibrary;

     

       204
       -
       assert ffserverProgram -> avformatLibrary;

     

       205
        
       /*

     

       206
        
        *  Library dependencies

     

       207
        
        */

     
···

       231
        
       

     

       232
        
       stdenv.mkDerivation rec {

     

       233
        
         name = "ffmpeg-full-${version}";

     

       234
       -
         version = "3.4.2";

     

       235
        
       

     

       236
        
         src = fetchurl {

     

       237
        
           url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";

     

       238
       -
           sha256 = "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib";

     

       239
        
         };

     

       240
        
       

     

       241
        
         prePatch = ''

     
···

       289
        
           (enableFeature ffmpegProgram "ffmpeg")

     

       290
        
           (enableFeature ffplayProgram "ffplay")

     

       291
        
           (enableFeature ffprobeProgram "ffprobe")

     

       292
       -
           (enableFeature ffserverProgram "ffserver")

     

       293
        
           /*

     

       294
        
            *  Library flags

     

       295
        
            */

     
···

       368
        
           #(enableFeature (opencv != null) "libopencv")

     

       369
        
           (enableFeature openglExtlib "opengl")

     

       370
        
           #(enableFeature (openh264 != null) "openh264")

     

       371
       -
           (enableFeature (openjpeg_1 != null) "libopenjpeg")

     

       372
        
           (enableFeature (opensslExtlib && gplLicensing) "openssl")

     

       373
        
           (enableFeature (libpulseaudio != null) "libpulse")

     

       374
        
           #(enableFeature quvi "libquvi")

     
···

       408
        
           bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm

     

       409
        
           libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug

     

       410
        
           libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11

     

       411
       -
           libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr

     

       412
        
           samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore

     

       413
        
           zeromq4 zlib

     

       414
        
         ] ++ optional openglExtlib libGLU_combined

     

       415
        
           ++ optionals nonfreeLicensing [ fdk_aac openssl ]

     

       416
        
           ++ optional ((isLinux || isFreeBSD) && libva != null) libva

     

       417
        
           ++ optionals isLinux [ alsaLib libraw1394 libv4l ]

     

       418
       -
           ++ optionals nvenc [ nvidia-video-sdk ]

     

       419
        
           ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation

     

       420
        
                                          MediaToolbox VideoDecodeAcceleration

     

       421
        
                                          libiconv ];

···

       25
        
       , ffmpegProgram ? true # Build ffmpeg executable

     

       26
        
       , ffplayProgram ? true # Build ffplay executable

     

       27
        
       , ffprobeProgram ? true # Build ffprobe executable

     

       0
        
       
     

       28
        
       , qtFaststartProgram ? true # Build qt-faststart executable

     

       29
        
       /*

     

       30
        
        *  Library options

     
···

       97
        
       , libXv ? null # Xlib support

     

       98
        
       , lzma ? null # xz-utils

     

       99
        
       , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support

     

       100
       +
       , callPackage # needed for NVENC to access external ffmpeg nvidia headers

     

       101
        
       , openal ? null # OpenAL 1.1 capture support

     

       102
        
       #, opencl ? null # OpenCL code

     

       103
        
       , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder

     

       104
        
       #, opencv ? null # Video filtering

     

       105
        
       , openglExtlib ? false, libGLU_combined ? null # OpenGL rendering

     

       106
        
       #, openh264 ? null # H.264/AVC encoder

     

       107
       +
       , openjpeg ? null # JPEG 2000 de/encoder

     

       108
        
       , opensslExtlib ? false, openssl ? null

     

       109
        
       , libpulseaudio ? null # Pulseaudio input support

     

       110
        
       , rtmpdump ? null # RTMP[E] support

     
···

       159
        
        *   utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video

     

       160
        
        *

     

       161
        
        * Need fixes to support Darwin:

     

       162
       +
        *   frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg,

     

       163
        
        *   pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs

     

       164
        
        *

     

       165
        
        * Not supported:

     
···

       176
        
       let

     

       177
        
         inherit (stdenv) isCygwin isFreeBSD isLinux;

     

       178
        
         inherit (stdenv.lib) optional optionals optionalString enableFeature;

     

       179
       +
       

     

       180
       +
         nv-codec-headers = callPackage ./nv-codec-headers.nix { };

     

       181
        
       in

     

       182
        
       

     

       183
        
       /*

     
···

       203
        
                            && swresampleLibrary

     

       204
        
                            && SDL2 != null;

     

       205
        
       assert ffprobeProgram -> avcodecLibrary && avformatLibrary;

     

       0
        
       
     

       206
        
       /*

     

       207
        
        *  Library dependencies

     

       208
        
        */

     
···

       232
        
       

     

       233
        
       stdenv.mkDerivation rec {

     

       234
        
         name = "ffmpeg-full-${version}";

     

       235
       +
         version = "4.0";

     

       236
        
       

     

       237
        
         src = fetchurl {

     

       238
        
           url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";

     

       239
       +
           sha256 = "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d";

     

       240
        
         };

     

       241
        
       

     

       242
        
         prePatch = ''

     
···

       290
        
           (enableFeature ffmpegProgram "ffmpeg")

     

       291
        
           (enableFeature ffplayProgram "ffplay")

     

       292
        
           (enableFeature ffprobeProgram "ffprobe")

     

       0
        
       
     

       293
        
           /*

     

       294
        
            *  Library flags

     

       295
        
            */

     
···

       368
        
           #(enableFeature (opencv != null) "libopencv")

     

       369
        
           (enableFeature openglExtlib "opengl")

     

       370
        
           #(enableFeature (openh264 != null) "openh264")

     

       371
       +
           (enableFeature (openjpeg != null) "libopenjpeg")

     

       372
        
           (enableFeature (opensslExtlib && gplLicensing) "openssl")

     

       373
        
           (enableFeature (libpulseaudio != null) "libpulse")

     

       374
        
           #(enableFeature quvi "libquvi")

     
···

       408
        
           bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm

     

       409
        
           libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug

     

       410
        
           libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11

     

       411
       +
           libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr

     

       412
        
           samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore

     

       413
        
           zeromq4 zlib

     

       414
        
         ] ++ optional openglExtlib libGLU_combined

     

       415
        
           ++ optionals nonfreeLicensing [ fdk_aac openssl ]

     

       416
        
           ++ optional ((isLinux || isFreeBSD) && libva != null) libva

     

       417
        
           ++ optionals isLinux [ alsaLib libraw1394 libv4l ]

     

       418
       +
           ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ]

     

       419
        
           ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation

     

       420
        
                                          MediaToolbox VideoDecodeAcceleration

     

       421
        
                                          libiconv ];

+22

pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix

···

       1
       +
       { stdenv, fetchgit }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         name = "nv-codec-headers-${version}";

     

       5
       +
         version = "n8.1.24.2";

     

       6
       +
       

     

       7
       +
         src = fetchgit {

     

       8
       +
           url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";

     

       9
       +
           rev = "${version}";

     

       10
       +
           sha256 = "122i3f6whiz5yp44dhk73ifr1973z8vvfbg4216vb782bl8b5bam";

     

       11
       +
         };

     

       12
       +
       

     

       13
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       14
       +
       

     

       15
       +
         meta = {

     

       16
       +
           description = "ffmpeg nvidia headers for NVENC";

     

       17
       +
           homepage = http://ffmpeg.org/;

     

       18
       +
           license = stdenv.lib.licenses.gpl3Plus;

     

       19
       +
           maintainers = [ stdenv.lib.maintainers.MP2E ];

     

       20
       +
           platforms = stdenv.lib.platforms.all;

     

       21
       +
         };

     

       22
       +
       }

+74

pkgs/development/libraries/flatpak/default.nix

···

       1
       +
       { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2

     

       2
       +
       , gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc

     

       3
       +
       , bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme

     

       4
       +
       , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }:

     

       5
       +
       

     

       6
       +
       let

     

       7
       +
         version = "0.11.7";

     

       8
       +
         desktop_schemas = gnome3.gsettings_desktop_schemas;

     

       9
       +
       in stdenv.mkDerivation rec {

     

       10
       +
         name = "flatpak-${version}";

     

       11
       +
       

     

       12
       +
         outputs = [ "out" "man" "doc" "installedTests" ];

     

       13
       +
       

     

       14
       +
         src = fetchurl {

     

       15
       +
           url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";

     

       16
       +
           sha256 = "1vq4j7v68lp4fsvpas1bcsx1z4snpj0mkbq2mi00kx3jb48z768h";

     

       17
       +
         };

     

       18
       +
       

     

       19
       +
         patches = [

     

       20
       +
           (substituteAll {

     

       21
       +
             src = ./fix-test-paths.patch;

     

       22
       +
             inherit coreutils python2 glibcLocales;

     

       23
       +
             hicolorIconTheme = hicolor-icon-theme;

     

       24
       +
           })

     

       25
       +
           # patch taken from gtk_doc

     

       26
       +
           ./respect-xml-catalog-files-var.patch

     

       27
       +
         ];

     

       28
       +
       

     

       29
       +
         nativeBuildInputs = [

     

       30
       +
           autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection

     

       31
       +
           gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper

     

       32
       +
         ] ++ stdenv.lib.optionals doCheck checkInputs;

     

       33
       +
       

     

       34
       +
         buildInputs = [

     

       35
       +
           bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp

     

       36
       +
           libsoup lzma ostree polkit python3 systemd xlibs.libXau

     

       37
       +
         ];

     

       38
       +
       

     

       39
       +
         checkInputs = [ valgrind ];

     

       40
       +
       

     

       41
       +
         doCheck = false; # TODO: some issues with temporary files

     

       42
       +
       

     

       43
       +
         enableParallelBuilding = true;

     

       44
       +
       

     

       45
       +
         configureFlags = [

     

       46
       +
           "--with-system-bubblewrap=${bubblewrap}/bin/bwrap"

     

       47
       +
           "--localstatedir=/var"

     

       48
       +
           "--enable-installed-tests"

     

       49
       +
         ];

     

       50
       +
       

     

       51
       +
         makeFlags = [

     

       52
       +
           "installed_testdir=$(installedTests)/libexec/installed-tests/flatpak"

     

       53
       +
           "installed_test_metadir=$(installedTests)/share/installed-tests/flatpak"

     

       54
       +
         ];

     

       55
       +
       

     

       56
       +
         postPatch = ''

     

       57
       +
           patchShebangs buildutil

     

       58
       +
           patchShebangs tests

     

       59
       +
         '';

     

       60
       +
       

     

       61
       +
         postFixup = ''

     

       62
       +
           wrapProgram $out/bin/flatpak \

     

       63
       +
             --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \

     

       64
       +
             --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}"

     

       65
       +
         '';

     

       66
       +
       

     

       67
       +
         meta = with stdenv.lib; {

     

       68
       +
           description = "Linux application sandboxing and distribution framework";

     

       69
       +
           homepage = https://flatpak.org/;

     

       70
       +
           license = licenses.lgpl21;

     

       71
       +
           maintainers = with maintainers; [ jtojnar ];

     

       72
       +
           platforms = platforms.linux;

     

       73
       +
         };

     

       74
       +
       }

+132

pkgs/development/libraries/flatpak/fix-test-paths.patch

···

       1
       +
       --- a/tests/libtest.sh

     

       2
       +
       +++ b/tests/libtest.sh

     

       3
       +
       @@ -322,7 +322,7 @@

     

       4
       +
                # running installed-tests: assume we know what we're doing

     

       5
       +
                :

     

       6
       +
            elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \

     

       7
       +
       -            --ro-bind / / /bin/true > bwrap-result 2>&1; then

     

       8
       +
       +            --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then

     

       9
       +
                sed -e 's/^/# /' < bwrap-result

     

       10
       +
                echo "1..0 # SKIP Cannot run bwrap"

     

       11
       +
                exit 0

     

       12
       +
       @@ -330,7 +330,7 @@

     

       13
       +
        }

     

       14
       +
        

     

       15
       +
        skip_without_python2 () {

     

       16
       +
       -    if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then

     

       17
       +
       +    if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then

     

       18
       +
                echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support"

     

       19
       +
                exit 0

     

       20
       +
            fi

     

       21
       +
       @@ -350,12 +350,12 @@

     

       22
       +
        export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"

     

       23
       +
        DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"

     

       24
       +
        

     

       25
       +
       -if ! /bin/kill -0 "$DBUS_SESSION_BUS_PID"; then

     

       26
       +
       +if ! @coreutils@/bin/kill -0 "$DBUS_SESSION_BUS_PID"; then

     

       27
       +
            assert_not_reached "Failed to start dbus-daemon"

     

       28
       +
        fi

     

       29
       +
        

     

       30
       +
        cleanup () {

     

       31
       +
       -    /bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}

     

       32
       +
       +    @coreutils@/bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}

     

       33
       +
            gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true

     

       34
       +
            fusermount -u $XDG_RUNTIME_DIR/doc || :

     

       35
       +
            if test -n "${TEST_SKIP_CLEANUP:-}"; then

     

       36
       +
       --- a/tests/make-test-runtime.sh

     

       37
       +
       +++ b/tests/make-test-runtime.sh

     

       38
       +
       @@ -21,6 +21,7 @@

     

       39
       +
        cat ${DIR}/metadata

     

       40
       +
        

     

       41
       +
        # Add bash and dependencies

     

       42
       +
       +mkdir -p ${DIR}/nix/store

     

       43
       +
        mkdir -p ${DIR}/usr/bin

     

       44
       +
        mkdir -p ${DIR}/usr/lib

     

       45
       +
        ln -s ../lib ${DIR}/usr/lib64

     

       46
       +
       @@ -30,47 +31,27 @@

     

       47
       +
        else

     

       48
       +
            cp `which ldconfig` ${DIR}/usr/bin

     

       49
       +
        fi

     

       50
       +
       -T=`mktemp`

     

       51
       +
       -for i in $@; do

     

       52
       +
       -    I=`which $i`

     

       53
       +
       -    cp $I ${DIR}/usr/bin

     

       54
       +
       -    ldd $I | sed "s/.* => //"  | awk '{ print $1}' | grep ^/ | grep ^/ >> $T

     

       55
       +
       -    if test $i == python2; then

     

       56
       +
       -        mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload

     

       57
       +
       -        # This is a hardcoded minimal set of modules we need in the current tests.

     

       58
       +
       -        # Pretty hacky stuff. Add modules as needed.

     

       59
       +
       -        PYDIR=/usr/lib/python2.7

     

       60
       +
       -        if test -d /usr/lib64/python2.7; then PYDIR=/usr/lib64/python2.7; fi

     

       61
       +
       -        for py in site os stat posixpath genericpath warnings \

     

       62
       +
       -                       linecache types UserDict abc _abcoll \

     

       63
       +
       -                       _weakrefset copy_reg traceback sysconfig \

     

       64
       +
       -                       re sre_compile sre_parse sre_constants \

     

       65
       +
       -                       _sysconfigdata ; do

     

       66
       +
       -            cp ${PYDIR}/$py.py ${DIR}/usr/lib/python2.7

     

       67
       +
       -        done

     

       68
       +
       -        # These might not exist, depending how Python was configured; and the

     

       69
       +
       -        # part after ${so} might be "module" or ".x86_64-linux-gnu" or

     

       70
       +
       -        # something else

     

       71
       +
       -        for so in _locale strop ; do

     

       72
       +
       -            cp ${PYDIR}/lib-dynload/${so}*.so ${DIR}/usr/lib/python2.7/lib-dynload || :

     

       73
       +
       -        done

     

       74
       +
       -        for plat in $( cd ${PYDIR} && echo plat-* ); do

     

       75
       +
       -            test -e ${PYDIR}/${plat} || continue

     

       76
       +
       -            mkdir -p ${DIR}/usr/lib/python2.7/${plat}

     

       77
       +
       -            cp ${PYDIR}/${plat}/*.py ${DIR}/usr/lib/python2.7/${plat}/

     

       78
       +
       -        done

     

       79
       +
       -    fi

     

       80
       +
       -done

     

       81
       +
        ln -s bash ${DIR}/usr/bin/sh

     

       82
       +
       -for i in `sort -u $T`; do

     

       83
       +
       -    cp "$i" ${DIR}/usr/lib/

     

       84
       +
       +for i in $@; do

     

       85
       +
       +    I=$(readlink -f $(which $i))

     

       86
       +
       +    requisites=$(nix-store --query --requisites "$I")

     

       87
       +
       +    for r in $requisites; do

     

       88
       +
       +        # a single store item can be needed by multiple paths, no need to copy it again

     

       89
       +
       +        if [ ! -e ${DIR}/$r ]; then

     

       90
       +
       +            cp -r $r ${DIR}/$r

     

       91
       +
       +        fi

     

       92
       +
       +    done

     

       93
       +
       +    ln -s $I ${DIR}/usr/bin/$i

     

       94
       +
        done

     

       95
       +
        

     

       96
       +
       -# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but

     

       97
       +
       -# the real en_US locale is often not available, because its in the

     

       98
       +
       -# local archive.

     

       99
       +
       +mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store

     

       100
       +
       +chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed

     

       101
       +
       +find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths

     

       102
       +
       +find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets

     

       103
       +
       +

     

       104
       +
       +# We copy the whole locale archive because we do not have C.UTF8 locale

     

       105
       +
        mkdir -p ${DIR}/usr/lib/locale/

     

       106
       +
       -cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US

     

       107
       +
       +cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive

     

       108
       +
        

     

       109
       +
        if [ x$COLLECTION_ID != x ]; then

     

       110
       +
            collection_args=--collection-id=${COLLECTION_ID}

     

       111
       +
       --- a/tests/testlibrary.c

     

       112
       +
       +++ b/tests/testlibrary.c

     

       113
       +
       @@ -378,7 +378,7 @@

     

       114
       +
            {

     

       115
       +
              gint exit_code = 0;

     

       116
       +
              char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net",

     

       117
       +
       -          "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL };

     

       118
       +
       +          "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL };

     

       119
       +
              g_autofree char *argv_str = g_strjoinv (" ", argv);

     

       120
       +
              g_test_message ("Spawning %s", argv_str);

     

       121
       +
              g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error);

     

       122
       +
       --- a/triggers/gtk-icon-cache.trigger

     

       123
       +
       +++ b/triggers/gtk-icon-cache.trigger

     

       124
       +
       @@ -1,7 +1,7 @@

     

       125
       +
        #!/bin/sh

     

       126
       +
        

     

       127
       +
        if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d $1/exports/share/icons/hicolor \); then

     

       128
       +
       -    cp /usr/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/

     

       129
       +
       +    cp @hicolorIconTheme@/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/

     

       130
       +
            for dir in $1/exports/share/icons/*; do

     

       131
       +
                if test -f $dir/index.theme; then

     

       132
       +
                    if ! gtk-update-icon-cache --quiet $dir; then

+13

pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch

···

       1
       +
       --- a/acinclude.m4

     

       2
       +
       +++ b/acinclude.m4

     

       3
       +
       @@ -40,8 +40,8 @@

     

       4
       +
        [

     

       5
       +
          AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl

     

       6
       +
          AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])

     

       7
       +
       -  if $jh_found_xmlcatalog && \

     

       8
       +
       -     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then

     

       9
       +
       +  # empty argument forces libxml to use XML_CATALOG_FILES variable

     

       10
       +
       +  if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then

     

       11
       +
            AC_MSG_RESULT([found])

     

       12
       +
            ifelse([$3],,,[$3

     

       13
       +
        ])dnl

+24

pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix

···

       1
       +
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }:

     

       2
       +
       

     

       3
       +
       let

     

       4
       +
         version = "0.11";

     

       5
       +
       in stdenv.mkDerivation rec {

     

       6
       +
         name = "xdg-desktop-portal-gtk-${version}";

     

       7
       +
       

     

       8
       +
         src = fetchFromGitHub {

     

       9
       +
           owner = "flatpak";

     

       10
       +
           repo = "xdg-desktop-portal-gtk";

     

       11
       +
           rev = version;

     

       12
       +
           sha256 = "03ysv29k7fp14hx0gakjigzzlniwicqd81nrhnc6w4pgin0y0zwg";

     

       13
       +
         };

     

       14
       +
       

     

       15
       +
         nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ];

     

       16
       +
         buildInputs = [ glib gtk3 ];

     

       17
       +
       

     

       18
       +
         meta = with stdenv.lib; {

     

       19
       +
           description = "Desktop integration portals for sandboxed apps";

     

       20
       +
           maintainers = with maintainers; [ jtojnar ];

     

       21
       +
           platforms = platforms.linux;

     

       22
       +
           license = licenses.lgpl21;

     

       23
       +
         };

     

       24
       +
       }

+41

pkgs/development/libraries/xdg-desktop-portal/default.nix

···

       1
       +
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:

     

       2
       +
       

     

       3
       +
       let

     

       4
       +
         version = "0.11";

     

       5
       +
       in stdenv.mkDerivation rec {

     

       6
       +
         name = "xdg-desktop-portal-${version}";

     

       7
       +
       

     

       8
       +
         outputs = [ "out" "installedTests" ];

     

       9
       +
       

     

       10
       +
         src = fetchFromGitHub {

     

       11
       +
           owner = "flatpak";

     

       12
       +
           repo = "xdg-desktop-portal";

     

       13
       +
           rev = version;

     

       14
       +
           sha256 = "06gipd51snvlp2jp68v2c8rwbsv36kjzg9xacm81n1w4b2dpz4g0";

     

       15
       +
         };

     

       16
       +
       

     

       17
       +
         patches = [

     

       18
       +
           ./respect-path-env-var.patch

     

       19
       +
         ];

     

       20
       +
       

     

       21
       +
         nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ];

     

       22
       +
         buildInputs = [ glib pipewire fuse ];

     

       23
       +
       

     

       24
       +
         doCheck = true;

     

       25
       +
       

     

       26
       +
         configureFlags = [

     

       27
       +
           "--enable-installed-tests"

     

       28
       +
         ];

     

       29
       +
       

     

       30
       +
         makeFlags = [

     

       31
       +
           "installed_testdir=$(installedTests)/libexec/installed-tests/xdg-desktop-portal"

     

       32
       +
           "installed_test_metadir=$(installedTests)/share/installed-tests/xdg-desktop-portal"

     

       33
       +
         ];

     

       34
       +
       

     

       35
       +
         meta = with stdenv.lib; {

     

       36
       +
           description = "Desktop integration portals for sandboxed apps";

     

       37
       +
           license = licenses.lgpl21;

     

       38
       +
           maintainers = with maintainers; [ jtojnar ];

     

       39
       +
           platforms = platforms.linux;

     

       40
       +
         };

     

       41
       +
       }

+76

pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch

···

       1
       +
       --- a/src/xdg-desktop-portal.c

     

       2
       +
       +++ b/src/xdg-desktop-portal.c

     

       3
       +
       @@ -177,38 +177,50 @@

     

       4
       +
        static void

     

       5
       +
        load_installed_portals (void)

     

       6
       +
        {

     

       7
       +
       -  const char *portal_dir = PKGDATADIR "/portals";

     

       8
       +
       -  g_autoptr(GFile) dir = g_file_new_for_path (portal_dir);

     

       9
       +
       -  g_autoptr(GFileEnumerator) enumerator = NULL;

     

       10
       +
        

     

       11
       +
       -  enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL);

     

       12
       +
       +  g_auto(GStrv) portal_dir_list;

     

       13
       +
       +  int i;

     

       14
       +
       +  const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH");

     

       15
       +
       +

     

       16
       +
       +  if (portal_dir == NULL)

     

       17
       +
       +    portal_dir = PKGDATADIR "/portals";

     

       18
       +
        

     

       19
       +
       -  if (enumerator == NULL)

     

       20
       +
       -    return;

     

       21
       +
       +  portal_dir_list = g_strsplit (portal_dir, G_SEARCHPATH_SEPARATOR_S, 0);

     

       22
       +
        

     

       23
       +
       -  while (TRUE)

     

       24
       +
       +  for (i = 0; portal_dir_list[i] != NULL; i++)

     

       25
       +
            {

     

       26
       +
       -      g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL);

     

       27
       +
       -      g_autoptr(GFile) child = NULL;

     

       28
       +
       -      g_autofree char *path = NULL;

     

       29
       +
       -      const char *name;

     

       30
       +
       -      g_autoptr(GError) error = NULL;

     

       31
       +
       +      portal_dir = portal_dir_list[i];

     

       32
       +
       +      g_autoptr(GFile) dir = g_file_new_for_path (portal_dir);

     

       33
       +
       +      g_autoptr(GFileEnumerator) enumerator = NULL;

     

       34
       +
       +      enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL);

     

       35
       +
        

     

       36
       +
       -      if (info == NULL)

     

       37
       +
       -        break;

     

       38
       +
       +      if (enumerator == NULL)

     

       39
       +
       +        continue;

     

       40
       +
        

     

       41
       +
       -      name = g_file_info_get_name (info);

     

       42
       +
       +      while (TRUE)

     

       43
       +
       +        {

     

       44
       +
       +          g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL);

     

       45
       +
       +          g_autoptr(GFile) child = NULL;

     

       46
       +
       +          g_autofree char *path = NULL;

     

       47
       +
       +          const char *name;

     

       48
       +
       +          g_autoptr(GError) error = NULL;

     

       49
       +
        

     

       50
       +
       -      if (!g_str_has_suffix (name, ".portal"))

     

       51
       +
       -        continue;

     

       52
       +
       +          if (info == NULL)

     

       53
       +
       +            break;

     

       54
       +
        

     

       55
       +
       -      child = g_file_enumerator_get_child (enumerator, info);

     

       56
       +
       -      path = g_file_get_path (child);

     

       57
       +
       +          name = g_file_info_get_name (info);

     

       58
       +
        

     

       59
       +
       -      if (!register_portal (path, &error))

     

       60
       +
       -        {

     

       61
       +
       -          g_warning ("Error loading %s: %s", path, error->message);

     

       62
       +
       -          continue;

     

       63
       +
       +          if (!g_str_has_suffix (name, ".portal"))

     

       64
       +
       +            continue;

     

       65
       +
       +

     

       66
       +
       +          child = g_file_enumerator_get_child (enumerator, info);

     

       67
       +
       +          path = g_file_get_path (child);

     

       68
       +
       +

     

       69
       +
       +          if (!register_portal (path, &error))

     

       70
       +
       +            {

     

       71
       +
       +              g_warning ("Error loading %s: %s", path, error->message);

     

       72
       +
       +              continue;

     

       73
       +
       +            }

     

       74
       +
                }

     

       75
       +
            }

     

       76
       +

+2 -2

pkgs/development/ocaml-modules/conduit/lwt-unix.nix

···

       1
        
       { stdenv, ocaml, findlib, jbuilder, conduit-lwt

     

       2
       -
       , logs, ppx_sexp_conv

     

       3
        
       }:

     

       4
        
       

     

       5
        
       if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0"

     
···

       12
        
       

     

       13
        
       	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];

     

       14
        
       

     

       15
       -
       	propagatedBuildInputs = [ conduit-lwt logs ];

     

       16
        
       

     

       17
        
       	buildPhase = "jbuilder build -p conduit-lwt-unix";

     

       18
        
       }

···

       1
        
       { stdenv, ocaml, findlib, jbuilder, conduit-lwt

     

       2
       +
       , logs, ppx_sexp_conv, lwt_ssl

     

       3
        
       }:

     

       4
        
       

     

       5
        
       if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0"

     
···

       12
        
       

     

       13
        
       	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];

     

       14
        
       

     

       15
       +
       	propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ];

     

       16
        
       

     

       17
        
       	buildPhase = "jbuilder build -p conduit-lwt-unix";

     

       18
        
       }

+2 -2

pkgs/development/ocaml-modules/ocurl/default.nix

···

       1
        
       { stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "ocurl-0.8.0";

     

       5
        
         src = fetchurl {

     

       6
        
           url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz";

     

       7
       -
           sha256 = "0292knvm9g038br0dc03lcsnbjqycyiqha256dp4bxkz3vmmz4wr";

     

       8
        
         };

     

       9
        
       

     

       10
        
         buildInputs = [ pkgconfig ocaml findlib ncurses ];

···

       1
        
       { stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         name = "ocurl-0.8.1";

     

       5
        
         src = fetchurl {

     

       6
        
           url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz";

     

       7
       +
           sha256 = "08ldzbx1k3mbjc01fmzsn86ll4paf331bcjss6iig6y6hgc9q3ry";

     

       8
        
         };

     

       9
        
       

     

       10
        
         buildInputs = [ pkgconfig ocaml findlib ncurses ];

+28

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

···

       1
       +
       { lib, buildPythonPackage, fetchFromGitHub, flask, mutagen }:

     

       2
       +
       

     

       3
       +
       buildPythonPackage rec {

     

       4
       +
         pname = "podcats";

     

       5
       +
         version = "v0.5.0";

     

       6
       +
         name = "${pname}-${version}";

     

       7
       +
       

     

       8
       +
         src = fetchFromGitHub {

     

       9
       +
           owner = "jakubroztocil";

     

       10
       +
           repo = "podcats";

     

       11
       +
           rev = version;

     

       12
       +
           sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc";

     

       13
       +
         };

     

       14
       +
       

     

       15
       +
         patchPhase = ''

     

       16
       +
           substituteInPlace podcats.py \

     

       17
       +
             --replace 'debug=True' 'debug=True, use_reloader=False'

     

       18
       +
         '';

     

       19
       +
       

     

       20
       +
         propagatedBuildInputs = [ flask mutagen ];

     

       21
       +
       

     

       22
       +
         meta = {

     

       23
       +
           description = "Application that generates RSS feeds for podcast episodes from local audio files";

     

       24
       +
           homepage = https://github.com/jakubroztocil/podcats;

     

       25
       +
           license = lib.licenses.bsd2;

     

       26
       +
           maintainers = with lib.maintainers; [ the-kenny ];

     

       27
       +
         };

     

       28
       +
       }

+8 -27

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

···

       1
       -
       { buildPythonPackage,

     

       2
        
         cudaSupport ? false, cudatoolkit ? null, cudnn ? null,

     

       3
       -
         fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, cmake,

     

       4
       -
         git, stdenv, linkFarm, symlinkJoin,

     

       5
        
         utillinux, which }:

     

       6
        
       

     

       7
        
       assert cudnn == null || cudatoolkit != null;

     
···

       25
        
           "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";

     

       26
        
       

     

       27
        
       in buildPythonPackage rec {

     

       28
       -
         version = "0.3.1";

     

       29
        
         pname = "pytorch";

     

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

     

       31
        
       

     
···

       34
        
           repo   = "pytorch";

     

       35
        
           rev    = "v${version}";

     

       36
        
           fetchSubmodules = true;

     

       37
       -
           sha256 = "1k8fr97v5pf7rni5cr2pi21ixc3pdj3h3lkz28njbjbgkndh7mr3";

     

       38
        
         };

     

       39
        
       

     

       40
       -
         patches = [

     

       41
       -
           (fetchpatch {

     

       42
       -
             # make sure stdatomic.h is included when checking for ATOMIC_INT_LOCK_FREE

     

       43
       -
             # Fixes this test failure:

     

       44
       -
             # RuntimeError: refcounted file mapping not supported on your system at /tmp/nix-build-python3.6-pytorch-0.3.0.drv-0/source/torch/lib/TH/THAllocator.c:525

     

       45
       -
             url = "https://github.com/pytorch/pytorch/commit/502aaf39cf4a878f9e4f849e5f409573aa598aa9.patch";

     

       46
       -
             stripLen = 3;

     

       47
       -
             extraPrefix = "torch/lib/";

     

       48
       -
             sha256 = "1miz4lhy3razjwcmhxqa4xmlcmhm65lqyin1czqczj8g16d3f62f";

     

       49
       -
           })

     

       50
       -
         ];

     

       51
       -
       

     

       52
       -
         postPatch = ''

     

       53
       -
           substituteInPlace test/run_test.sh --replace \

     

       54
       -
             "INIT_METHOD='file://'\$TEMP_DIR'/shared_init_file' \$PYCMD ./test_distributed.py" \

     

       55
       -
             "echo Skipped for Nix package"

     

       56
       -
         '';

     

       57
       -
       

     

       58
        
         preConfigure = lib.optionalString cudaSupport ''

     

       59
       -
           export CC=${cudatoolkit.cc}/bin/gcc

     

       60
        
         '' + lib.optionalString (cudaSupport && cudnn != null) ''

     

       61
        
           export CUDNN_INCLUDE_DIR=${cudnn}/include

     

       62
        
         '';

     

       63
        
       

     

       64
        
         buildInputs = [

     

       65
        
            cmake

     

       66
       -
            git

     

       67
        
            numpy.blas

     

       68
        
            utillinux

     

       69
        
            which

     
···

       73
        
           cffi

     

       74
        
           numpy

     

       75
        
           pyyaml

     

       76
       -
         ];

     

       77
        
       

     

       78
        
         checkPhase = ''

     

       79
       -
           ${cudaStubEnv}${stdenv.shell} test/run_test.sh

     

       80
        
         '';

     

       81
        
       

     

       82
        
         meta = {

···

       1
       +
       { buildPythonPackage, pythonOlder,

     

       2
        
         cudaSupport ? false, cudatoolkit ? null, cudnn ? null,

     

       3
       +
         fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, typing, cmake,

     

       4
       +
         stdenv, linkFarm, symlinkJoin,

     

       5
        
         utillinux, which }:

     

       6
        
       

     

       7
        
       assert cudnn == null || cudatoolkit != null;

     
···

       25
        
           "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";

     

       26
        
       

     

       27
        
       in buildPythonPackage rec {

     

       28
       +
         version = "0.4.0";

     

       29
        
         pname = "pytorch";

     

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

     

       31
        
       

     
···

       34
        
           repo   = "pytorch";

     

       35
        
           rev    = "v${version}";

     

       36
        
           fetchSubmodules = true;

     

       37
       +
           sha256 = "12d5vqqaprk0igmih7fwa65ldmaawgijxl58h6dnw660wysc132j";

     

       38
        
         };

     

       39
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
         preConfigure = lib.optionalString cudaSupport ''

     

       41
       +
           export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++

     

       42
        
         '' + lib.optionalString (cudaSupport && cudnn != null) ''

     

       43
        
           export CUDNN_INCLUDE_DIR=${cudnn}/include

     

       44
        
         '';

     

       45
        
       

     

       46
        
         buildInputs = [

     

       47
        
            cmake

     

       0
        
       
     

       48
        
            numpy.blas

     

       49
        
            utillinux

     

       50
        
            which

     
···

       54
        
           cffi

     

       55
        
           numpy

     

       56
        
           pyyaml

     

       57
       +
         ] ++ lib.optional (pythonOlder "3.5") typing;

     

       58
        
       

     

       59
        
         checkPhase = ''

     

       60
       +
           ${cudaStubEnv}python test/run_test.py --exclude distributed

     

       61
        
         '';

     

       62
        
       

     

       63
        
         meta = {

+1 -1

pkgs/development/r-modules/default.nix

···

       757
        
           });

     

       758
        
       

     

       759
        
           JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: {

     

       760
       -
             postPatch = ''

     

       761
        
               for file in {R,src}/*.R; do

     

       762
        
                   sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file

     

       763
        
               done

···

       757
        
           });

     

       758
        
       

     

       759
        
           JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: {

     

       760
       +
             postPatch = lib.optionalString stdenv.isDarwin ''

     

       761
        
               for file in {R,src}/*.R; do

     

       762
        
                   sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file

     

       763
        
               done

+103

pkgs/development/tools/flatpak-builder/default.nix

···

       1
       +
       { stdenv

     

       2
       +
       , fetchurl

     

       3
       +
       , substituteAll

     

       4
       +
       

     

       5
       +
       , autoreconfHook

     

       6
       +
       , docbook_xml_dtd_412

     

       7
       +
       , docbook_xml_dtd_42

     

       8
       +
       , docbook_xml_dtd_43

     

       9
       +
       , docbook_xsl

     

       10
       +
       , gettext

     

       11
       +
       , libxml2

     

       12
       +
       , libxslt

     

       13
       +
       , pkgconfig

     

       14
       +
       , xmlto

     

       15
       +
       

     

       16
       +
       , acl

     

       17
       +
       , bazaar

     

       18
       +
       , binutils

     

       19
       +
       , bzip2

     

       20
       +
       , coreutils

     

       21
       +
       , cpio

     

       22
       +
       , elfutils

     

       23
       +
       , flatpak

     

       24
       +
       , gitMinimal

     

       25
       +
       , glib

     

       26
       +
       , gnutar

     

       27
       +
       , json_glib

     

       28
       +
       , libcap

     

       29
       +
       , libdwarf

     

       30
       +
       , libsoup

     

       31
       +
       , ostree

     

       32
       +
       , patch

     

       33
       +
       , rpm

     

       34
       +
       , unzip

     

       35
       +
       }:

     

       36
       +
       

     

       37
       +
       let

     

       38
       +
         version = "0.10.10";

     

       39
       +
       in stdenv.mkDerivation rec {

     

       40
       +
         name = "flatpak-builder-${version}";

     

       41
       +
       

     

       42
       +
         outputs = [ "out" "doc" "man" ];

     

       43
       +
       

     

       44
       +
         src = fetchurl {

     

       45
       +
           url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";

     

       46
       +
           sha256 = "0b0c2rmf2vj596600blbhsiv2dg7qwpr33lgdcn0bnqc4ddri6f2";

     

       47
       +
         };

     

       48
       +
       

     

       49
       +
         nativeBuildInputs = [

     

       50
       +
           autoreconfHook

     

       51
       +
           docbook_xml_dtd_412

     

       52
       +
           docbook_xml_dtd_42

     

       53
       +
           docbook_xml_dtd_43

     

       54
       +
           docbook_xsl

     

       55
       +
           gettext

     

       56
       +
           libxml2

     

       57
       +
           libxslt

     

       58
       +
           pkgconfig

     

       59
       +
           xmlto

     

       60
       +
         ];

     

       61
       +
       

     

       62
       +
         buildInputs = [

     

       63
       +
           acl

     

       64
       +
           bzip2

     

       65
       +
           elfutils

     

       66
       +
           flatpak

     

       67
       +
           glib

     

       68
       +
           json_glib

     

       69
       +
           libcap

     

       70
       +
           libdwarf

     

       71
       +
           libsoup

     

       72
       +
           libxml2

     

       73
       +
           ostree

     

       74
       +
         ];

     

       75
       +
       

     

       76
       +
         patches = [

     

       77
       +
           # patch taken from gtk_doc

     

       78
       +
           ./respect-xml-catalog-files-var.patch

     

       79
       +
           (substituteAll {

     

       80
       +
             src = ./fix-paths.patch;

     

       81
       +
             bzr = "${bazaar}/bin/bzr";

     

       82
       +
             cp = "${coreutils}/bin/cp";

     

       83
       +
             patch = "${patch}/bin/patch";

     

       84
       +
             tar = "${gnutar}/bin/tar";

     

       85
       +
             unzip = "${unzip}/bin/unzip";

     

       86
       +
             rpm2cpio = "${rpm}/bin/rpm2cpio";

     

       87
       +
             cpio = "${cpio}/bin/cpio";

     

       88
       +
             git = "${gitMinimal}/bin/git";

     

       89
       +
             rofilesfuse = "${ostree}/bin/rofiles-fuse";

     

       90
       +
             strip = "${binutils}/bin/strip";

     

       91
       +
             eustrip = "${elfutils}/bin/eu-strip";

     

       92
       +
             euelfcompress = "${elfutils}/bin/eu-elfcompress";

     

       93
       +
           })

     

       94
       +
         ];

     

       95
       +
       

     

       96
       +
         meta = with stdenv.lib; {

     

       97
       +
           description = "Tool to build flatpaks from source";

     

       98
       +
           homepage = https://flatpak.org/;

     

       99
       +
           license = licenses.lgpl21;

     

       100
       +
           maintainers = with maintainers; [ jtojnar ];

     

       101
       +
           platforms = platforms.linux;

     

       102
       +
         };

     

       103
       +
       }

+116

pkgs/development/tools/flatpak-builder/fix-paths.patch

···

       1
       +
       --- a/src/builder-context.c

     

       2
       +
       +++ b/src/builder-context.c

     

       3
       +
       @@ -711,7 +711,7 @@

     

       4
       +
          g_autoptr(GFile) rofiles_base = NULL;

     

       5
       +
          g_autoptr(GFile) rofiles_dir = NULL;

     

       6
       +
          g_autofree char *tmpdir_name = NULL;

     

       7
       +
       -  char *argv[] = { "rofiles-fuse",

     

       8
       +
       +  char *argv[] = { "@rofilesfuse@",

     

       9
       +
                           "-o",

     

       10
       +
                           "kernel_cache,entry_timeout=60,attr_timeout=60,splice_write,splice_move",

     

       11
       +
                           (char *)flatpak_file_get_path_cached (self->app_dir),

     

       12
       +
       --- a/src/builder-git.c

     

       13
       +
       +++ b/src/builder-git.c

     

       14
       +
       @@ -44,7 +44,7 @@

     

       15
       +
          va_list ap;

     

       16
       +
        

     

       17
       +
          va_start (ap, error);

     

       18
       +
       -  res = flatpak_spawn (dir, output, flags, error, "git", ap);

     

       19
       +
       +  res = flatpak_spawn (dir, output, flags, error, "@git@", ap);

     

       20
       +
          va_end (ap);

     

       21
       +
        

     

       22
       +
          return res;

     

       23
       +
       @@ -58,7 +58,7 @@

     

       24
       +
          va_list ap;

     

       25
       +
        

     

       26
       +
          va_start (ap, error);

     

       27
       +
       -  res = flatpak_spawn (NULL, NULL, 0, error, "cp", ap);

     

       28
       +
       +  res = flatpak_spawn (NULL, NULL, 0, error, "@cp@", ap);

     

       29
       +
          va_end (ap);

     

       30
       +
        

     

       31
       +
          return res;

     

       32
       +
       --- a/src/builder-source-archive.c

     

       33
       +
       +++ b/src/builder-source-archive.c

     

       34
       +
       @@ -401,7 +401,7 @@

     

       35
       +
          va_list ap;

     

       36
       +
        

     

       37
       +
          va_start (ap, error);

     

       38
       +
       -  res = flatpak_spawn (dir, NULL, 0, error, "tar", ap);

     

       39
       +
       +  res = flatpak_spawn (dir, NULL, 0, error, "@tar@", ap);

     

       40
       +
          va_end (ap);

     

       41
       +
        

     

       42
       +
          return res;

     

       43
       +
       @@ -416,7 +416,7 @@

     

       44
       +
          va_list ap;

     

       45
       +
        

     

       46
       +
          va_start (ap, error);

     

       47
       +
       -  res = flatpak_spawn (dir, NULL, 0, error, "unzip", ap);

     

       48
       +
       +  res = flatpak_spawn (dir, NULL, 0, error, "@unzip@", ap);

     

       49
       +
          va_end (ap);

     

       50
       +
        

     

       51
       +
          return res;

     

       52
       +
       @@ -428,7 +428,7 @@

     

       53
       +
               GError **error)

     

       54
       +
        {

     

       55
       +
          gboolean res;

     

       56
       +
       -  const gchar *argv[] = { "sh", "-c", "rpm2cpio \"$1\" | cpio -i -d",

     

       57
       +
       +  const gchar *argv[] = { "sh", "-c", "@rpm2cpio@ \"$1\" | @cpio@ -i -d",

     

       58
       +
              "sh", /* shell's $0 */

     

       59
       +
              rpm_path, /* shell's $1 */

     

       60
       +
              NULL };

     

       61
       +
       --- a/src/builder-source-bzr.c

     

       62
       +
       +++ b/src/builder-source-bzr.c

     

       63
       +
       @@ -124,7 +124,7 @@

     

       64
       +
          va_list ap;

     

       65
       +
        

     

       66
       +
          va_start (ap, error);

     

       67
       +
       -  res = flatpak_spawn (dir, output, 0, error, "bzr", ap);

     

       68
       +
       +  res = flatpak_spawn (dir, output, 0, error, "@bzr@", ap);

     

       69
       +
          va_end (ap);

     

       70
       +
        

     

       71
       +
          return res;

     

       72
       +
       --- a/src/builder-source-patch.c

     

       73
       +
       +++ b/src/builder-source-patch.c

     

       74
       +
       @@ -204,11 +204,11 @@

     

       75
       +
        

     

       76
       +
          args = g_ptr_array_new ();

     

       77
       +
          if (use_git) {

     

       78
       +
       -    g_ptr_array_add (args, "git");

     

       79
       +
       +    g_ptr_array_add (args, "@git@");

     

       80
       +
            g_ptr_array_add (args, "apply");

     

       81
       +
            g_ptr_array_add (args, "-v");

     

       82
       +
          } else {

     

       83
       +
       -    g_ptr_array_add (args, "patch");

     

       84
       +
       +    g_ptr_array_add (args, "@patch@");

     

       85
       +
          }

     

       86
       +
          for (i = 0; extra_options != NULL && extra_options[i] != NULL; i++)

     

       87
       +
            g_ptr_array_add (args, (gchar *) extra_options[i]);

     

       88
       +
       --- a/src/builder-utils.c

     

       89
       +
       +++ b/src/builder-utils.c

     

       90
       +
       @@ -139,7 +139,7 @@

     

       91
       +
          va_list ap;

     

       92
       +
        

     

       93
       +
          va_start (ap, error);

     

       94
       +
       -  res = flatpak_spawn (NULL, NULL, 0, error, "strip", ap);

     

       95
       +
       +  res = flatpak_spawn (NULL, NULL, 0, error, "@strip@", ap);

     

       96
       +
          va_end (ap);

     

       97
       +
        

     

       98
       +
          return res;

     

       99
       +
       @@ -153,7 +153,7 @@

     

       100
       +
          va_list ap;

     

       101
       +
        

     

       102
       +
          va_start (ap, error);

     

       103
       +
       -  res = flatpak_spawn (NULL, NULL, 0, error, "eu-strip", ap);

     

       104
       +
       +  res = flatpak_spawn (NULL, NULL, 0, error, "@eustrip@", ap);

     

       105
       +
          va_end (ap);

     

       106
       +
        

     

       107
       +
          return res;

     

       108
       +
       @@ -167,7 +167,7 @@

     

       109
       +
          va_list ap;

     

       110
       +
        

     

       111
       +
          va_start (ap, error);

     

       112
       +
       -  res = flatpak_spawn (NULL, NULL, 0, error, "eu-elfcompress", ap);

     

       113
       +
       +  res = flatpak_spawn (NULL, NULL, 0, error, "@euelfcompress@", ap);

     

       114
       +
          va_end (ap);

     

       115
       +
        

     

       116
       +
          return res;

+13

pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch

···

       1
       +
       --- a/acinclude.m4

     

       2
       +
       +++ b/acinclude.m4

     

       3
       +
       @@ -40,8 +40,8 @@

     

       4
       +
        [

     

       5
       +
          AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl

     

       6
       +
          AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])

     

       7
       +
       -  if $jh_found_xmlcatalog && \

     

       8
       +
       -     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then

     

       9
       +
       +  # empty argument forces libxml to use XML_CATALOG_FILES variable

     

       10
       +
       +  if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then

     

       11
       +
            AC_MSG_RESULT([found])

     

       12
       +
            ifelse([$3],,,[$3

     

       13
       +
        ])dnl

+7 -9

pkgs/development/tools/repository-managers/nexus/default.nix

···

       1
        
       { stdenv, fetchurl, makeWrapper, jre, gawk }:

     

       0
        
       
     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         name = "nexus-${version}";

     

       4
       -
         version = "3.5.1-02";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-mac.tgz";

     

       8
       -
           sha256 = "5ef3512c2bbdd45ef35921c1a0ba109b45bd9dad88311750196aa689262258b6";

     

       9
        
         };

     

       10
        
       

     

       11
        
         sourceRoot = name;

     

       12
        
       

     

       13
        
         nativeBuildInputs = [ makeWrapper ];

     

       14
        
       

     

       15
       -
         patches = [ ./nexus-bin.patch ];

     

       16
        
       

     

       17
        
         postPatch = ''

     

       18
        
           substituteInPlace bin/nexus.vmoptions \

     

       19
       -
             --replace ../sonatype-work/nexus3 /run/sonatype-work/nexus3 \

     

       20
        
             --replace etc/karaf $out/etc/karaf \

     

       21
        
             --replace =. =$out

     

       22
        
         '';

     
···

       28
        
           cp -rfv * .install4j $out

     

       29
        
           rm -fv $out/bin/nexus.bat

     

       30
        
       

     

       31
       -
           runHook postInstall

     

       32
       -
         '';

     

       33
       -
       

     

       34
       -
         postInstall = ''

     

       35
        
           wrapProgram $out/bin/nexus \

     

       36
        
             --set JAVA_HOME ${jre} \

     

       37
        
             --set ALTERNATIVE_NAME "nexus" \

     

       38
        
             --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}"

     

       0
        
       
     

       0
        
       
     

       39
        
         '';

     

       40
        
       

     

       41
        
         meta = with stdenv.lib; {

     
···

       43
        
           homepage = http://www.sonatype.org/nexus;

     

       44
        
           license = licenses.epl10;

     

       45
        
           platforms = platforms.all;

     

       46
       -
           maintainers = with maintainers; [ aespinosa ironpinguin ];

     

       47
        
         };

     

       48
        
       }

···

       1
        
       { stdenv, fetchurl, makeWrapper, jre, gawk }:

     

       2
       +
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "3.11.0-01";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-mac.tgz";

     

       9
       +
           sha256 = "1h5nfzb1sqhzb5j7w2dpmdi7vnnc9g6zx43a44f3zjvlxh1s0vim";

     

       10
        
         };

     

       11
        
       

     

       12
        
         sourceRoot = name;

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ makeWrapper ];

     

       15
        
       

     

       16
       +
         patches = [ ./nexus-bin.patch ./nexus-vm-opts.patch ];

     

       17
        
       

     

       18
        
         postPatch = ''

     

       19
        
           substituteInPlace bin/nexus.vmoptions \

     

       0
        
       
     

       20
        
             --replace etc/karaf $out/etc/karaf \

     

       21
        
             --replace =. =$out

     

       22
        
         '';

     
···

       28
        
           cp -rfv * .install4j $out

     

       29
        
           rm -fv $out/bin/nexus.bat

     

       30
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
           wrapProgram $out/bin/nexus \

     

       32
        
             --set JAVA_HOME ${jre} \

     

       33
        
             --set ALTERNATIVE_NAME "nexus" \

     

       34
        
             --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}"

     

       35
       +
       

     

       36
       +
           runHook postInstall

     

       37
        
         '';

     

       38
        
       

     

       39
        
         meta = with stdenv.lib; {

     
···

       41
        
           homepage = http://www.sonatype.org/nexus;

     

       42
        
           license = licenses.epl10;

     

       43
        
           platforms = platforms.all;

     

       44
       +
           maintainers = with maintainers; [ aespinosa ironpinguin ma27 ];

     

       45
        
         };

     

       46
        
       }

+14

pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch

···

       1
       +
       diff --git a/bin/nexus b/bin/nexus

     

       2
       +
       index e7ed3fb..8db766b 100755

     

       3
       +
       --- a/bin/nexus

     

       4
       +
       +++ b/bin/nexus

     

       5
       +
       @@ -440,7 +440,8 @@ add_class_path "$app_home/lib/boot/org.apache.karaf.diagnostic.boot-4.0.9.jar"

     

       6
       +
        add_class_path "$app_home/lib/boot/org.apache.karaf.jaas.boot-4.0.9.jar"

     

       7
       +
        

     

       8
       +
        vmoptions_val=""

     

       9
       +
       -read_vmoptions "$prg_dir/$progname.vmoptions"

     

       10
       +
       +VM_OPTS=${VM_OPTS_FILE:-"$prg_dir/$progname.vmoptions"}

     

       11
       +
       +read_vmoptions "$VM_OPTS"

     

       12
       +
        INSTALL4J_ADD_VM_PARAMS="$INSTALL4J_ADD_VM_PARAMS $vmoptions_val"

     

       13
       +
        

     

       14
       +

+3 -2

pkgs/os-specific/linux/iproute/default.nix

···

       1
       -
       { fetchurl, stdenv, lib, flex, bash, bison, db, iptables, pkgconfig }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       26
        
           "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers

     

       27
        
         ];

     

       28
        
       

     

       0
        
       
     

       29
        
         buildFlags = [

     

       30
       -
           "CONFDIR=/etc/iproute2"

     

       31
        
         ];

     

       32
        
       

     

       33
        
         installFlags = [

···

       1
       +
       { fetchurl, stdenv, config, lib, flex, bash, bison, db, iptables, pkgconfig }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       26
        
           "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers

     

       27
        
         ];

     

       28
        
       

     

       29
       +
         # enable iproute2 module if you want this folder to be created

     

       30
        
         buildFlags = [

     

       31
       +
           "CONFDIR=${config.iproute2.confDir or "/run/iproute2"}"

     

       32
        
         ];

     

       33
        
       

     

       34
        
         installFlags = [

pkgs/os-specific/linux/kernel/common-config.nix

···

       636
        
           X86_X2APIC y

     

       637
        
           IRQ_REMAP y

     

       638
        
         ''}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       639
        
       

     

       640
        
         # Disable the firmware helper fallback, udev doesn't implement it any more

     

       641
        
         FW_LOADER_USER_HELPER_FALLBACK? n

···

       636
        
           X86_X2APIC y

     

       637
        
           IRQ_REMAP y

     

       638
        
         ''}

     

       639
       +
         

     

       640
       +
         # needed for iwd WPS support (wpa_supplicant replacement)

     

       641
       +
         ${optionalString (versionAtLeast version "4.7") ''

     

       642
       +
           KEY_DH_OPERATIONS y

     

       643
       +
         ''}

     

       644
        
       

     

       645
        
         # Disable the firmware helper fallback, udev doesn't implement it any more

     

       646
        
         FW_LOADER_USER_HELPER_FALLBACK? n

+3 -3

pkgs/os-specific/linux/kernel/linux-testing.nix

···

       1
        
       { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
       -
         version = "4.17-rc4";

     

       5
       -
         modDirVersion = "4.17.0-rc4";

     

       6
        
         extraMeta.branch = "4.17";

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
        
           url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";

     

       10
       -
           sha256 = "1y34hpzgxblwqslhsfsmzmpv9f3s936r93wgn4kmhkcwsm0in292";

     

       11
        
         };

     

       12
        
       

     

       13
        
         # Should the testing kernels ever be built on Hydra?

···

       1
        
       { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
       +
         version = "4.17-rc5";

     

       5
       +
         modDirVersion = "4.17.0-rc5";

     

       6
        
         extraMeta.branch = "4.17";

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
        
           url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";

     

       10
       +
           sha256 = "1khx3s8nb604h23hasamshcvcwll0j4vi5v6v274ls01ja9mg1xk";

     

       11
        
         };

     

       12
        
       

     

       13
        
         # Should the testing kernels ever be built on Hydra?

+2 -2

pkgs/servers/metabase/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       -
         version = "0.29.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "http://downloads.metabase.com/v${version}/metabase.jar";

     

       9
       -
           sha256 = "1dfq06cm8k36pkqpng4cd8ax8cdxbcssww4vapq2w9ccflpnlam2";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "0.29.2";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "http://downloads.metabase.com/v${version}/metabase.jar";

     

       9
       +
           sha256 = "02cba755mfim8q403gj02ggc0gg4ckcyalxkw09k0jqi5irdi4h1";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

+16 -18

pkgs/servers/monitoring/plugins/labs_consol_de.nix

···

       1
       -
       { stdenv, fetchFromGitHub, buildPerlPackage, autoreconfHook, makeWrapper

     

       2
        
       , perl, NetSNMP, coreutils, gnused, gnugrep }:

     

       3
        
       

     

       4
        
       let

     

       5
       -
         owner = "lausser";

     

       6
       -
       

     

       7
        
         glplugin = fetchFromGitHub {

     

       0
        
       
     

       8
        
           repo   = "GLPlugin";

     

       9
       -
           rev    = "b92a261ca4bf84e5b20d3025cc9a31ade03c474b";

     

       10
       -
           sha256 = "0kflnmpjmklq8fy2vf2h8qyvaiznymdi09z2h5qscrfi51xc9gmh";

     

       11
       -
           inherit owner;

     

       12
        
         };

     

       13
        
       

     

       14
       -
         generic = { pname, version, rev, sha256, description, ... } @ attrs:

     

       15
        
         let

     

       16
        
           attrs' = builtins.removeAttrs attrs [ "pname" "version" "rev" "sha256"];

     

       0
        
       
     

       17
        
         in perl.stdenv.mkDerivation rec {

     

       18
       -
           name = stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}-${version}";

     

       19
        
       

     

       20
       -
           src = fetchFromGitHub {

     

       21
       -
             repo   = pname;

     

       22
       -
             inherit owner rev sha256;

     

       23
        
           };

     

       24
        
       

     

       25
        
           buildInputs = [ perl NetSNMP ];

     
···

       27
        
           nativeBuildInputs = [ autoreconfHook makeWrapper ];

     

       28
        
       

     

       29
        
           prePatch = with stdenv.lib; ''

     

       30
       -
             ln -s ${glplugin}/* GLPlugin

     

       0
        
       
     

       31
        
             substituteInPlace plugins-scripts/Makefile.am \

     

       32
        
               --replace /bin/cat  ${getBin coreutils}/bin/cat \

     

       33
        
               --replace /bin/echo ${getBin coreutils}/bin/echo \

     
···

       56
        
       in {

     

       57
        
         check-nwc-health = generic {

     

       58
        
           pname       = "check_nwc_health";

     

       59
       -
           version     = "20170804";

     

       60
       -
           rev         = "e959b412b5cf027c82a446668e026214fdcf8df3";

     

       61
       -
           sha256      = "11l74xw62g15rqrbf9ff2bfd5iw159gwhhgbkxwdqi8sp9j6navk";

     

       62
        
           description = "Check plugin for network equipment.";

     

       63
        
         };

     

       64
        
       

     

       65
        
         check-ups-health = generic {

     

       66
        
           pname       = "check_ups_health";

     

       67
       -
           version     = "20170804";

     

       68
       -
           rev         = "32a8a359ea46ec0d6f3b7aea19ddedaad63b04b9";

     

       69
       -
           sha256      = "05na48dxfxrg0i9185j1ck2795p0rw1zwcs8ra0f14cm0qw0lp4l";

     

       70
        
           description = "Check plugin for UPSs.";

     

       71
        
         };

     

       72
        
       }

···

       1
       +
       { stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper

     

       2
        
       , perl, NetSNMP, coreutils, gnused, gnugrep }:

     

       3
        
       

     

       4
        
       let

     

       0
        
       
     

       0
        
       
     

       5
        
         glplugin = fetchFromGitHub {

     

       6
       +
           owner = "lausser";

     

       7
        
           repo   = "GLPlugin";

     

       8
       +
           rev    = "e8e1a2907a54435c932b3e6c584ba1d679754849";

     

       9
       +
           sha256 = "0wb55a9pmgbilfffx0wkiikg9830qd66j635ypczqp4basslpq5b";

     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
       +
         generic = { pname, version, sha256, description, ... } @ attrs:

     

       13
        
         let

     

       14
        
           attrs' = builtins.removeAttrs attrs [ "pname" "version" "rev" "sha256"];

     

       15
       +
           name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}"}-${version}";

     

       16
        
         in perl.stdenv.mkDerivation rec {

     

       17
       +
           name = "${pname}-${version}";

     

       18
        
       

     

       19
       +
           src = fetchurl {

     

       20
       +
             url = "https://labs.consol.de/assets/downloads/nagios/${name'}.tar.gz";

     

       21
       +
             inherit sha256;

     

       22
        
           };

     

       23
        
       

     

       24
        
           buildInputs = [ perl NetSNMP ];

     
···

       26
        
           nativeBuildInputs = [ autoreconfHook makeWrapper ];

     

       27
        
       

     

       28
        
           prePatch = with stdenv.lib; ''

     

       29
       +
             rm -rf GLPlugin

     

       30
       +
             ln -s ${glplugin} GLPlugin

     

       31
        
             substituteInPlace plugins-scripts/Makefile.am \

     

       32
        
               --replace /bin/cat  ${getBin coreutils}/bin/cat \

     

       33
        
               --replace /bin/echo ${getBin coreutils}/bin/echo \

     
···

       56
        
       in {

     

       57
        
         check-nwc-health = generic {

     

       58
        
           pname       = "check_nwc_health";

     

       59
       +
           version     = "7.0.1.3";

     

       60
       +
           sha256      = "0rgd6zgd7kplx3z72n8zbzwkh8vnd83361sk9ibh6ng78sds1sl5";

     

       0
        
       
     

       61
        
           description = "Check plugin for network equipment.";

     

       62
        
         };

     

       63
        
       

     

       64
        
         check-ups-health = generic {

     

       65
        
           pname       = "check_ups_health";

     

       66
       +
           version     = "2.8.2.2";

     

       67
       +
           sha256      = "1gc2wjsymay2vk5ywc1jj9cvrbhs0fs851x8l4nc75df2g75v521";

     

       0
        
       
     

       68
        
           description = "Check plugin for UPSs.";

     

       69
        
         };

     

       70
        
       }

+2 -2

pkgs/tools/graphics/maim/default.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "maim-${version}";

     

       8
       -
         version = "5.5";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "naelstrof";

     

       12
        
           repo = "maim";

     

       13
        
           rev = "v${version}";

     

       14
       -
           sha256 = "0dr44lwqsvhwf9pncxq6k42zj9hj07b96qsk1q8vh4l42zcpqzla";

     

       15
        
         };

     

       16
        
       

     

       17
        
         nativeBuildInputs = [ cmake pkgconfig ];

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "maim-${version}";

     

       8
       +
         version = "5.5.1";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "naelstrof";

     

       12
        
           repo = "maim";

     

       13
        
           rev = "v${version}";

     

       14
       +
           sha256 = "106qg85q0aiw4w08vjg9j60brrbln11b8vdycjqkv8fq00pq308i";

     

       15
        
         };

     

       16
        
       

     

       17
        
         nativeBuildInputs = [ cmake pkgconfig ];

+13 -12

pkgs/tools/misc/staruml/default.nix

···

       1
        
       { stdenv, fetchurl, makeWrapper

     

       2
        
       , dpkg, patchelf

     

       3
       -
       , gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd }:

     

       0
        
       
     

       4
        
       

     

       5
        
       let

     

       6
        
         inherit (stdenv) lib;

     

       7
        
         LD_LIBRARY_PATH = lib.makeLibraryPath

     

       8
       -
           [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ];

     

       9
        
       in

     

       10
        
       stdenv.mkDerivation rec {

     

       11
       -
         version = "2.6.0";

     

       12
        
         name = "staruml-${version}";

     

       13
        
       

     

       14
        
         src =

     

       15
        
           if stdenv.system == "i686-linux" then fetchurl {

     

       16
        
             url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";

     

       17
       -
             sha256 = "684d7ce7827a98af5bf17bf68d18f934fd970f13a2112a121b1f1f76d6387849";

     

       18
        
           } else fetchurl {

     

       19
        
             url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb";

     

       20
       -
             sha256 = "36e0bdc1bb57b7d808a007a3fafb1b38662d5b0793424d5ad4f51a3a6a9a636d";

     

       21
        
           };

     

       22
        
       

     

       23
        
         buildInputs = [ dpkg ];

     
···

       34
        
           mkdir $out

     

       35
        
           mv opt/staruml $out/bin

     

       36
        
       

     

       37
       -
           ${patchelf}/bin/patchelf \

     

       38
       -
             --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       39
       -
             $out/bin/StarUML

     

       40
       -
       

     

       41
        
           mkdir -p $out/lib

     

       42
       -
       

     

       43
        
           ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/

     

       44
        
           ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0

     

       45
        
       

     

       46
       -
           wrapProgram $out/bin/StarUML \

     

       47
       -
             --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       48
        
         '';

     

       49
        
       

     

       50
        
         meta = with stdenv.lib; {

···

       1
        
       { stdenv, fetchurl, makeWrapper

     

       2
        
       , dpkg, patchelf

     

       3
       +
       , gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd

     

       4
       +
       , libXdamage }:

     

       5
        
       

     

       6
        
       let

     

       7
        
         inherit (stdenv) lib;

     

       8
        
         LD_LIBRARY_PATH = lib.makeLibraryPath

     

       9
       +
           [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage ];

     

       10
        
       in

     

       11
        
       stdenv.mkDerivation rec {

     

       12
       +
         version = "2.8.1";

     

       13
        
         name = "staruml-${version}";

     

       14
        
       

     

       15
        
         src =

     

       16
        
           if stdenv.system == "i686-linux" then fetchurl {

     

       17
        
             url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";

     

       18
       +
             sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n";

     

       19
        
           } else fetchurl {

     

       20
        
             url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb";

     

       21
       +
             sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0";

     

       22
        
           };

     

       23
        
       

     

       24
        
         buildInputs = [ dpkg ];

     
···

       35
        
           mkdir $out

     

       36
        
           mv opt/staruml $out/bin

     

       37
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       38
        
           mkdir -p $out/lib

     

       0
        
       
     

       39
        
           ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/

     

       40
        
           ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0

     

       41
        
       

     

       42
       +
           for binary in StarUML Brackets-node; do

     

       43
       +
             ${patchelf}/bin/patchelf \

     

       44
       +
               --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       45
       +
               $out/bin/$binary

     

       46
       +
             wrapProgram $out/bin/$binary \

     

       47
       +
               --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}

     

       48
       +
           done

     

       49
        
         '';

     

       50
        
       

     

       51
        
         meta = with stdenv.lib; {

-24

pkgs/tools/networking/telnet/default.nix

···

       1
       -
       {stdenv, fetchurl, ncurses}:

     

       2
       -
       

     

       3
       -
       stdenv.mkDerivation {

     

       4
       -
         name = "telnet-1.2";

     

       5
       -
       

     

       6
       -
         src = fetchurl {

     

       7
       -
           #url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2; # broken

     

       8
       -
           url = mirror://gentoo/distfiles/telnet-bsd-1.2.tar.bz2;

     

       9
       -
           sha256 = "0cs7ks22dhcn5qfjv2vl6ikhw93x68gg33zdn5f5cxgg81kx5afn";

     

       10
       -
         };

     

       11
       -
       

     

       12
       -
         hardeningDisable = [ "format" ];

     

       13
       -
       

     

       14
       -
         buildInputs = [ncurses];

     

       15
       -
       

     

       16
       -
         doInstallCheck = false; # fails

     

       17
       -
       

     

       18
       -
         meta = {

     

       19
       -
           description = "A client and daemon for the Telnet protocol";

     

       20
       -
           homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/;

     

       21
       -
           license = "BSD";

     

       22
       -
           platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;

     

       23
       -
         };

     

       24
       -
       }

pkgs/top-level/aliases.nix

···

       275
        
         telepathy_qt = telepathy-qt; # added 2018-02-25

     

       276
        
         telepathy_qt5 = libsForQt5.telepathy;  # added 2015-12-19

     

       277
        
         telepathy_salut = telepathy-salut; # added 2018-02-25

     

       0
        
       
     

       278
        
         tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03

     

       279
        
         tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03

     

       280
        
         tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03

···

       275
        
         telepathy_qt = telepathy-qt; # added 2018-02-25

     

       276
        
         telepathy_qt5 = libsForQt5.telepathy;  # added 2015-12-19

     

       277
        
         telepathy_salut = telepathy-salut; # added 2018-02-25

     

       278
       +
         telnet = inetutils; # added 2018-05-15

     

       279
        
         tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03

     

       280
        
         tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03

     

       281
        
         tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03

+10 -2

pkgs/top-level/all-packages.nix

···

       2305
        
       

     

       2306
        
         flashbench = callPackage ../os-specific/linux/flashbench { };

     

       2307
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2308
        
         figlet = callPackage ../tools/misc/figlet { };

     

       2309
        
       

     

       2310
        
         file = callPackage ../tools/misc/file { };

     
···

       5147
        
         ted = callPackage ../tools/typesetting/ted { };

     

       5148
        
       

     

       5149
        
         teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };

     

       5150
       -
       

     

       5151
       -
         telnet = callPackage ../tools/networking/telnet { };

     

       5152
        
       

     

       5153
        
         telegraf = callPackage ../servers/monitoring/telegraf { };

     

       5154
        
       

     
···

       15962
        
       

     

       15963
        
         moe =  callPackage ../applications/editors/moe { };

     

       15964
        
       

     

       0
        
       
     

       0
        
       
     

       15965
        
         praat = callPackage ../applications/audio/praat { };

     

       15966
        
       

     

       15967
        
         quvi = callPackage ../applications/video/quvi/tool.nix {

     
···

       18558
        
         compton-git = callPackage ../applications/window-managers/compton/git.nix { };

     

       18559
        
       

     

       18560
        
         xdaliclock = callPackage ../tools/misc/xdaliclock {};

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18561
        
       

     

       18562
        
         xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };

     

       18563

···

       2305
        
       

     

       2306
        
         flashbench = callPackage ../os-specific/linux/flashbench { };

     

       2307
        
       

     

       2308
       +
         flatpak = callPackage ../development/libraries/flatpak { };

     

       2309
       +
       

     

       2310
       +
         flatpak-builder = callPackage ../development/tools/flatpak-builder { };

     

       2311
       +
       

     

       2312
        
         figlet = callPackage ../tools/misc/figlet { };

     

       2313
        
       

     

       2314
        
         file = callPackage ../tools/misc/file { };

     
···

       5151
        
         ted = callPackage ../tools/typesetting/ted { };

     

       5152
        
       

     

       5153
        
         teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };

     

       0
        
       
     

       0
        
       
     

       5154
        
       

     

       5155
        
         telegraf = callPackage ../servers/monitoring/telegraf { };

     

       5156
        
       

     
···

       15964
        
       

     

       15965
        
         moe =  callPackage ../applications/editors/moe { };

     

       15966
        
       

     

       15967
       +
         multibootusb = callPackage ../applications/misc/multibootusb {};

     

       15968
       +
       

     

       15969
        
         praat = callPackage ../applications/audio/praat { };

     

       15970
        
       

     

       15971
        
         quvi = callPackage ../applications/video/quvi/tool.nix {

     
···

       18562
        
         compton-git = callPackage ../applications/window-managers/compton/git.nix { };

     

       18563
        
       

     

       18564
        
         xdaliclock = callPackage ../tools/misc/xdaliclock {};

     

       18565
       +
       

     

       18566
       +
         xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };

     

       18567
       +
       

     

       18568
       +
         xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };

     

       18569
        
       

     

       18570
        
         xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };

     

       18571

+15 -1

pkgs/top-level/python-packages.nix

···

       3847
        
       

     

       3848
        
         podcastparser = callPackage ../development/python-modules/podcastparser { };

     

       3849
        
       

     

       0
        
       
     

       0
        
       
     

       3850
        
         pomegranate = callPackage ../development/python-modules/pomegranate { };

     

       3851
        
       

     

       3852
        
         poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {

     
···

       5590
        
           };

     

       5591
        
         };

     

       5592
        
       

     

       5593
       -
         pytorch = callPackage ../development/python-modules/pytorch {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5594
        
           cudaSupport = pkgs.config.cudaSupport or false;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5595
        
         };

     

       5596
        
       

     

       5597
        
         pytorchWithCuda = self.pytorch.override {

···

       3847
        
       

     

       3848
        
         podcastparser = callPackage ../development/python-modules/podcastparser { };

     

       3849
        
       

     

       3850
       +
         podcats = callPackage ../development/python-modules/podcats { };

     

       3851
       +
       

     

       3852
        
         pomegranate = callPackage ../development/python-modules/pomegranate { };

     

       3853
        
       

     

       3854
        
         poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {

     
···

       5592
        
           };

     

       5593
        
         };

     

       5594
        
       

     

       5595
       +
         pytorch = let

     

       5596
       +
           # Fails with CUDA 9.1 and GCC 6.4:

     

       5597
       +
           # https://github.com/pytorch/pytorch/issues/5831

     

       5598
       +
           # https://devtalk.nvidia.com/default/topic/1028112

     

       5599
       +
           # We should be able to remove this when CUDA 9.2 is released.

     

       5600
       +
           cudatoolkit9 = pkgs.cudatoolkit9.override {

     

       5601
       +
             gcc6 = pkgs.gcc5;

     

       5602
       +
           };

     

       5603
       +
         in callPackage ../development/python-modules/pytorch {

     

       5604
        
           cudaSupport = pkgs.config.cudaSupport or false;

     

       5605
       +
           cudatoolkit = cudatoolkit9;

     

       5606
       +
           cudnn = pkgs.cudnn_cudatoolkit9.override {

     

       5607
       +
             inherit cudatoolkit9;

     

       5608
       +
           };

     

       5609
        
         };

     

       5610
        
       

     

       5611
        
         pytorchWithCuda = self.pytorch.override {